Merge pull request #14 from metaborg/future-env-container

Future env container

Author: jdonszelmann

.github/workflows/rust.yml

@@ -41,7 +41,25 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
-  test:
+
+  test-nightly:
+    name: Test Nightly
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features
+
+  test-beta:
     name: Test Beta
     runs-on: ubuntu-latest
     steps:
@@ -58,15 +76,19 @@ jobs:
           command: test
           args: --all-features
 
-  test-miri:
-    name: Test Miri
+  test-stable:
+    name: Test Stable
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Miri
-        run: |
-          rustup toolchain install nightly --component miri
-          rustup override set nightly
-          cargo miri setup
-      - name: Test with Miri
-        run: cargo miri test
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel="beta"
+channel = "1.77.2"

scopegraphs-lib/Cargo.toml

@@ -1,19 +1,33 @@
 [package]
 name = "scopegraphs-lib"
-version = "0.1.0"
+version = "0.1.2"
 edition = "2021"
+license = "MIT OR Apache-2.0"
+authors = [
+    "Aron Zwaan <[email protected]>",
+    "Jonathan Dönszelmann <[email protected]>"
+]
+description = "A port of [scopegraphs](https://pl.ewi.tudelft.nl/research/projects/scope-graphs/) to Rust"
+rust-version = "1.77"
+
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = []
+dot = ["dep:dot"]
 
 [dependencies]
 log = "0.4.20"
-prust-lib = {git="https://github.com/jdonszelmann/prust", branch = "main"}
+scopegraphs-prust-lib = { version = "0.1.0" }
 syn = { version = "2.0.29", features = ["full", "extra-traits"] }
-quote = { version = "1.0.33" , optional = true}
-scopegraphs-regular-expressions = {path = "../scopegraphs-regular-expressions"}
-scopegraphs-macros = {path = "../scopegraphs-macros"}
+quote = { version = "1.0.33", optional = true }
+scopegraphs-regular-expressions = { path = "../scopegraphs-regular-expressions", version = "0.1.0" }
+scopegraphs-macros = { path = "../scopegraphs-macros", version = "0.1.0" }
+futures = "0.3.30"
+bumpalo = "3.14.0"
+dot = { version = "0.1.4", optional = true }
 
 [dev-dependencies]
-scopegraphs = {path = "../scopegraphs"}
+scopegraphs = { path = "../scopegraphs" }
 env_logger = "0.10.1"
 ctor = "0.2.5"

scopegraphs-lib/src/completeness/critical_edge.rs

@@ -1,8 +1,10 @@
 use crate::{completeness::Completeness, Scope, ScopeGraph};
+use std::cell::RefCell;
 use std::{collections::HashSet, hash::Hash};
 
+#[derive(Debug)]
 pub(super) struct CriticalEdgeSet<LABEL> {
-    open_edges: Vec<HashSet<LABEL>>,
+    open_edges: RefCell<Vec<HashSet<LABEL>>>,
 }
 
 impl<LABEL> Default for CriticalEdgeSet<LABEL> {
@@ -14,18 +16,18 @@ impl<LABEL> Default for CriticalEdgeSet<LABEL> {
 }
 
 impl<LABEL> CriticalEdgeSet<LABEL> {
-    pub(super) fn init_scope(&mut self, edges: HashSet<LABEL>) {
-        self.open_edges.push(edges)
+    pub(super) fn init_scope(&self, edges: HashSet<LABEL>) {
+        self.open_edges.borrow_mut().push(edges)
     }
 }
 
 impl<LABEL: Hash + Eq> CriticalEdgeSet<LABEL> {
     pub fn is_open(&self, scope: Scope, lbl: &LABEL) -> bool {
-        self.open_edges[scope.0].contains(lbl)
+        self.open_edges.borrow()[scope.0].contains(lbl)
     }
 
-    pub(super) fn close(&mut self, scope: Scope, lbl: &LABEL) -> bool {
-        self.open_edges[scope.0].remove(lbl)
+    pub(super) fn close(&self, scope: Scope, lbl: &LABEL) -> bool {
+        self.open_edges.borrow_mut()[scope.0].remove(lbl)
     }
 }
 
@@ -35,7 +37,7 @@ impl<LABEL: Hash + Eq> CriticalEdgeSet<LABEL> {
 ///
 /// Should not be called externally, but only from utility function on [`super::ScopeGraph`].
 pub trait CriticalEdgeBasedCompleteness<LABEL, DATA>: Completeness<LABEL, DATA> {
-    fn init_scope_with(&mut self, open_edges: HashSet<LABEL>);
+    fn init_scope_with(&self, open_edges: HashSet<LABEL>);
 }
 
 /// Error returned when attempting to add an edge with a label that is already closed in that scope.
@@ -46,15 +48,15 @@ pub struct EdgeClosedError<LABEL> {
 }
 
 /// Value returned when a query cannot yet be computed because some edge it depends on is still closed.
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub struct Delay<LABEL> {
     pub scope: Scope,
     pub label: LABEL,
 }
 
 pub(crate) type EdgesOrDelay<EDGES, LABEL> = Result<EDGES, Delay<LABEL>>;
 
-impl<LABEL: Hash + Eq, DATA, CMPL> ScopeGraph<LABEL, DATA, CMPL>
+impl<'sg, LABEL: Hash + Eq, DATA, CMPL> ScopeGraph<'sg, LABEL, DATA, CMPL>
 where
     CMPL: CriticalEdgeBasedCompleteness<LABEL, DATA>,
 {
@@ -65,22 +67,19 @@ where
     {
         let scope = self.inner_scope_graph.add_scope(data);
         self.completeness
-            .borrow_mut()
-            .init_scope_with(HashSet::from_iter(open_edges));
+            .init_scope_with(open_edges.into_iter().collect());
         scope
     }
 
     /// Adds a new scope with no open edges.
     pub fn add_scope_closed(&mut self, data: DATA) -> Scope {
         let scope = self.inner_scope_graph.add_scope(data);
-        self.completeness
-            .borrow_mut()
-            .init_scope_with(HashSet::new());
+        self.completeness.init_scope_with(HashSet::new());
         scope
     }
 }
 
-impl<LABEL: Hash + Eq, DATA, CMPL> ScopeGraph<LABEL, DATA, CMPL>
+impl<'sg, LABEL: Hash + Eq, DATA, CMPL> ScopeGraph<'sg, LABEL, DATA, CMPL>
 where
     DATA: Default,
     CMPL: CriticalEdgeBasedCompleteness<LABEL, DATA>,