Skip to content

Commit cacddff

Browse files
abbinarre tests all pass :)
Had to make a 2 line change to abbinare and add a sci fn binding. Can't depend on latest nbb yet as it fails with: Error building classpath. Unable to compare versions for org.babashka/sci: {:mvn/version "0.10.46", :deps/manifest :mvn} and {:git/url "https://github.com/babashka/sci", :git/sha "56104c81cb7a3804f8ee84aa64b313dc7143f30e", :deps/manifest :deps, :deps/root "/Users/me/.gitlibs/libs/org.babashka/sci/56104c81cb7a3804f8ee84aa64b313dc7143f30e"} Modifying nbb locally to depend on 0.10.46 fixes it
1 parent 3a3275c commit cacddff

33 files changed

+5939
-5952
lines changed

bb.edn

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{:paths ["script"]
22
:deps
33
{nbb.build/nbb.build
4-
{:git/url "https://github.com/babashka/nbb"
5-
:git/sha "9119dbe9b5f660cb77d29058b3b762978ee4b939"
6-
:deps/root "build"}
7-
#_{:local/root "../nbb/build"}
4+
#_{:git/url "https://github.com/babashka/nbb"
5+
:git/sha "62e749cdbd6706ccdbaeaf6017e4bfed5fc54704"
6+
:deps/root "build"
7+
:exclusions [org.babashka/sci]}
8+
{:local/root "../nbb/build"}
89
nbb/nbb
910
#_{:git/url "https://github.com/babashka/nbb"
10-
:git/sha "9119dbe9b5f660cb77d29058b3b762978ee4b939"}
11+
:git/sha "62e749cdbd6706ccdbaeaf6017e4bfed5fc54704"
12+
:exclusions [org.babashka/sci]}
1113
{:local/root "../nbb"}
12-
org.babashka/sci
13-
{:mvn/version "0.8.41"}
14+
;; org.babashka/sci
15+
;; {:mvn/version "0.10.46"}
1416
datascript/deps
1517
{:git/url "https://github.com/logseq/nbb-features"
1618
:git/sha "7b5f423b3f74b6f7a87048b51e45b1fee5ef9f56"

features/core.match/deps.edn

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
{:deps
2-
{viebel/abbinare {:mvn/version "1.10.597"}}}
2+
;; This is a fork of core.match to support nbb
3+
;; The logseq fork adds nbb support - tiny patch
4+
;; The viebel/abbinare fork ported core.match for use with self-hosteed cljs
5+
;; which is necessary for sci
6+
{logseq/abbinare
7+
{:git/url "https://github.com/logseq-cldwalker/abbinare"
8+
:git/sha "1d435ea6b3c6269196c6f1b137af78790a8b767c"}
9+
#_{:local/root "../../../abbinare"}}}

features/core.match/src/nbb/impl/core_match.cljs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
(def core-namespace
2727
{'match (sci/copy-var match m-ns)
28-
'backtrack (sci/copy-var m/backtrack m-ns)})
28+
'backtrack (sci/copy-var m/backtrack m-ns)
29+
'satisfies-ILookup? #(satisfies? ILookup %)})
2930

3031
(def config {:namespaces {'cljs.core.match core-namespace}})
3132

lib/nbb_api.js

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/nbb_bundler.js

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)