Working on structs

Author: Kixiron

crates/crunch-parser/src/parser/expr.rs

@@ -10,10 +10,10 @@ use crunch_shared::{
     tracing,
     trees::{
         ast::{
-            Arm, Block, BlockColor, BlockExpr, Expr, ExprKind, For, If, IfCond, Literal,
-            LiteralVal, Loop, Match, StructField, StructLiteral, Type, While,
+            Arm, Block, BlockExpr, Expr, ExprKind, For, If, IfCond, Literal, LiteralVal, Loop,
+            Match, StructField, StructLiteral, Type, While,
         },
-        ItemPath, Sided,
+        BlockColor, ItemPath, Sided,
     },
 };
 

crates/crunch-shared/src/trees/ast.rs

@@ -1,7 +1,7 @@
 use crate::{
     error::{Locatable, Location, Span},
     strings::{StrInterner, StrT},
-    trees::{Attribute, CallConv, ItemPath, Sided, Sign, Vis},
+    trees::{Attribute, BlockColor, CallConv, ItemPath, Sided, Sign, Vis},
 };
 #[cfg(feature = "no-std")]
 use alloc::{
@@ -305,14 +305,6 @@ pub struct BlockExpr<'ctx> {
     pub colors: Vec<BlockColor>,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-#[repr(u8)]
-pub enum BlockColor {
-    Unsafe,
-    Async,
-    Const,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct If<'ctx> {
     pub clauses: Vec<IfCond<'ctx>>,

crates/crunch-shared/src/trees/hir.rs

@@ -3,7 +3,7 @@ pub use crate::trees::{
         BinaryOp, CompOp, Float, Integer, Literal as AstLiteral, LiteralVal as AstLiteralVal, Rune,
         Text, Type as AstType,
     },
-    Attribute, ItemPath, Signedness, Vis,
+    Attribute, BlockColor, ItemPath, Signedness, Vis,
 };
 use crate::{
     error::{Locatable, Location, Span},
@@ -215,24 +215,39 @@ pub struct Break<'ctx> {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Block<T> {
     pub block: Vec<T>,
+    pub colors: Vec<BlockColor>,
     pub loc: Location,
 }
 
 impl<T> Block<T> {
     pub fn new(block: Vec<T>, loc: Location) -> Self {
-        Self { block, loc }
+        Self {
+            block,
+            colors: Vec::new(),
+            loc,
+        }
     }
 
     pub fn empty(loc: Location) -> Self {
         Self {
             block: Vec::new(),
+            colors: Vec::new(),
             loc,
         }
     }
 
     pub fn with_capacity(loc: Location, capacity: usize) -> Self {
         Self {
             block: Vec::with_capacity(capacity),
+            colors: Vec::new(),
+            loc,
+        }
+    }
+
+    pub fn with_capacity_and_colors(loc: Location, capacity: usize, colors: usize) -> Self {
+        Self {
+            block: Vec::with_capacity(capacity),
+            colors: Vec::with_capacity(colors),
             loc,
         }
     }
@@ -241,6 +256,17 @@ impl<T> Block<T> {
         self.block.push(item);
     }
 
+    pub fn push_color(&mut self, color: BlockColor) {
+        self.colors.push(color);
+    }
+
+    pub fn extend_colors<I>(&mut self, colors: I)
+    where
+        I: Iterator<Item = BlockColor>,
+    {
+        self.colors.extend(colors);
+    }
+
     pub fn insert(&mut self, idx: usize, item: T) {
         self.block.insert(idx, item);
     }
@@ -279,7 +305,11 @@ impl<T> Block<T> {
             block.push(item);
         }
 
-        Self { block, loc }
+        Self {
+            block,
+            colors: Vec::new(),
+            loc,
+        }
     }
 }
 

crates/crunch-shared/src/trees/mod.rs

@@ -246,3 +246,11 @@ impl Default for Vis {
         Self::FileLocal
     }
 }
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[repr(u8)]
+pub enum BlockColor {
+    Unsafe,
+    Async,
+    Const,
+}

crates/crunch-typecheck/build.rs

@@ -43,24 +43,32 @@ fn traverse<P: AsRef<Path>, F: Fn(&DirEntry)>(dir: P, func: &F) -> io::Result<()
 }
 
 fn build_ddlog() -> Result<(), Box<dyn Error>> {
+    const DDLOG_ARGS: &[&str] = &[
+        #[cfg(windows)]
+        "ddlog",
+        "-i",
+        "ddlog/typecheck.dl",
+        "-L",
+        ".",
+        "--output-dir",
+        "typecheck_ddlog",
+        "--omit-profile",
+        "--omit-workspace",
+        "--run-rustfmt",
+    ];
+
     if env::var("DDLOG_HOME").is_err() {
         println!("cargo:warning=`DDLOG_HOME` is not set, building may not work properly");
     }
 
-    Command::new("ddlog")
-        .args(&[
-            "-i",
-            "ddlog/typecheck.dl",
-            "-L",
-            ".",
-            "--output-dir",
-            "typecheck_ddlog",
-            "--omit-profile",
-            "--omit-workspace",
-            "--run-rustfmt",
-        ])
-        .spawn()?
-        .wait()?;
+    if cfg!(windows) {
+        Command::new("wsl")
+    } else {
+        Command::new("ddlog")
+    }
+    .args(DDLOG_ARGS)
+    .spawn()?
+    .wait()?;
 
     Ok(())
 }

crates/crunch-typecheck/ddlog/typecheck.dl

@@ -46,42 +46,10 @@ UnifiedTypes(expr_id, unified_type) :-
     Types(type_id, ty),
     var unified_type = Aggregate((expr_id), unify_types((type_id, ty))).
 
-function unify_types(types: Group<'K, (TypeId, Type)>): Result<TypeId, string> {
-    var uni_type_id = None {};
-    var uni_type = None {};
-
+function unify_types(types: Group<'K, (TypeId, Type)>): TypeId {
     for (ty in types) {
-        if (ty.0 < min_type_id) {
-            min_type_id = ty.0;
-            min_type = ty.1
-        }
+        dbg(ty);
     };
 
-    Ok { uni_type_id }
+    1
 }
-
-// // Get the types out of literals
-// PropagateExprType(id, kind, ty) :- InputExpressions(id, kind, _),
-//                                    ExprLit { .lit = var lit } = kind.ival(),
-//                                    var ty = lit.typeof().
-// // Get the types out of assignments
-// PropagateExprType(id, kind, ty) :- InputExpressions(id, kind, _),
-//                                    ExprAssign { .expr_id = var expr_id } = kind.ival(),
-//                                    PropagateExprType(expr_id, _, ty).
-// // Get the types of variables by looking at their assignment
-// PropagateExprType(id, kind, ty) :- InputExpressions(id, kind, _),
-//                                    ExprVar { .variable = var expr_var } = kind.ival(),
-//                                    PropagateExprType(_, prop_kind, ty),
-//                                    ExprAssign { .variable = var prop_var } = prop_kind.ival(),
-//                                    expr_var == prop_var.
-// 
-// output relation ClampUnknownInt(id: ExprId, kind: Intern<ExprKind>, ty: Intern<TypeKind>)
-// // Clamp totally unknown integers to i32
-// ClampUnknownInt(id, kind, ty) :- PropagateExprType(id, kind, ty),
-//                                  Int { None, None } = ty.ival(),
-//                                  var ty = intern(Int { Some{true}, Some{32} }).
-// 
-// // Allow other types to pass through unaffected
-// ClampUnknownInt(id, kind, ty) :- PropagateExprType(id, kind, ty),
-//                                  Int { Some{}, Some{} } = ty.ival().
-// ClampUnknownInt(id, kind, ty) :- PropagateExprType(id, kind, ty), not ty.is_int().

crates/crunch-typecheck/ddlog/typecheck.rs

@@ -1,5 +1,6 @@
 use core::fmt::Debug;
 
 pub fn dbg<T: Debug>(thing: T) -> T {
-    dbg!(thing)
+    println!("[ddlog debug]: {:?}", thing);
+    thing
 }

crates/crunch-typecheck/typecheck_ddlog/Cargo.toml

@@ -6,25 +6,25 @@ autobins = false
 build = "src/build.rs"
 
 [features]
-default = []
+default = ["command-line"]
 flatbuf = ["differential_datalog/flatbuf", "types/flatbuf", "value/flatbuf"]
 profile = ["cpuprofiler"]
-# ovsdb = ["ddlog_ovsdb_adapter", "types/ovsdb", "value/ovsdb"]
-# command-line = ["cmd_parser", "rustop"]
+ovsdb = ["ddlog_ovsdb_adapter", "types/ovsdb", "value/ovsdb"]
+command-line = ["cmd_parser", "rustop"]
 
 [target.'cfg(not(windows))'.build-dependencies]
 libtool = "0.1"
 
 [dependencies.differential_datalog]
 path = "./differential_datalog"
 
-# [dependencies.cmd_parser]
-# path = "./cmd_parser"
-# optional = true
+[dependencies.cmd_parser]
+path = "./cmd_parser"
+optional = true
 
-# [dependencies.ddlog_ovsdb_adapter]
-# path = "./ovsdb"
-# optional = true
+[dependencies.ddlog_ovsdb_adapter]
+path = "./ovsdb"
+optional = true
 
 [dependencies.types]
 path = "./types"
@@ -43,7 +43,7 @@ once_cell = "1.4.1"
 libc = "0.2"
 num-traits = "0.2"
 num = { version = "0.2", features = ["serde"] }
-# rustop = { version = "1.0.2", optional = true }
+rustop = { version = "1.0.2", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 timely = "0.11"
 
@@ -61,3 +61,4 @@ name = "typecheck_ddlog"
 # crate-type = ["rlib", "staticlib"]
 
 crate-type = ["rlib", "staticlib"]
+

crates/crunch-typecheck/typecheck_ddlog/types/Cargo.toml

@@ -7,14 +7,14 @@ autobins = false
 [features]
 default = []
 flatbuf = ["flatbuffers", "differential_datalog/flatbuf"]
-# ovsdb = ["ddlog_ovsdb_adapter"]
+ovsdb = ["ddlog_ovsdb_adapter"]
 
 [dependencies.differential_datalog]
 path = "../differential_datalog"
 
-# [dependencies.ddlog_ovsdb_adapter]
-# path = "../ovsdb"
-# optional = true
+[dependencies.ddlog_ovsdb_adapter]
+path = "../ovsdb"
+optional = true
 
 [dependencies]
 abomonation = "0.7"
@@ -40,5 +40,6 @@ name = "types"
 path = "lib.rs"
 
 
+
 [dependencies.arc-interner]
-version = "0.1"
+version="0.1"