summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--org/config.org48
-rw-r--r--org/d.org25
-rw-r--r--org/gleam.org276
3 files changed, 146 insertions, 203 deletions
diff --git a/org/config.org b/org/config.org
index 8420c3b..6359b4f 100644
--- a/org/config.org
+++ b/org/config.org
@@ -280,54 +280,8 @@ erl_crash.dump
!**/*.yaml
#+END_SRC
-* versions GET
-** dlang overlays
-*** ldc
-
-#+NAME: ldc_version
-#+HEADER: :noweb yes
-#+BEGIN_SRC emacs-lisp
-<<./nix-develop-dlang-shared.org:ldc-version()>>
-#+END_SRC
-
-*** dmd
-
-#+NAME: dmd_version
-#+HEADER: :noweb yes
-#+BEGIN_SRC emacs-lisp
-<<./nix-develop-dlang-shared.org:dmd-version()>>
-#+END_SRC
-
-*** dub
-
-#+NAME: dub_version
-#+HEADER: :noweb yes
-#+BEGIN_SRC emacs-lisp
-<<./nix-develop-dlang-shared.org:dub-version()>>
-#+END_SRC
-
-*** dtools
-
-#+NAME: dtools_version
-#+HEADER: :noweb yes
-#+BEGIN_SRC emacs-lisp
-<<./nix-develop-dlang-shared.org:dtools-version()>>
-#+END_SRC
-
-** sha256 blank hash
-
-#+NAME: sha256-blank
-#+BEGIN_SRC nix
-<<./nix-develop-dlang-shared.org:sha256-blank()>>
-#+END_SRC
-
-#+NAME: blank_hash
-#+BEGIN_SRC nix
-<<./nix-develop-dlang-shared.org:sha256-blank()>>
-#+END_SRC
-
* org includes
-** spine project VERSION
+** project version
#+NAME: spine_version
#+HEADER: :noweb yes
diff --git a/org/d.org b/org/d.org
index 1eade53..4897346 100644
--- a/org/d.org
+++ b/org/d.org
@@ -1445,7 +1445,7 @@ struct Db {
#+END_SRC
** compression
-*** dlang read zip
+*** zip
#+HEADER: :tangle "../dlang/src/ocda/zip.d"
#+BEGIN_SRC d
@@ -1567,7 +1567,7 @@ private uint u32(const(ubyte)[] b, size_t i) {
}
#+END_SRC
-*** dlang read zstd
+*** zstd
#+HEADER: :tangle "../dlang/src/ocda/zstd.d"
#+BEGIN_SRC d
@@ -2063,7 +2063,7 @@ void printFiles(string path) {
#+END_SRC
** check
-*** read validate =.ssp=
+*** validate =.ssp=
#+HEADER: :tangle "../dlang/src/read/validate.d"
#+BEGIN_SRC d
@@ -2335,7 +2335,7 @@ void reportValidation(string filename, SspFinding[] found) {
}
#+END_SRC
-*** read verify images
+*** verify images
#+HEADER: :tangle "../dlang/src/read/verify.d"
#+BEGIN_SRC d
@@ -2556,7 +2556,7 @@ private int beInt(const(ubyte)[] b) {
}
#+END_SRC
-*** read report unknown
+*** report unknown
#+HEADER: :tangle "../dlang/src/read/report_unknown.d"
#+BEGIN_SRC d
@@ -2605,7 +2605,7 @@ void reportUnknown(ref OcdaDocument doc) {
#+END_SRC
** misc
-*** read tree
+*** tree
#+HEADER: :tangle "../dlang/src/read/tree.d"
#+BEGIN_SRC d
@@ -2681,7 +2681,7 @@ private string stripInternalMarkup(string text) {
}
#+END_SRC
-*** read html
+*** html
#+HEADER: :tangle "../dlang/src/read/html.d"
#+BEGIN_SRC d
@@ -3076,7 +3076,7 @@ private string[] htmlTail() {
}
#+END_SRC
-*** read images
+*** images
#+HEADER: :tangle "../dlang/src/read/images.d"
#+BEGIN_SRC d
@@ -3198,7 +3198,7 @@ package immutable string[] sectionNames = [
#+END_SRC
** llm
-*** read llm text
+*** llm text
#+HEADER: :tangle "../dlang/src/read/llm_text.d"
#+BEGIN_SRC d
@@ -3387,7 +3387,7 @@ string stripMarkup(string text) {
}
#+END_SRC
-*** read llm jsonl
+*** llm jsonl
#+HEADER: :tangle "../dlang/src/read/llm_jsonl.d"
#+BEGIN_SRC d
@@ -3516,8 +3516,7 @@ private string jsonStr(string s) {
#+END_SRC
* test
-** tests
-*** test agree
+** test agree
#+HEADER: :tangle "../dlang/test/agree.d"
#+BEGIN_SRC d
@@ -3608,7 +3607,7 @@ int main(string[] args) {
}
#+END_SRC
-*** test dump
+** test dump
#+HEADER: :tangle "../dlang/test/dump.d"
#+BEGIN_SRC d
diff --git a/org/gleam.org b/org/gleam.org
index 05fe9c7..dbfb3fd 100644
--- a/org/gleam.org
+++ b/org/gleam.org
@@ -17,16 +17,6 @@
* ocda
** ocda lib
-*** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda_lib.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_lib>>
-#+END_SRC
-
-*** source
#+NAME: ocda_lib
#+HEADER: :no-expand
@@ -177,18 +167,8 @@ fn fail(message: String) -> Nil {
fn halt(code: Int) -> Nil
#+END_SRC
-* ocda
-** model
-*** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/model.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<model>>
-#+END_SRC
-
-*** source
+** ocda
+*** model
#+NAME: model
#+HEADER: :no-expand
@@ -477,18 +457,8 @@ pub fn is_preamble_block(name: String) -> Bool {
}
#+END_SRC
-** what to load
-*** inventory
-**** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/inventory.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_inventory>>
-#+END_SRC
-
-**** source
+*** what to load
+**** inventory
#+NAME: ocda_inventory
#+HEADER: :no-expand
@@ -633,17 +603,8 @@ fn source_value(source: dict.Dict(String, String), key: String) -> String {
fn sha256_hex(bytes: BitArray) -> String
#+END_SRC
-*** load
**** load
-***** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/load.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_load>>
-#+END_SRC
-***** source
+***** load
#+NAME: ocda_load
#+HEADER: :no-expand
@@ -729,17 +690,7 @@ pub fn load(
}
#+END_SRC
-**** load pod
-***** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/load_pod.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_load_pod>>
-#+END_SRC
-
-***** source
+***** load pod
#+NAME: ocda_load_pod
#+HEADER: :no-expand
@@ -884,17 +835,7 @@ pub fn bit_array_to_string(b: BitArray) -> Result(String, Nil) {
}
#+END_SRC
-**** load ssp
-***** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/load_ssp.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_load_ssp>>
-#+END_SRC
-
-***** source
+***** load ssp
#+NAME: ocda_load_ssp
#+HEADER: :no-expand
@@ -1387,17 +1328,7 @@ fn numbers(value: String) -> List(Int) {
}
#+END_SRC
-**** load db
-***** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/load_db.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_load_db>>
-#+END_SRC
-
-***** source
+***** load db
#+NAME: ocda_load_db
#+HEADER: :no-expand
@@ -2073,17 +2004,7 @@ pub fn carried_of_file(path: String) -> Result(List(List(String)), String) {
}
#+END_SRC
-*** images
-**** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/images.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_images>>
-#+END_SRC
-
-**** source
+**** images
#+NAME: ocda_images
#+HEADER: :no-expand
@@ -2225,17 +2146,7 @@ pub fn byte_size(b: BitArray) -> Int {
}
#+END_SRC
-** compression - zip
-*** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/zip.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_zip>>
-#+END_SRC
-
-*** source
+*** compression - zip
#+NAME: ocda_zip
#+HEADER: :no-expand
@@ -2412,17 +2323,7 @@ fn text(bytes: BitArray, at: Int, len: Int) -> Result(String, String) {
}
#+END_SRC
-** dump
-*** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda/dump.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<ocda_dump>>
-#+END_SRC
-
-*** source
+*** dump
#+NAME: ocda_dump
#+HEADER: :no-expand
@@ -2678,18 +2579,7 @@ fn ints(xs: List(Int)) -> String {
}
#+END_SRC
-* erlang
-** erlang
-*** tangle
-
-#+HEADER: :tangle ../gleam/src/ocda_ffi.erl
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-%%<<doc_header_including_copyright_and_license>>
-<<ocda_erlang_ffi>>
-#+END_SRC
-
-*** erlang source
+*** erlang
#+NAME: ocda_erlang_ffi
#+HEADER: :no-expand
@@ -2705,16 +2595,6 @@ sha256_hex(Bin) -> binary:encode_hex(crypto:hash(sha256, Bin)).
* read
** main
-*** tangle
-
-#+HEADER: :tangle ../gleam/src/read/main.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<read>>
-#+END_SRC
-
-*** source
#+NAME: read
#+HEADER: :no-expand
@@ -3181,17 +3061,6 @@ fn section_of_unknown(
#+END_SRC
* test
-** gleam
-*** tangle
-
-#+HEADER: :tangle ../gleam/test/ocda_lib_test.gleam
-#+HEADER: :noweb yes
-#+BEGIN_SRC org
-////<<doc_header_including_copyright_and_license>>
-<<test>>
-#+END_SRC
-
-*** gleam source
#+NAME: test
#+HEADER: :no-expand
@@ -3346,6 +3215,127 @@ pub fn zstd_refusal_test() {
}
#+END_SRC
+* org-tangles
+** ocda lib
+
+#+HEADER: :tangle ../gleam/src/ocda_lib.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_lib>>
+#+END_SRC
+
+** ocda
+*** model
+
+#+HEADER: :tangle ../gleam/src/ocda/model.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<model>>
+#+END_SRC
+
+*** what to load
+**** inventory
+
+#+HEADER: :tangle ../gleam/src/ocda/inventory.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_inventory>>
+#+END_SRC
+
+**** load
+***** load
+
+#+HEADER: :tangle ../gleam/src/ocda/load.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_load>>
+#+END_SRC
+***** load pod
+
+#+HEADER: :tangle ../gleam/src/ocda/load_pod.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_load_pod>>
+#+END_SRC
+
+***** load ssp
+
+#+HEADER: :tangle ../gleam/src/ocda/load_ssp.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_load_ssp>>
+#+END_SRC
+
+***** load db
+
+#+HEADER: :tangle ../gleam/src/ocda/load_db.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_load_db>>
+#+END_SRC
+
+**** images
+
+#+HEADER: :tangle ../gleam/src/ocda/images.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_images>>
+#+END_SRC
+
+*** compression - zip
+
+#+HEADER: :tangle ../gleam/src/ocda/zip.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_zip>>
+#+END_SRC
+
+*** dump
+
+#+HEADER: :tangle ../gleam/src/ocda/dump.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<ocda_dump>>
+#+END_SRC
+
+*** erlang
+
+#+HEADER: :tangle ../gleam/src/ocda_ffi.erl
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+%%<<doc_header_including_copyright_and_license>>
+<<ocda_erlang_ffi>>
+#+END_SRC
+
+** read
+*** main
+
+#+HEADER: :tangle ../gleam/src/read/main.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<read>>
+#+END_SRC
+
+** test
+
+#+HEADER: :tangle ../gleam/test/ocda_lib_test.gleam
+#+HEADER: :noweb yes
+#+BEGIN_SRC org
+////<<doc_header_including_copyright_and_license>>
+<<test>>
+#+END_SRC
+
* config
** nix flake.nix :flake: