Statements: Parsing & dependency management #1

neenaoffline · 2023-10-22T21:55:21Z

This PR adds statement parsing & some dependency management. Statement evaluation will be added in a follow-up PR.

prabhanshuguptagit · 2023-10-23T14:11:49Z

src/bean/grid.cljs

+               (->> updated-addrs
+                    (deps/immediate-dependents sheet)
+                    (deps/resolve-dependents sheet)))))))


Would passing updated-addrs to resolve-dependents directly take care of getting the immediate dependents?

prabhanshuguptagit · 2023-10-23T14:12:23Z

src/bean/interpreter.cljs

+(defn eval-statements [scratch]
+  (comment
+    eval scratch
+    generate bindings names -> ast))


Can remove.

prabhanshuguptagit · 2023-10-23T14:15:45Z

src/bean/deps.cljs

+      #{})))
+
+(defn resolve-dependents [{:keys [depgraph]} deps]
+  "Iterate over the dependents and return a set of resolved dependents. :ref


Could break this into two resolve-binding-dependents, then this could just be called dependents.

src/bean/deps.cljs

src/bean/ui/scratch.cljs

To add content to statemnents, we annotate the AST with the source using instaparse's built-in functionality.

prabhanshuguptagit · 2023-11-13T14:07:26Z

src/bean/ui/scratch.cljs

@@ -0,0 +1,46 @@
+(ns bean.ui.scratch
+  (:require [bean.scratch :as scratch]


Rename scratch ns to code.

src/bean/deps.cljs

prabhanshuguptagit · 2023-11-13T14:21:50Z

src/bean/deps.cljs

+                                 (map ast->deps args))
+      :FunctionDefinition (ast->deps arg)
+      :Name (if (#{"x" "y" "z"} arg) #{} #{(->named-dep arg)})


Move this check to a formal-parameter? in interpreter.

prabhanshuguptagit · 2023-11-13T14:24:45Z

src/bean/deps.cljs

+  (let [updated-dependent-set (disj (get depgraph parent) child)]
+    (if (empty? updated-dependent-set)
+      (dissoc depgraph parent)


Why do we need to dissoc parents with no children?

src/bean/grid.cljs

prabhanshuguptagit · 2023-11-13T14:40:43Z

src/bean/grid.cljs

@@ -134,7 +110,7 @@
         (spill grid))))

 (defn parse-grid [grid]
-  (util/map-on-matrix content->cell grid))
+  (util/map-on-matrix value/from-cell grid))


This name seems incorrect, it's more like to-cell. This is the input to the interpreter, the interpreter returns a value. See ast-result.

prabhanshuguptagit · 2023-11-13T14:46:05Z

src/bean/errors.cljs

+   :representation (str "Undefined reference: \"" name "\"")})
+
+(defn named-ref-error [named error]
+  (str "name: " named ". " error))


note to self: Look at named-ref-error usage.

prabhanshuguptagit · 2023-11-13T14:49:16Z

test/bean/deps_test.cljs

+            [bean.deps :refer [make-depgraph update-depgraph]]
+            [clojure.test :refer [deftest testing is]]))
+
+(deftest depgraph-update-test


Add a test for named deps.

prabhanshuguptagit · 2023-11-13T14:50:10Z

test/bean/provenance_test.cljs

-    (let [evaled-grid (grid/eval-sheet [["1" "2" "=A1+B1"]
-                                        ["=C1" "" ""]])]
+    (let [evaled-grid (grid/eval-sheet
+                       (grid/new-sheet [["1" "2" "=A1+B1"] ["=C1" "" ""]] ""))]


Split grid into two lines if the linter allows. It's easier to read.

prabhanshuguptagit · 2023-11-13T14:56:31Z

src/bean/ui/scratch.cljs

+                         (name (or (get-in @sheet [:ui :scratch-evaluation-state])
+                                   :evaluated)))


Should put scratch-evaluation-state evaluated by default instead of defaulting here.

prabhanshuguptagit · 2023-11-13T15:06:50Z

src/bean/grid.cljs

-  {:grid parsed-grid
-   :bindings {}
-   :depgraph (make-depgraph parsed-grid)})
+(defn new-sheet [content-grid code]


Can make code default to "" unless supplied.

prabhanshuguptagit · 2023-11-13T15:18:57Z

src/bean/grid.cljs

-      eval-sheet
-      {:grid grid*
-       :depgraph (cond-> depgraph
-                   content-changed? (update-depgraph


Maybe can skip content-changed? for simplicity.

prabhanshuguptagit approved these changes Oct 23, 2023

View reviewed changes

neenaoffline force-pushed the statements branch from 3555e5a to 41e0fad Compare October 26, 2023 21:11

prabhanshuguptagit force-pushed the main branch 9 times, most recently from ad8b1b3 to 5236a35 Compare November 2, 2023 16:52

neenaoffline force-pushed the statements branch 3 times, most recently from 8327dfe to 3054cd3 Compare November 9, 2023 23:02

prabhanshuguptagit force-pushed the statements branch from 3054cd3 to 98757c8 Compare November 10, 2023 09:46

prabhanshuguptagit force-pushed the main branch from 68e24d3 to e0675ca Compare November 10, 2023 10:09

neenaoffline added 6 commits November 10, 2023 15:39

Remove run-all-tests from provenance test ns

55ae35f

Extract deps code into deps ns

30a966d

Explicit sheet initialization

f251c61

Make address the first arg of eval-sheet when addr exists

ca7ee8e

Separate eval-address from eval-sheet

b2afab1

Pass address type to eval-address

bf9362b

prabhanshuguptagit force-pushed the statements branch from 98757c8 to 63802fc Compare November 10, 2023 10:10

prabhanshuguptagit reviewed Nov 10, 2023

View reviewed changes

src/bean/deps.cljs Show resolved Hide resolved

src/bean/ui/scratch.cljs Show resolved Hide resolved

neenaoffline and others added 5 commits November 12, 2023 20:14

eval-address for :named addresses

a748d0f

Add separate deps tests

d3e449c

Tie in secondary space UI with the functionality

b3681db

Handle errors in statement handling

03bebd4

Add buttons to switch between dark/light mode

2121420

neenaoffline force-pushed the statements branch from 63802fc to 286ca7b Compare November 13, 2023 01:44

Add content to statements. Change dep type from :Name -> :named.

eded98d

To add content to statemnents, we annotate the AST with the source using instaparse's built-in functionality.

neenaoffline force-pushed the statements branch from 286ca7b to eded98d Compare November 13, 2023 01:48

prabhanshuguptagit reviewed Nov 13, 2023

View reviewed changes

prabhanshuguptagit merged commit da18f0a into main Nov 14, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Statements: Parsing & dependency management #1

Statements: Parsing & dependency management #1

neenaoffline commented Oct 22, 2023

prabhanshuguptagit Oct 23, 2023

prabhanshuguptagit Oct 23, 2023

prabhanshuguptagit Oct 23, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

prabhanshuguptagit Nov 13, 2023

		@@ -0,0 +1,46 @@
		(ns bean.ui.scratch
		(:require [bean.scratch :as scratch]

		(name (or (get-in @sheet [:ui :scratch-evaluation-state])
		:evaluated)))

Statements: Parsing & dependency management #1

Statements: Parsing & dependency management #1

Conversation

neenaoffline commented Oct 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment