Regions

Author: Kixiron

Cargo.lock

@@ -71,7 +71,8 @@ fn run_inner(
 
     let mut formatter = formatter.unwrap_or_else(|| config.formatter());
 
-    let store = config.rules_store();
+    let mut store = config.rules_store();
+    store.load_rules(rslint_core::groups::ddlog());
     verify_formatter(&mut formatter);
 
     if walker.files.is_empty() {
@@ -454,7 +455,7 @@ fn start_ddlog_daemon(number_files: usize) -> DaemonOutput {
 
     let (sender, receiver) = mpsc::channel();
     let (finished_sender, finished_receiver) = mpsc::channel();
-    let analyzer = ScopeAnalyzer::new(3).unwrap();
+    let analyzer = ScopeAnalyzer::new(2).unwrap();
 
     let handle = {
         let analyzer = analyzer.clone();

crates/rslint_cli/src/lib.rs

@@ -4,17 +4,15 @@ import utils
 import group
 import inputs
 import scopes
+import config
 import var_decls
 
-/// The origin of a name
-// TODO: More variants
-typedef NameOrigin =
-    /// The name came from an implicit global variable
-    AutoGlobal
-    /// The name was imported
-    | Imported
-    /// The name was defined in the given scope
-    | UserDefined { scope: ScopeId }
+relation NeedsSymbolResolution(file: FileId)
+NeedsSymbolResolution(file) :- EnableNoTypeofUndef(file, _).
+NeedsSymbolResolution(file) :- EnableNoUndef(file, _).
+NeedsSymbolResolution(file) :- EnableNoUseBeforeDef(file, _).
+NeedsSymbolResolution(file) :- EnableNoUnusedVars(file, _).
+
 
 // TODO: Reduce the size of this since there are so many copies of it
 typedef NameInScope = NameInScope {
@@ -57,7 +55,9 @@ index Index_VariableInScope(scope: ScopeId, variable: Name)
 
 // Introduce all declared variables where they're used
 NameInScope(name, variable_scope, declared) :-
+    NeedsSymbolResolution(file),
     VariableDeclarations(name, scope, declared, _),
+    declared.file() == Some { file },
     var variable_scope = scope.hoisted_scope(),
     NameOccursInScope(variable_scope, name).
 
@@ -69,30 +69,36 @@ NameInScope(name, child, declared) :-
     NameInScope(name, parent, declared).
 
 
+/// The scopes that variable declarations occur in
 relation ScopeOfDeclName(name: Name, scope: ScopeId, declared: AnyId)
 ScopeOfDeclName(name, scope, declared) :-
-    VariableDeclarations(name, Unhoistable { scope }, declared, _).
+    NeedsSymbolResolution(file),
+    VariableDeclarations(name, Unhoistable { scope @ ScopeId { _, file }}, declared, _).
 ScopeOfDeclName(name, scope, declared) :-
-    VariableDeclarations(name, Hoistable { scope, _ }, declared, _).
+    NeedsSymbolResolution(file),
+    VariableDeclarations(name, Hoistable { scope @ ScopeId { _, file }, _ }, declared, _).
 
 
 /// A record of where variable usages actually happen
 relation NameOccursInScope(scope: ScopeId, name: Name)
 
 /// Add all name references
 NameOccursInScope(scope, name) :-
-    NameRef(id, name),
+    NeedsSymbolResolution(file),
+    NameRef(id @ ExprId { _, file }, name),
     Expression(id, _, scope, _),.
 
 /// Add assignment patterns
 NameOccursInScope(scope, name) :-
-    Assign(id, Some { Left { pattern }}, _, _),
+    NeedsSymbolResolution(file),
+    Assign(id @ ExprId { _, file }, Some { Left { pattern }}, _, _),
     Expression(id, _, scope, _),
     var name = FlatMap(pattern.bound_vars().map(|name| name.data)).
 
 /// Add exports
 NameOccursInScope(scope, name) :-
-    FileExport(NamedExport { export_name, export_alias }, scope),
+    NeedsSymbolResolution(file),
+    FileExport(NamedExport { export_name, export_alias }, scope @ ScopeId { _, file }),
     Some { Spanned { var name, _ }} = export_alias.or_else(export_name).
 
 /// Recurse to parent scopes

crates/rslint_scope/ddlog/name_in_scope.dl

@@ -13,6 +13,7 @@ c_api = []
 [dependencies]
 #differential-dataflow = "0.11.0"
 differential-dataflow = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-2" }
+dogsdogsdogs = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-2" }
 #timely = "0.11"
 timely = { git = "https://github.com/ddlog-dev/timely-dataflow", branch = "ddlog-2" }
 
@@ -28,7 +29,7 @@ erased-serde = "0.3"
 crossbeam-channel = "0.5.0"
 
 [dev-dependencies]
-byteorder = "0.4.2"
-getopts = "0.2.14"
-itertools = "^0.6"
-serde_derive = "1.0"
+byteorder = "1.4.2"
+getopts = "0.2.21"
+itertools = "0.10.0"
+serde_derive = "1.0.119"

crates/rslint_scope/generated/differential_datalog/Cargo.toml

@@ -8,10 +8,7 @@ use differential_dataflow::{
     difference::{Diff, Monoid},
     hashable::Hashable,
     lattice::Lattice,
-    operators::{
-        arrange::arrangement::{ArrangeBySelf, Arranged},
-        Consolidate, JoinCore, Reduce,
-    },
+    operators::{arrange::arrangement::Arranged, Consolidate, JoinCore, Reduce},
     trace::{BatchReader, Cursor, TraceReader},
     Collection, Data, ExchangeData,
 };
@@ -28,9 +25,11 @@ pub(super) enum ArrangedCollection<S, T1, T2>
 where
     S: Scope,
     S::Timestamp: Lattice + Ord,
+
     T1: TraceReader<Key = DDValue, Val = DDValue, Time = S::Timestamp, R = Weight> + Clone,
     T1::Batch: BatchReader<DDValue, DDValue, S::Timestamp, Weight>,
     T1::Cursor: Cursor<DDValue, DDValue, S::Timestamp, Weight>,
+
     T2: TraceReader<Key = DDValue, Val = (), Time = S::Timestamp, R = Weight> + Clone,
     T2::Batch: BatchReader<DDValue, (), S::Timestamp, Weight>,
     T2::Cursor: Cursor<DDValue, (), S::Timestamp, Weight>,
@@ -183,7 +182,7 @@ where
             // For each value with weight w != 1, compute an adjustment record with the same value and
             // weight (1-w)
             &collection
-                .arrange_by_self()
+                .map(|x| (x, ()))
                 .reduce(|_, src, dst| {
                     // If the input weight is 1, don't produce a surplus record.
                     if !src[0].1.is_one() {