Skip to content
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
3ffbb32
WIP: vivid-badger-729
briansrls Apr 26, 2026
31bfb72
WIP: vivid-badger-729
briansrls Apr 26, 2026
e335311
chore: apply cargo fmt
briansrls Apr 26, 2026
f0edd3a
WIP: vivid-badger-729
briansrls Apr 26, 2026
331c436
chore: apply cargo fmt
briansrls Apr 26, 2026
ca4084a
WIP: vivid-badger-729
briansrls Apr 26, 2026
4f8130b
WIP: vivid-badger-729
briansrls Apr 26, 2026
50fdc74
WIP: vivid-badger-729
briansrls Apr 26, 2026
b691688
chore: apply cargo fmt
briansrls Apr 26, 2026
0d37ada
WIP: vivid-badger-729
briansrls Apr 26, 2026
8f02992
WIP: vivid-badger-729
briansrls Apr 26, 2026
c20dc31
chore: apply cargo fmt
briansrls Apr 26, 2026
7964dae
Merge remote-tracking branch 'origin/main' into session/vivid-badger-729
briansrls Apr 26, 2026
33bf785
Merge remote-tracking branch 'origin/main' into session/vivid-badger-729
briansrls Apr 26, 2026
2e2851c
Merge remote-tracking branch 'origin/main' into session/vivid-badger-729
briansrls Apr 26, 2026
5a42fa3
WIP: vivid-badger-729
briansrls Apr 26, 2026
7a045c6
WIP: vivid-badger-729
briansrls Apr 26, 2026
911ba9d
chore: apply cargo fmt
briansrls Apr 26, 2026
2d50fb1
WIP: vivid-badger-729
briansrls Apr 26, 2026
7d195f5
chore: apply cargo fmt
briansrls Apr 26, 2026
6490452
WIP: vivid-badger-729
briansrls Apr 26, 2026
90fd100
WIP: vivid-badger-729
briansrls Apr 26, 2026
b5c2c2b
WIP: vivid-badger-729
briansrls Apr 26, 2026
e05bf26
WIP: vivid-badger-729
briansrls Apr 26, 2026
ca6b947
WIP: vivid-badger-729
briansrls Apr 26, 2026
0b1cdf2
WIP: vivid-badger-729
briansrls Apr 27, 2026
657471f
WIP: vivid-badger-729
briansrls Apr 27, 2026
3659127
Merge remote-tracking branch 'origin/main' into session/vivid-badger-729
briansrls Apr 27, 2026
28a51d6
WIP: vivid-badger-729
briansrls Apr 27, 2026
120cc87
WIP: vivid-badger-729
briansrls Apr 27, 2026
6c59e53
Merge remote-tracking branch 'origin/main' into session/vivid-badger-729
briansrls Apr 27, 2026
13b6def
WIP: vivid-badger-729
briansrls Apr 27, 2026
902f1b3
WIP: vivid-badger-729
briansrls Apr 27, 2026
be1a736
WIP: vivid-badger-729
briansrls Apr 27, 2026
bcdd0b8
WIP: vivid-badger-729
briansrls Apr 27, 2026
1519ed5
WIP: vivid-badger-729
briansrls Apr 27, 2026
83e848d
WIP: vivid-badger-729
briansrls Apr 27, 2026
26ad966
chore: apply cargo fmt
briansrls Apr 27, 2026
f095b05
WIP: vivid-badger-729
briansrls Apr 27, 2026
89b5e5b
WIP: vivid-badger-729
briansrls Apr 27, 2026
2ca4dc9
WIP: vivid-badger-729
briansrls Apr 27, 2026
17baffb
WIP: vivid-badger-729
briansrls Apr 27, 2026
97bf18d
chore: apply cargo fmt
briansrls Apr 27, 2026
efcd87e
docs(spec): clarify Go Result carrier vs v3intdiv prelude (M1)
briansrls Apr 27, 2026
bae9937
WIP: vivid-badger-729
briansrls Apr 27, 2026
1f4c442
docs(v3): clarify Result suppression, infer DAG mutation, Go M1 debt
briansrls Apr 27, 2026
852fc60
WIP: vivid-badger-729
briansrls Apr 27, 2026
9711332
WIP: valiant-lynx-650
briansrls Apr 27, 2026
5ac371a
Merge remote-tracking branch 'origin/main' into session/vivid-badger-729
briansrls Apr 27, 2026
24943ad
chore: apply cargo fmt
briansrls Apr 27, 2026
1e765a2
Merge remote-tracking branch 'origin/session/vivid-badger-729' into s…
briansrls Apr 27, 2026
9eeabd7
fix(v3): refresh division totality snapshots
briansrls Apr 27, 2026
95f3fe0
fix(v3): refresh generated int div prelude visibility
briansrls Apr 27, 2026
43cd006
docs(v3): correct Result authority references
briansrls Apr 27, 2026
84e3a39
fix(v3): print Rust Result top-level values safely
briansrls Apr 27, 2026
13c321b
Merge remote-tracking branch 'origin/session/vivid-badger-729' into s…
briansrls Apr 27, 2026
993b65c
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
d6debeb
fix(v3): gate Rust division result emission
briansrls Apr 27, 2026
d018a06
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
c683b67
chore(v3): track Python div prelude gate
briansrls Apr 27, 2026
4682440
fix: resolve PR-969 rustfmt + boundary test fixture issues
briansrls Apr 27, 2026
36a6bbb
fix: anchor division prelude lookups and gate Go/Python division prel…
briansrls Apr 27, 2026
7aa8ec6
WIP: valiant-lynx-650
briansrls Apr 27, 2026
91ce8fe
chore: apply cargo fmt
briansrls Apr 27, 2026
6fb6bcf
fix(v3): remove generated merge markers
briansrls Apr 27, 2026
051fd6b
WIP: valiant-lynx-650
briansrls Apr 27, 2026
528003e
chore: apply cargo fmt
briansrls Apr 27, 2026
93e32ef
WIP: valiant-lynx-650
briansrls Apr 27, 2026
7c57819
fix(v3): refresh std bootstrap cardinality snapshot
briansrls Apr 27, 2026
2640d94
fix(v3): compile shared division prelude gate
briansrls Apr 27, 2026
6cceef9
fix(v3): fail closed on Rust DivError prelude collision
briansrls Apr 27, 2026
b1996a7
WIP: valiant-lynx-650
briansrls Apr 27, 2026
d8e0d2a
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
2fa4de4
WIP: valiant-lynx-650
briansrls Apr 27, 2026
79da63b
WIP: valiant-lynx-650
briansrls Apr 27, 2026
81619c5
WIP: valiant-lynx-650
briansrls Apr 27, 2026
019f59d
fix(v3): fail closed division carrier collisions
briansrls Apr 27, 2026
29e1678
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
bddf0a6
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
9241aea
WIP: valiant-lynx-650
briansrls Apr 27, 2026
c6cea10
WIP: valiant-lynx-650
briansrls Apr 27, 2026
ab9c851
WIP: valiant-lynx-650
briansrls Apr 27, 2026
756f34a
chore: apply cargo fmt
briansrls Apr 27, 2026
2cb824c
ci: avoid target cache in v2 self-compile gate
briansrls Apr 27, 2026
6c3d5ec
WIP: valiant-lynx-650
briansrls Apr 27, 2026
2e33a52
WIP: valiant-lynx-650
briansrls Apr 27, 2026
c49d791
WIP: valiant-lynx-650
briansrls Apr 27, 2026
78d1a8f
WIP: valiant-lynx-650
briansrls Apr 27, 2026
34268ea
WIP: valiant-lynx-650
briansrls Apr 27, 2026
6eda4d3
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
eeee2a0
chore: apply cargo fmt
briansrls Apr 27, 2026
61babca
WIP: valiant-lynx-650
briansrls Apr 27, 2026
bf7eb35
WIP: valiant-lynx-650
briansrls Apr 27, 2026
7d836e5
WIP: valiant-lynx-650
briansrls Apr 27, 2026
65228f5
WIP: valiant-lynx-650
briansrls Apr 27, 2026
94de338
WIP: valiant-lynx-650
briansrls Apr 27, 2026
8cf0da1
fix v3 source filtering path normalization
briansrls Apr 27, 2026
616aea5
fix v3 source filtering for absolute fixtures
briansrls Apr 27, 2026
8f0c0ae
isolate v2 ci pass2 rebuild target
briansrls Apr 27, 2026
4846ebd
WIP: valiant-lynx-650
briansrls Apr 27, 2026
859016c
WIP: valiant-lynx-650
briansrls Apr 27, 2026
c2ee284
WIP: valiant-lynx-650
briansrls Apr 27, 2026
0865888
WIP: valiant-lynx-650
briansrls Apr 27, 2026
4bffcb2
WIP: valiant-lynx-650
briansrls Apr 27, 2026
5d23999
WIP: valiant-lynx-650
briansrls Apr 27, 2026
223a404
WIP: valiant-lynx-650
briansrls Apr 27, 2026
2375242
WIP: valiant-lynx-650
briansrls Apr 27, 2026
67094e8
WIP: valiant-lynx-650
briansrls Apr 27, 2026
ea05846
WIP: valiant-lynx-650
briansrls Apr 27, 2026
c53d0f2
WIP: valiant-lynx-650
briansrls Apr 27, 2026
a8b65d6
WIP: valiant-lynx-650
briansrls Apr 27, 2026
9167e7d
WIP: valiant-lynx-650
briansrls Apr 27, 2026
32c2dd6
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
b4a06f2
refresh parse corpus manifest after main merge
briansrls Apr 27, 2026
e5ed617
WIP: valiant-lynx-650
briansrls Apr 27, 2026
d342edd
fix go division overflow prelude test
briansrls Apr 27, 2026
179c72c
WIP: valiant-lynx-650
briansrls Apr 27, 2026
b483d81
chore: apply cargo fmt
briansrls Apr 27, 2026
260fb03
WIP: valiant-lynx-650
briansrls Apr 27, 2026
de34e3e
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 27, 2026
02fca30
WIP: valiant-lynx-650
briansrls Apr 27, 2026
c390967
WIP: valiant-lynx-650
briansrls Apr 28, 2026
03d0995
WIP: valiant-lynx-650
briansrls Apr 28, 2026
68a12ca
WIP: valiant-lynx-650
briansrls Apr 28, 2026
53d3edc
WIP: valiant-lynx-650
briansrls Apr 28, 2026
07a96e0
WIP: valiant-lynx-650
briansrls Apr 28, 2026
2e2a59b
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 28, 2026
d866808
Merge remote-tracking branch 'origin/main' into subsume/pr-931
briansrls Apr 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dsl/std/algebra.dag
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@

module std.algebra

import std.error_primitives { DivError, Result }

// =========================================================================
// Unary structures (single operation)
// =========================================================================
Expand Down Expand Up @@ -179,7 +181,7 @@ type OrderedRing<T> {
zero: T
negate: fn(T) -> T
mul: fn(T, T) -> T
div: fn(T, T) -> T
div: fn(T, T) -> Result<T, DivError>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BLOCKING: M9/modeling faithfulness: generic OrderedRing.div now returns the signed-Int-specific DivError, so every OrderedRing inhabitant inherits Int overflow semantics that the algebra itself does not define.

one: T
compare: fn(T, T) -> Ordering
quotient: fn(T, T) -> T
Expand Down
18 changes: 18 additions & 0 deletions dsl/std/error_primitives.dag
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// std/error_primitives.dag — minimal error carriers with **no** dependency on
// `Int` / `String` / other `std.types` surface, so this module can load in the
// v3 std bootstrap seed *before* `algebra.dag` (which needs `Result` / `DivError`
// for `OrderedRing.div`).

module std.error_primitives

// 🟡 STRUCTURAL-CARRIER: algebraic Result sum for fallible std operations
// (e.g. `OrderedRing.div` totality). It is substrate-owned until target
// realizations can consume this declaration directly instead of filtering it
// from emitted std surfaces and reintroducing per-target carriers.
type Result<ok, err> = Ok { value: ok } | Err { value: err }

// 🟡 STRUCTURAL-CARRIER: signed integer division (`Int / Int`) failure modes
// (C-8): zero divisor vs MIN / -1 signed overflow. The target preludes mirror
// this declaration until `std.error_primitives` is emitted through the normal
// filtered-type path.
type DivError = DivideByZero | Overflow
1 change: 1 addition & 0 deletions src/v2/compiler_tests_rust.dag
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ fn ct_gist_sources() -> String {
" \"dsl/extdeps/github/github.dag\",\n",
" \"dsl/gunbc/auth/credentials.dag\",\n",
" \"dsl/gunbc/tools/gist.dag\",\n",
" \"dsl/std/error_primitives.dag\",\n",
" \"dsl/std/algebra.dag\",\n",
" \"dsl/std/encoding.dag\",\n",
" \"dsl/std/errors.dag\",\n",
Expand Down
1 change: 1 addition & 0 deletions src/v2/stage0/src/compiler_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ mod compiler_tests {
"dsl/extdeps/github/github.dag",
"dsl/gunbc/auth/credentials.dag",
"dsl/gunbc/tools/gist.dag",
"dsl/std/error_primitives.dag",
"dsl/std/algebra.dag",
"dsl/std/encoding.dag",
"dsl/std/errors.dag",
Expand Down
1 change: 1 addition & 0 deletions src/v2/stage0/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ 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;
Expand Down
5 changes: 4 additions & 1 deletion src/v2/stage0/src/std_algebra.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Generated by v2 compiler -- do not edit.
// Source module: std.algebra

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;
Expand Down Expand Up @@ -73,7 +76,7 @@ pub struct OrderedRing<T> {
pub zero: Box<T>,
pub negate: Rc<dyn Fn(T) -> T>,
pub mul: Rc<dyn Fn(T, T) -> T>,
pub div: Rc<dyn Fn(T, T) -> T>,
pub div: Rc<dyn Fn(T, T) -> Rc<Result<T, DivError>>>,
pub one: Box<T>,
pub compare: Rc<dyn Fn(T, T) -> Ordering>,
pub quotient: Rc<dyn Fn(T, T) -> T>,
Expand Down
26 changes: 26 additions & 0 deletions src/v2/stage0/src/std_error_primitives.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Generated by v2 compiler -- do not edit.
// Source module: std.error_primitives

#![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;

#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
#[serde(tag = "_variant")]
pub enum Result<ok, err> {
Ok { value: Box<ok> },
Err { value: Box<err> },
}

#[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)]
#[serde(tag = "_variant")]
pub enum DivError {
DivideByZero,
Overflow,
}
2 changes: 1 addition & 1 deletion src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub fn ct_self_compile_sources() -> String {
}

pub fn ct_gist_sources() -> 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(" /// Build the gist pipeline source closure.\n".to_string(), " fn gist_sources() -> Vec<std::rc::Rc<crate::v2_compiler_compile::SourceFile>> {\n".to_string()), " let gist_deps = &[\n".to_string()), " \"dsl/extdeps/cloud/cloud.dag\",\n".to_string()), " \"dsl/extdeps/cloud/gcp/gcp.dag\",\n".to_string()), " \"dsl/extdeps/git.dag\",\n".to_string()), " \"dsl/extdeps/github/auth.dag\",\n".to_string()), " \"dsl/extdeps/github/gists.dag\",\n".to_string()), " \"dsl/extdeps/github/github.dag\",\n".to_string()), " \"dsl/gunbc/auth/credentials.dag\",\n".to_string()), " \"dsl/gunbc/tools/gist.dag\",\n".to_string()), " \"dsl/std/algebra.dag\",\n".to_string()), " \"dsl/std/encoding.dag\",\n".to_string()), " \"dsl/std/errors.dag\",\n".to_string()), " \"dsl/std/filesystem.dag\",\n".to_string()), " \"dsl/std/resources.dag\",\n".to_string()), " \"dsl/std/serialization.dag\",\n".to_string()), " \"dsl/std/types.dag\",\n".to_string()), " ];\n".to_string()), " let root = workspace_root();\n".to_string()), " gist_deps\n".to_string()), " .iter()\n".to_string()), " .map(|p| {\n".to_string()), " let full = root.join(p);\n".to_string()), " let content = std::fs::read_to_string(&full)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {}: {}\", full.display(), e));\n".to_string()), " std::rc::Rc::new(crate::v2_compiler_compile::SourceFile {\n".to_string()), " path: p.to_string(),\n".to_string()), " content,\n".to_string()), " })\n".to_string()), " })\n".to_string()), " .collect()\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(" /// Build the gist pipeline source closure.\n".to_string(), " fn gist_sources() -> Vec<std::rc::Rc<crate::v2_compiler_compile::SourceFile>> {\n".to_string()), " let gist_deps = &[\n".to_string()), " \"dsl/extdeps/cloud/cloud.dag\",\n".to_string()), " \"dsl/extdeps/cloud/gcp/gcp.dag\",\n".to_string()), " \"dsl/extdeps/git.dag\",\n".to_string()), " \"dsl/extdeps/github/auth.dag\",\n".to_string()), " \"dsl/extdeps/github/gists.dag\",\n".to_string()), " \"dsl/extdeps/github/github.dag\",\n".to_string()), " \"dsl/gunbc/auth/credentials.dag\",\n".to_string()), " \"dsl/gunbc/tools/gist.dag\",\n".to_string()), " \"dsl/std/error_primitives.dag\",\n".to_string()), " \"dsl/std/algebra.dag\",\n".to_string()), " \"dsl/std/encoding.dag\",\n".to_string()), " \"dsl/std/errors.dag\",\n".to_string()), " \"dsl/std/filesystem.dag\",\n".to_string()), " \"dsl/std/resources.dag\",\n".to_string()), " \"dsl/std/serialization.dag\",\n".to_string()), " \"dsl/std/types.dag\",\n".to_string()), " ];\n".to_string()), " let root = workspace_root();\n".to_string()), " gist_deps\n".to_string()), " .iter()\n".to_string()), " .map(|p| {\n".to_string()), " let full = root.join(p);\n".to_string()), " let content = std::fs::read_to_string(&full)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {}: {}\", full.display(), e));\n".to_string()), " std::rc::Rc::new(crate::v2_compiler_compile::SourceFile {\n".to_string()), " path: p.to_string(),\n".to_string()), " content,\n".to_string()), " })\n".to_string()), " })\n".to_string()), " .collect()\n".to_string()), " }\n\n".to_string())
}

pub fn ct_tokenizer_tests() -> String {
Expand Down
11 changes: 9 additions & 2 deletions src/v2/stage0/src/v2_compiler_emit_rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ pub fn emit_module_full(
{
__result.push(v2_rt::concat(
v2_rt::concat(
"use ".to_string(),
"use self::".to_string(),
authored_name(scope.type_env.clone(), item.clone()),
),
"::*;".to_string(),
Expand Down Expand Up @@ -1194,6 +1194,13 @@ pub fn emit_module_full(
} else {
raw_filename.clone()
};
let module_inner_attrs = if authored_name(scope.type_env.clone(), m.clone()).as_str()
== "std.error_primitives".to_string().as_str()
{
"\n\n#![allow(non_camel_case_types)]\n\n".to_string()
} else {
"\n\n".to_string()
};
let content = v2_rt::concat(
v2_rt::concat(
v2_rt::concat(
Expand All @@ -1210,7 +1217,7 @@ pub fn emit_module_full(
),
authored_name(scope.type_env.clone(), m.clone()),
),
"\n\n".to_string(),
module_inner_attrs,
),
prelude,
),
Expand Down
7 changes: 5 additions & 2 deletions src/v2/stage0/src/v2_compiler_resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,9 @@ pub fn topological_sort(
__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.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 {
Expand Down Expand Up @@ -599,7 +601,8 @@ pub fn topological_sort(
};
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.algebra".to_string().as_str())
&& (m_name.clone().as_str() != "std.error_primitives".to_string().as_str()))
&& (imports_std_types.clone() == false))
{
1
Expand Down
1 change: 1 addition & 0 deletions src/v2/tests/src/bootstrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ fn bootstrap_fixed_point() {
fn gist_full_pipeline() {
let gist_files = [
"dsl/std/types.dag",
"dsl/std/error_primitives.dag",
"dsl/std/errors.dag",
"dsl/std/resources.dag",
"dsl/extdeps/cloud/cloud.dag",
Expand Down
1 change: 1 addition & 0 deletions src/v2/tests/src/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ fn parse_fn_lambda_in_call_arg() {
fn gist_transitive_closure_parse() {
let files = [
"dsl/std/types.dag",
"dsl/std/error_primitives.dag",
"dsl/std/errors.dag",
"dsl/std/resources.dag",
"dsl/extdeps/cloud/cloud.dag",
Expand Down
2 changes: 2 additions & 0 deletions src/v3/compiler/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ fn main() {
let compiler_dir = manifest_path.clone();
let extdeps_dir = repo_root.join("dsl").join("extdeps");
let gunbc_dir = repo_root.join("dsl").join("gunbc");
let dsl_std_dir = repo_root.join("dsl").join("std");

// Tell Cargo to re-run the script if any staged std/spec/compiler file
// changes. Without this, adding a new file wouldn't trigger a
Expand All @@ -304,6 +305,7 @@ fn main() {
println!("cargo:rerun-if-changed={}", compiler_dir.display());
println!("cargo:rerun-if-changed={}", extdeps_dir.display());
println!("cargo:rerun-if-changed={}", gunbc_dir.display());
println!("cargo:rerun-if-changed={}", dsl_std_dir.display());

// Structural-recursion termination analysis walks a recursing
// argument back to its declared Disj connective (see
Expand Down
4,079 changes: 2,045 additions & 2,034 deletions src/v3/compiler/src/bootstrap_generated.rs

Large diffs are not rendered by default.

3,913 changes: 1,962 additions & 1,951 deletions src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/v3/compiler/src/bootstrap_regen_fresh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use std::collections::HashMap;

const LOGIC_DAG: &str = include_str!("../../../../dsl/std/logic.dag");
const BIT_DAG: &str = include_str!("../../../../dsl/std/bit.dag");
const ERROR_PRIMITIVES_DAG: &str = include_str!("../../../../dsl/std/error_primitives.dag");
const ALGEBRA_DAG: &str = include_str!("../../../../dsl/std/algebra.dag");
const INTEGER_DAG: &str = include_str!("../../../../dsl/std/integer.dag");
const FLOAT_DAG: &str = include_str!("../../../../dsl/std/float.dag");
Expand Down Expand Up @@ -117,6 +118,7 @@ fn std_fixtures() -> &'static [(&'static str, &'static str)] {
&[
("dsl/std/logic.dag", LOGIC_DAG),
("dsl/std/bit.dag", BIT_DAG),
("dsl/std/error_primitives.dag", ERROR_PRIMITIVES_DAG),
("dsl/std/algebra.dag", ALGEBRA_DAG),
("dsl/std/integer.dag", INTEGER_DAG),
("dsl/std/float.dag", FLOAT_DAG),
Expand Down
Loading