aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--maker.org39
-rw-r--r--org/ao_abstract_doc_source.org4
-rw-r--r--org/ao_assertions.org4
-rw-r--r--org/ao_defaults.org4
-rw-r--r--org/ao_emitters_and_interfaces.org4
-rw-r--r--org/ao_object_setter.org4
-rw-r--r--org/ao_output_debugs.org4
-rw-r--r--org/ao_read_markup_source.org (renamed from org/ao_markup_source_raw.org)28
-rw-r--r--org/ao_rgx.org4
-rw-r--r--org/ao_scan_inserts.org4
-rw-r--r--org/ao_utils.org4
-rw-r--r--org/sdp.org23
12 files changed, 78 insertions, 48 deletions
diff --git a/maker.org b/maker.org
index c718f84..144e04a 100644
--- a/maker.org
+++ b/maker.org
@@ -3,20 +3,20 @@
#+EMAIL: ralph.amissah@gmail.com
#+STARTUP: indent
#+LANGUAGE: en
-#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil -:t f:t *:t <:t
+#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+OPTIONS: ^:nil _:nil#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp_dev:makefile:
+#+FILETAGS: :sdp:rel:makefile:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* sdp makefile
-[[./org/sdp.org][sdp.org]]
+[[./org/sdp.org][sdp.org]] [[./org/][org/]]
** settings [+2] :settings:
*** alternative D compilers [+1] :compiler:
**** dmd :dmd:
+
#+BEGIN_SRC makefile :padline no :tangle makefile
DMD=dmd
DMD_FLAGS=-de -w
@@ -25,6 +25,7 @@ DMD_FLAG_BINOF=-of
#+END_SRC
**** ldc2 :ldc:
+
#+BEGIN_SRC makefile :tangle makefile
LDC=ldc2
LDC_FLAGS=-w
@@ -33,6 +34,7 @@ LDC_FLAG_BINOF=-of=
#+END_SRC
**** gdc :gdc:
+
#+BEGIN_SRC makefile :tangle makefile
GDC=gdc
#GDC=gdc-5
@@ -41,13 +43,15 @@ GDC_FLAGS_RELEASE=-frelease
GDC_FLAG_BINOF=-o
#+END_SRC
-*** set/select: ~D compiler~ & ~debug flags~ [+1] [2/2] :select:
+*** TODO set/select: ~D compiler~ & ~debug flags~ [+1] [2/2] :select:
- [X] Set D_COMPILER (one of DMD LDC or GDC)
- [X] Set debug flags (using DMD standard flag -debug=)
+
**** SET compiler: "SET_D_COMPILER=": :compiler:select:
[[http://wiki.dlang.org/Compilers][D Compilers wiki]]
[[http://dlang.org/download.html][D Compilers download]]
Set D_COMPILER one of DMD LDC or GDC e.g.: SET_D_COMPILER=DMD
+
#+BEGIN_SRC makefile :tangle makefile
# SET_D_COMPILER=(one of: DMD LDC or GDC):
SET_D_COMPILER=LDC
@@ -56,12 +60,14 @@ SET_D_COMPILER=LDC
**** SET debug flags: "SET_DC_FLAGS_DEBUG_EXTRA=-debug=": :compiler:flags:debug:
Set debug flags using DMD standard flag -debug= e.g.:
SET_DC_FLAGS_DEBUG_EXTRA=-debug=headings -debug=bookindex
+
#+BEGIN_SRC makefile :tangle makefile
SET_DC_FLAGS_DEBUG_EXTRA=-debug=headings -debug=footnotes -debug=endnotes
#+END_SRC
*** D compiler settings [+1] :settings:compiler:
**** compiler settings
+
#+BEGIN_SRC makefile :tangle makefile
DC=$($(SET_D_COMPILER))
DC_FLAGS=$($(shell echo $(SET_D_COMPILER)_FLAGS))
@@ -73,6 +79,7 @@ DC_FLAGS_DEBUG_SET=\
#+END_SRC
**** compiler conditional settings (depending on selected D compiler)
+
#+BEGIN_SRC makefile :tangle makefile
ifeq ($(DC), $(DMD))
DC_FLAGS_DEBUG :=$(shell echo $(DC_FLAGS_DEBUG_SET))
@@ -86,6 +93,7 @@ endif
#+END_SRC
*** Project Details :project:sdp:
+
#+BEGIN_SRC makefile :tangle makefile
PRG_NAME=sdp
PRG_SRC=$(PRG_NAME).d
@@ -94,7 +102,8 @@ PRG_BIN=$(PRG_NAME)
PRG_BINDIR=bin
#+END_SRC
-*** Emacs Org settings :settings:emacs:org:
+*** Emacs Org settings :settings:emacs:org:tangle:
+
#+BEGIN_SRC makefile :tangle makefile
# ORG
EMACSLISP=/usr/share/emacs/site-lisp
@@ -121,8 +130,9 @@ ORGDIR=$(shell echo `pwd`)
- git snapshot
- gitsnapshot
-*** build commands [+1]
+*** build commands [+1] :build:compile:
**** build rebuild
+
#+BEGIN_SRC makefile :tangle makefile
all: build
@@ -135,6 +145,7 @@ rebuild: $(PRG_SRCDIR)/$(PRG_SRC) $(PRG_BINDIR)/$(PRG_BIN).o clean build
#+END_SRC
**** debug
+
#+BEGIN_SRC makefile :tangle makefile
debug: $(PRG_SRCDIR)/$(PRG_SRC)
$(DC) $(DC_FLAGS) $(DC_FLAGS_DEBUG) \
@@ -158,6 +169,7 @@ debug_gdc: $(PRG_SRCDIR)/$(PRG_SRC)
#+END_SRC
**** release
+
#+BEGIN_SRC makefile :tangle makefile
release: distclean_and_init tangle $(PRG_SRCDIR)/$(PRG_SRC)
$(DC) $(DC_FLAGS) $(DC_FLAGS_RELEASE) \
@@ -165,7 +177,8 @@ release: distclean_and_init tangle $(PRG_SRCDIR)/$(PRG_SRC)
$(PRG_SRCDIR)/$(PRG_SRC)
#+END_SRC
-*** init clean distclean etc.
+*** init clean distclean etc. :clean:
+
#+BEGIN_SRC makefile :tangle makefile
init:
mkdir -p $(PRG_SRCDIR); \
@@ -185,7 +198,8 @@ distclean_and_init: init $(PRG_BINDIR) expunge
mkdir -p $(PRG_BINDIR);
#+END_SRC
-*** Org Babel Tangle batch process command
+*** Org Babel Tangle batch process command :tangle:
+
#+BEGIN_SRC makefile :tangle makefile
tangle:
for f in $(ORGFILELIST); do \
@@ -208,12 +222,14 @@ tangle:
#+END_SRC
*** Git snapshot
+
#+BEGIN_SRC makefile :tangle makefile
gitsnapshot: distclean_and_init tangle
git commit -a
#+END_SRC
** phony
+
#+BEGIN_SRC makefile :tangle makefile
.PHONY : all build rebuild debug release \
clean distclean init \
@@ -222,7 +238,10 @@ gitsnapshot: distclean_and_init tangle
* sh script to batch process emacs org babel tangle :shell_script:tangle:
[http://orgmode.org/manual/Batch-execution.html]
-creates a shell batch script called "tangle", that will tangle (emacs org babel tangle) org files in ./org/ to create .d source files in ./lib/sdp/ (similar functionality is contained within the "makefile" created by this "maker.org" file make tangle)
+creates a shell batch script called "tangle", that will tangle (emacs org
+babel tangle) org files in ./org/ to create .d source files in ./lib/sdp/
+(similar functionality is contained within the "makefile" created by this
+"maker.org" file make tangle)
#+BEGIN_SRC sh :tangle tangle :padline no :tangle-mode (identity #o755) :shebang #!/bin/sh
# -*- mode: shell-script -*-
diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org
index ea334a9..6694fa0 100644
--- a/org/ao_abstract_doc_source.org
+++ b/org/ao_abstract_doc_source.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* document abstraction :abstract:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
Process markup document, create document abstraction.
** initialize
#+name: abs_init
diff --git a/org/ao_assertions.org b/org/ao_assertions.org
index a253e33..b041541 100644
--- a/org/ao_assertions.org
+++ b/org/ao_assertions.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* assertions :mixin:assert:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
** mixin template: assertions on markup document structure :doc_structure:
#+name: ao_assertions
#+BEGIN_SRC d :exports none
diff --git a/org/ao_defaults.org b/org/ao_defaults.org
index 73dba74..27039c7 100644
--- a/org/ao_defaults.org
+++ b/org/ao_defaults.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* defaults :template:defaults:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
** template: header :header:
#+name: ao_defaults_templates
#+BEGIN_SRC d :exports none
diff --git a/org/ao_emitters_and_interfaces.org b/org/ao_emitters_and_interfaces.org
index 3ef1dff..0f80bc9 100644
--- a/org/ao_emitters_and_interfaces.org
+++ b/org/ao_emitters_and_interfaces.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* emitters & interfaces
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
ao_interface.d
ao_emitter.d
various emitters and their interfaces (where available)
diff --git a/org/ao_object_setter.org b/org/ao_object_setter.org
index 836e14a..f6b9322 100644
--- a/org/ao_object_setter.org
+++ b/org/ao_object_setter.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* object setter :object:set:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
** struct :struct:
#+name: ao_object_setter
#+BEGIN_SRC d :exports none
diff --git a/org/ao_output_debugs.org b/org/ao_output_debugs.org
index ecad21f..4891df9 100644
--- a/org/ao_output_debugs.org
+++ b/org/ao_output_debugs.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* output debugs :debug:output:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
** (parent) :parent:
#+name: ao_output_debugs
#+BEGIN_SRC d :exports none
diff --git a/org/ao_markup_source_raw.org b/org/ao_read_markup_source.org
index 5923116..d6cb0dc 100644
--- a/org/ao_markup_source_raw.org
+++ b/org/ao_read_markup_source.org
@@ -1,4 +1,4 @@
-#+TITLE: sdp markup source raw
+#+TITLE: sdp read markup source
#+AUTHOR: Ralph Amissah
#+EMAIL: ralph.amissah@gmail.com
#+STARTUP: indent
@@ -9,14 +9,14 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
-* markup source raw :markup:
-[[./sdp.org][sdp]]
+* read markup source :markup:
+[[./sdp.org][sdp]] [[./][org/]]
** source string :string:
-#+name: ao_markup_source_raw
+#+name: ao_read_markup_source
#+BEGIN_SRC d :exports none
final private string markupSourceString(in char[] fn_src) {
enforce(
@@ -44,7 +44,7 @@ final private string markupSourceString(in char[] fn_src) {
#+END_SRC
** source line array :array:
-#+name: ao_markup_source_raw
+#+name: ao_read_markup_source
#+BEGIN_SRC d :exports none
final private char[][] markupSourceLineArray(in string src_text) {
char[][] source_line_arr =
@@ -54,7 +54,7 @@ final private char[][] markupSourceLineArray(in string src_text) {
#+END_SRC
** insert source content raw line array :array:
-#+name: ao_markup_source_raw
+#+name: ao_read_markup_source
#+BEGIN_SRC d :exports none
final char[][] markupInsertSourceContentRawLineArray(in char[] fn_src) {
enforce(
@@ -68,7 +68,7 @@ final char[][] markupInsertSourceContentRawLineArray(in char[] fn_src) {
#+END_SRC
** source content raw line array :array:
-#+name: ao_markup_source_raw
+#+name: ao_read_markup_source
#+BEGIN_SRC d :exports none
final char[][] markupSourceContentRawLineArray(in char[] fn_src) {
enforce(
@@ -82,17 +82,17 @@ final char[][] markupSourceContentRawLineArray(in char[] fn_src) {
#+END_SRC
* tangles :tangle:
-** code structure: :ao_markup_source_raw.d:
-#+name: tangle_ao_markup_source_raw
-#+BEGIN_SRC d :tangle ../lib/sdp/ao_markup_source_raw.d :padline no :exports none :noweb yes
+** code structure: :ao_read_markup_source.d:
+#+name: tangle_ao_read_markup_source
+#+BEGIN_SRC d :tangle ../lib/sdp/ao_read_markup_source.d :padline no :exports none :noweb yes
/*
- markup source raw
- ao_markup_source_raw.d
+ read markup source
+ ao_read_markup_source.d
*/
mixin template SiSUmarkupRaw() {
class MarkupRaw {
auto rgx = new Rgx();
- <<ao_markup_source_raw>>
+ <<ao_read_markup_source>>
}
}
#+END_SRC
diff --git a/org/ao_rgx.org b/org/ao_rgx.org
index eecad70..39767eb 100644
--- a/org/ao_rgx.org
+++ b/org/ao_rgx.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* regex :regex:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
** misc :misc:
#+name: ao_rgx
#+BEGIN_SRC d :exports none
diff --git a/org/ao_scan_inserts.org b/org/ao_scan_inserts.org
index f595ea5..5da6b0a 100644
--- a/org/ao_scan_inserts.org
+++ b/org/ao_scan_inserts.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* inserts :inserts:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
** scan inserts (sub-document) source :scan_insert_src:
*** scan subdoc source
diff --git a/org/ao_utils.org b/org/ao_utils.org
index 1cc3313..9f3bdb5 100644
--- a/org/ao_utils.org
+++ b/org/ao_utils.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:ao:
+#+FILETAGS: :sdp:rel:ao:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
* utils :utils:
-[[./sdp.org][sdp]]
+[[./sdp.org][sdp]] [[./][org/]]
** set colors for terminal :colors:terminal:
#+name: ao_utils
#+BEGIN_SRC d :exports none
diff --git a/org/sdp.org b/org/sdp.org
index 885f022..d93825f 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -9,11 +9,11 @@
#+OPTIONS: ^:nil _:nil
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:hub:
+#+FILETAGS: :sdp:rel:hub:
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
-* sdp.d sisu document parser :sdp.d:
-[[../maker.org][maker.org makefile]]
+* sdp.d sisu document parser
+[[../maker.org][maker.org makefile]] [[./][org/]]
Deal with imports.
Take command line instructions and process files as instructed.
@@ -22,7 +22,8 @@ Take command line instructions and process files as instructed.
[[./ao_assertions.org][ao_assertions]]
[[./ao_defaults.org][ao_defaults]]
[[./ao_emitters_and_interfaces.org][ao_emitters_and_interfaces: ao_emitter; ao_interface]]
-[[./ao_markup_source_raw.org][ao_markup_source_raw]]
+[[./ao_read_markup_source.org][ao_read_markup_source]]
+// [[./ao_read_markup_source.org][ao_read_markup_source]]
[[./ao_object_setter.org][ao_object_setter]]
[[./ao_output_debugs.org][ao_output_debugs]]
[[./ao_rgx.org][ao_rgx]]
@@ -54,7 +55,7 @@ import
lib.sdp.ao_defaults, // sdp/ao_defaults.d
lib.sdp.ao_emitter, // sdp/ao_emitter.d
lib.sdp.ao_interface, // sdp/ao_interface.d
- lib.sdp.ao_markup_source_raw, // sdp/ao_markup_source_raw.d
+ lib.sdp.ao_read_markup_source, // sdp/ao_read_markup_source.d
lib.sdp.ao_object_setter, // sdp/ao_object_setter.d
lib.sdp.ao_output_debugs, // sdp/ao_output_debugs.d
lib.sdp.ao_rgx, // sdp/ao_rgx.d
@@ -63,6 +64,7 @@ import
// std.conv;
import std.conv : to;
#+END_SRC
+
** argv [+3] :argv:
*** argv mixins & init
#+name: sdp_argv
@@ -116,6 +118,7 @@ scope(failure) {
// writeln("1");
}
#+END_SRC
+
*** argv loop
#+name: sdp_argv
#+BEGIN_SRC d :exports none
@@ -129,6 +132,7 @@ foreach(cmdlnins; argv) {
}
}
#+END_SRC
+
*** each file [+2] :file:
**** filename provided [+1]
***** scope :scope:
@@ -161,8 +165,9 @@ enforce(
"not a sisu markup filename"
);
#+END_SRC
+
***** read file :file:read:
-[[./ao_markup_source_raw.org][ao_markup_source_raw]]
+[[./ao_read_markup_source.org][ao_read_markup_source]]
#+name: sdp_each_file_do
#+BEGIN_SRC d :exports none
@@ -180,6 +185,7 @@ debug(insert) {
writeln(m.captures[2]);
}
#+END_SRC
+
****** incorporate any inserts
[[./ao_scan_inserts.org][ao_scan_inserts]]
@@ -202,6 +208,7 @@ debug(raw) {
}
}
#+END_SRC
+
***** send for processing :processing:
#+name: sdp_each_file_do
#+BEGIN_SRC d :exports none
@@ -217,6 +224,7 @@ auto bookindex_unordered_hashes = t[3];
auto biblio = t[4];
// destroy(t);
#+END_SRC
+
***** debug document parts (checkdoc)
#+name: sdp_each_file_do
#+BEGIN_SRC d :exports none
@@ -235,6 +243,7 @@ debug(checkdoc) {
// compose abstract document markup state
// append book index
#+END_SRC
+
***** on exit
#+name: sdp_each_file_do
#+BEGIN_SRC d :exports none
@@ -249,6 +258,7 @@ scope(exit) {
destroy(biblio);
}
#+END_SRC
+
**** no filename provided
#+name: sdp_no_filename_provided
#+BEGIN_SRC d :exports none
@@ -257,6 +267,7 @@ writeln("no recognized filename");
break;
// terminate, stop
#+END_SRC
+
* tangles :tangle:
** code structure :sdp.d:
#+name: tangle_sdp