Skip to content

Remove Superfluous Sets #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
milt wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove Superfluous Sets #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f679b78
Don't eagerly make sets for scope, also call it scope-vars to match t…
milt Aug 20, 2026
edb8082
transduce consistently why don't you
milt Aug 20, 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
18 changes: 9 additions & 9 deletions src/main/com/yetanalytics/flint/validate/scope.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
[var scope-vars zip-loc k]
{:kind ::var-in-scope
:variable var
:scope-vars scope-vars
:scope-vars (set scope-vars)
:path (conj (vu/zip-path zip-loc) k)})

(defn- not-in-scope-err-map
[vars scope-vars zip-loc k]
{:kind ::var-not-in-scope
:variables vars
:scope-vars scope-vars
:scope-vars (set scope-vars)
:path (conj (vu/zip-path zip-loc) k)})

(defn- validate-bind
Expand All @@ -30,10 +30,10 @@
prev-elems (-> loc
zip/up ; :where/special
zip/lefts)
scope (set (mapcat vv/get-scope-vars prev-elems))
scope-names (set (map p/variable-name scope))]
scope-vars (mapcat vv/get-scope-vars prev-elems)
scope-names (into #{} (map p/variable-name) scope-vars)]
(when (contains? scope-names (p/variable-name bind-var))
(in-scope-err-map bind-var scope loc :where/bind))))
(in-scope-err-map bind-var scope-vars loc :where/bind))))

(defn- validate-select
"Validate `SELECT ... (expr AS var) ..."
Expand All @@ -51,16 +51,16 @@
where-vars (-> where second vv/get-scope-vars)
group-vars (some-> ?group-by vv/group-by-projected-vars)
prev-vars (mapcat vv/get-scope-vars prev-elems)
scope (set (concat where-vars group-vars prev-vars))
scope-names (set (map p/variable-name scope))]
scope-vars (concat where-vars group-vars prev-vars)
scope-names (into #{} (map p/variable-name) scope-vars)]
(if-some [bad-expr-vars (->> expr-vars
(remove #(contains? scope-names
(p/variable-name %)))
vv/distinct-vars
not-empty)]
(not-in-scope-err-map bad-expr-vars scope loc :select/expr-as-var)
(not-in-scope-err-map bad-expr-vars scope-vars loc :select/expr-as-var)
(when (contains? scope-names (p/variable-name bind-var))
(in-scope-err-map bind-var scope loc :select/expr-as-var)))))
(in-scope-err-map bind-var scope-vars loc :select/expr-as-var)))))

(defn- validate-node-locs
[validation-fn node-locs]
Expand Down
Loading