Get SCI macros tested + working #1

sritchie · 2021-01-06T14:36:54Z

This PR:

adds tests for some of the forms that you had already tested, @mk
massages the macros into shape, and adds tests for these too
adds a bunch more namespaces to the default SCI context

I also bound sicmutils.env as itself AND as user, instead of replacing it.

@mk , I'll add more comments inline!

sritchie

Some comments giving "context" (yuk yuk, SCI joke) about the PR>

sritchie · 2021-01-06T14:37:48Z

src/sicmutils/abstract/function.cljc

@@ -166,22 +166,26 @@
         :else
         (u/illegal (str "WTF range" range)))))

+(defn binding-pairs [litfns]


I pulled the logic that lived outside of quasiquote land so that we had a bit less to duplicate in the sci macros namespace. I tested that this works, and the existing tests will exercise it too.

sritchie · 2021-01-06T14:38:37Z

src/sicmutils/calculus/coordinate.cljc

@@ -34,9 +34,11 @@
                    #(m/point->coords coordinate-system %)))
            (s/structure->access-chains prototype))))

-(defn ^:private quotify-coordinate-prototype


Rather than use the #' var resolution trick to get past private, let's just make this public.

(This has to be available to SCI because the macroexpanded body of let-coordinates refers to this symbol.)

sritchie · 2021-01-06T14:39:57Z

src/sicmutils/env.cljc

@@ -48,6 +48,7 @@
            [sicmutils.numerical.quadrature]
            [sicmutils.mechanics.lagrange]
            [sicmutils.mechanics.hamilton]
+            [sicmutils.mechanics.rigid]


this is a very cool namespace behind Colin's latest "tumbling T handle" demo that I want to recreate. We don't explicitly bind any of its symbols in env but I want it available for requiring.

sritchie · 2021-01-06T14:40:16Z

src/sicmutils/env.cljc

@@ -340,7 +341,11 @@
  zero-like one-like identity-like
  numerical? freeze kind kind-predicate])

-;; Macros. These work with Potemkin's import, but not with the Clojure version.
+;; Macros. These work with Potemkin's import, but not with the Clojure


note for myself, let's leave it in!

sritchie · 2021-01-06T14:43:32Z

src/sicmutils/env/sci.cljc

-
-(defn ->sci-var [[var-name the-var]]
-  [var-name (cond-> (deref the-var)
-              (-> the-var meta :macro)


I think this was from an earlier experiment, where we changed the meta, before we realized that we had to rewrite the whole macro. We actually want to filter all macros out.

sritchie · 2021-01-06T14:44:14Z

src/sicmutils/env/sci.cljc

-(comment
-  (defn eval [form]
-    (sci/eval-string* ctx (pr-str form)))
+  - any pair removed whose value is a macro (tagged with `:macro true` metadata)


I think this does everything we want all bundled up.

sritchie · 2021-01-06T14:44:21Z

src/sicmutils/env/sci.cljc

+compilation and interesting enough in their own right to expose to a user by
+default."}
+  namespaces
+  #{'sicmutils.env


what a list!

sritchie · 2021-01-06T14:44:32Z

src/sicmutils/env/sci.cljc


-  (eval '(literal-function 'U))


I moved these to the tests.

sritchie · 2021-01-06T14:44:51Z

src/sicmutils/env/sci/macros.cljc

@@ -31,8 +59,8 @@
    `(let [[~@c-systems :as c-systems#]
           (mapv m/with-coordinate-prototype
                 ~c-systems
-                 ~(mapv #(sicmutils.calculus.coordinate/quotify-coordinate-prototype identity %) prototypes))
-           c-fns# (map coordinate-functions c-systems#)
+                 ~(mapv #(cc/quotify-coordinate-prototype identity %) prototypes))


woohoo, these all work, and are locked in to the tests!

sritchie · 2021-01-06T14:45:44Z

test/sicmutils/expression/render_test.cljc

@@ -102,7 +102,7 @@
  (is (= "x^y" (s->infix (expt 'x 'y)))))

 (deftest more-with-D
-  (af/with-literal-functions [f g [p [] 0]]
+  (af/with-literal-functions [f g]


I found this during a head-scratching moment trying to decode the syntax for the three arg version (it's name, domain, range of fn), and realized... I don't think an abstract function of NO arity can do anything...

whatever the answer is p is not used in the body here, so we can delete.

sritchie · 2021-01-07T18:06:25Z

src/sicmutils/mechanics/hamilton.cljc

@@ -83,15 +83,17 @@
            v (/ (- w b) M)]
        (- (* w v) (F v))))))

-(def Legendre-transform (make-operator Legendre-transform-fn "Legendre-transform"))


A little catch I saw when investigating the env namespace! The operator name should be a symbol, not a string.

mk

Looks great, just a minor remark about exposing the ns-map for sci. But I can also look into this tomorrow.

mk · 2021-01-07T21:44:36Z

src/sicmutils/env/sci.cljc

+  (let [ns-map (into {}
+                     (map (fn [[k v]] [k (sci-ns v)]))
+                     ns-map)
+        with-macros (merge-with merge ns-map macros/ns-bindings)]


For nextjournal (and other downstream consumers) it might be good to also expose the plain sci namespace map (what with-macros is here). Without any assumptions of what the user ns is. Maybe this is what the ns-map var could be turned into?

yes, good call, that's much better. I made that fix and moved the 'user change into the nextjournal test PR.

…icmutils#218)

sritchie added 3 commits January 4, 2021 06:35

muck with sci

58a0cd8

macros work

19f3b60

new macros

f73e26f

sritchie commented Jan 6, 2021

View reviewed changes

sritchie added 2 commits January 7, 2021 11:02

fix sci

c283e31

update docstring

e8ccd73

sritchie commented Jan 7, 2021

View reviewed changes

sritchie added 2 commits January 7, 2021 12:01

final sci shenanigans

cee96df

tidy macros

857cf89

mk reviewed Jan 7, 2021

View reviewed changes

remove user

04c3cd2

mk merged commit d1be1d1 into mk:sci-env Jan 7, 2021

sritchie deleted the sritchie/sci_tests branch January 7, 2021 22:13

mk pushed a commit that referenced this pull request Feb 23, 2022

Make arity a protocol, move numerical? to own protocol (autodiff #1) (s…

b01f408

…icmutils#218)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Get SCI macros tested + working #1

Get SCI macros tested + working #1

sritchie commented Jan 6, 2021

sritchie left a comment

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 6, 2021

sritchie Jan 7, 2021

mk left a comment

mk Jan 7, 2021

sritchie Jan 7, 2021

Get SCI macros tested + working #1

Get SCI macros tested + working #1

Conversation

sritchie commented Jan 6, 2021

sritchie left a 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

mk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment