Skip to content

Commit

Permalink
removing some legacy init! references (#81)
Browse files Browse the repository at this point in the history
Also removing some merge conflict mistakes
  • Loading branch information
light-matters authored Jul 22, 2024
1 parent 9bd8b75 commit fe3b2d8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 16 deletions.
10 changes: 2 additions & 8 deletions dev/dev.clj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
(ns dev
(:refer-clojure
;; Exclude symbols also used by Wolfram:
:exclude [Byte Character Integer Number Short String Thread])
:exclude [Byte Character Integer Number Short String Thread])
(:require
[wolframite.core :as wl]))
[wolframite.core :as wl]))

(println "Initializing Wolframite...")
<<<<<<< HEAD
(wl/init!)
=======
(wl/start)
>>>>>>> 9b7f3e918f65f2a6e9bc56222b3015173256ce71

(comment ;; Get Started!

Expand All @@ -30,7 +26,5 @@
;;
(clojure.repl/doc Dot)



#_:end-comment)

6 changes: 3 additions & 3 deletions src/wolframite/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
:wolfram-kernel-name \"Wolfram Language 14.0.0 Engine\"
:max-license-processes 2} ; how many concurrent kernels (=> Wolframite REPLs/processes) may we run
```
Requires [[init!]] to be called first."
Requires [[start]] to be called first."
[]
(zipmap
[:wolfram-version :wolfram-kernel-name :max-license-processes]
Expand Down Expand Up @@ -170,7 +170,7 @@
"Evaluate the given Wolfram expression (a string, or a Clojure data) and return the result as Clojure data.
Args:
- `opts` - same as those for [[init!]]
- `opts` - same as those for [[start]]
Example:
```clojure
Expand All @@ -189,7 +189,7 @@
eval-opts)
expr' (unqualify (if (string? expr) (express/express expr with-eval-opts) expr))]
(cep/cep expr' with-eval-opts))
(throw (IllegalStateException. "Not initialized, call init! first")))))
(throw (IllegalStateException. "Not initialized, call start first")))))

;; TODO Should we expose this, or will just folks shoot themselves in the foot with it?
(defn- clj-intern-autoevaled
Expand Down
2 changes: 1 addition & 1 deletion src/wolframite/impl/wolfram_syms/write_ns.clj
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
- `opts` is a map that may contain:
- `:aliases` - see `wl/start` for details; a var will be made for each alias, just as we do for `*`,
so that you can use it just as you do with `(w/* 2 3)`. Beware: You will still also need to
pass your custom aliases to init! or eval.
pass your custom aliases to start or eval.
Requires that you've run `wl/start` first."
([path] (write-ns! path nil))
Expand Down
4 changes: 0 additions & 4 deletions test/wolframite/core_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@
;; :output-fn str})))))

(deftest load-all-symbols-test
<<<<<<< HEAD
(wl/init!)
=======
(wl/start)
>>>>>>> 9b7f3e918f65f2a6e9bc56222b3015173256ce71
(wolfram-syms/load-all-symbols wl/eval 'w2)
(is (= 3
(wl/eval (eval '(w2/Plus 1 2))))
Expand Down

0 comments on commit fe3b2d8

Please sign in to comment.