Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/utopia-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ struct ManifestDataDir {
/// not a side effect of a code change.
// 是迁移文件的**个数**,不是最大的编号(守卫 `schema_version_policy_compares_against_current`
// 按个数比):编号有空缺时两者不同——0071 由一个开放 PR 占着,0072 先落,个数是 71
const CURRENT_SCHEMA_VERSION: u32 = 74;
const CURRENT_SCHEMA_VERSION: u32 = 75;

fn main() -> anyhow::Result<()> {
dotenvy::dotenv().ok();
Expand Down
7 changes: 6 additions & 1 deletion crates/utopia-reason/src/derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ pub enum Rule {
Inverse,
/// `A p B` ∧ `p ⊑ q` ⟹ `A q B`。主宾不动,只升谓词
SubProperty,
/// 一条业务规则推出的关系边(0047)。不是公理:`derive()` 从不产出它,
/// 它只作为**候选**进矛盾检查,让撞上断言或别的派生时能像公理派生一样被报出来。
/// 触发它的规则行在 `attribute_rules` 里,不在公理规则表里
Business,
}

impl Rule {
Expand All @@ -51,6 +55,7 @@ impl Rule {
Rule::Symmetric => "symmetric",
Rule::Inverse => "inverse",
Rule::SubProperty => "sub_property",
Rule::Business => "business_rule",
}
}
}
Expand Down Expand Up @@ -99,7 +104,7 @@ pub struct TimedEdge {
}

/// 交集。`None` 表示无界那一侧。
pub(crate) fn overlap(
pub fn overlap(
a: (Option<i64>, Option<i64>),
b: (Option<i64>, Option<i64>),
) -> Option<(Option<i64>, Option<i64>)> {
Expand Down
Loading
Loading