diff options
Diffstat (limited to 'org/sdp.org')
| -rw-r--r-- | org/sdp.org | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/org/sdp.org b/org/sdp.org index 4d6971e..8530c4a 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -26,7 +26,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 24, 0); +enum ver = Version(0, 25, 0); #+END_SRC ** compilation restrictions (supported compilers) @@ -117,7 +117,6 @@ import sdp.meta.metadoc_summary, sdp.meta.metadoc_from_src, sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_sdlang, sdp.meta.conf_make_meta_toml, sdp.meta.conf_make_meta_json, sdp.meta.defaults, @@ -154,9 +153,6 @@ check: - http://github.com/Abscissa/SDLang-D - https://github.com/abscissa/libInputVisitor -sdlang.parser, -sdlang.exceptions; - std.conv, std.variant, @@ -183,8 +179,6 @@ mixin CompileTimeInfo; #+NAME: sdp_mixin #+BEGIN_SRC d mixin SiSUrgxInit; -mixin SiSUmakeMetaStructsSDLang; -mixin SiSUextractSDLang; mixin contentJSONtoSiSUstruct; mixin SiSUnode; mixin SiSUbiblio; @@ -529,26 +523,15 @@ foreach(arg; args[1..$]) { } #+END_SRC -**** config files load & read (toml or sdlang) +**** config files load & read #+NAME: sdp_conf_files #+BEGIN_SRC d -auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file +auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file auto _config_local_site_struct = readConfigSite!()(_manifest, _env); // local site config ConfCompositePlus _make_and_meta_struct; -switch (_config_local_site_struct.filetype) { -case "toml" : - _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct); - _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct); - break; -case "sdl" : - auto sdl_root_config_document = parseSDLangConfig!()(_config_document_struct.content, _config_document_struct.filename); - auto sdl_root_config_local_site = parseSDLangConfig!()(_config_local_site_struct.content, _config_local_site_struct.filename); - _make_and_meta_struct = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site); - break; -default : - break; -} +_make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct); +_make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct); #+END_SRC ** 2a. actions independent of processing files @@ -757,8 +740,8 @@ debug(header_and_body) { } #+END_SRC -** 2. _document metadata_ & _make instructions_ (struct from toml or sdlang) >> -header: toml or sdlang +** 2. _document metadata_ & _make instructions_ (struct from toml) >> +header: toml - [[./meta_conf_make_meta.org][meta_conf_make_meta]] - read _document header_, split into: @@ -775,18 +758,13 @@ header: toml or sdlang #+BEGIN_SRC d /+ ↓ split header into make and meta +/ debug(steps) { - writeln("step2 commence → (read document header - toml or sdlang, return struct)"); + writeln("step2 commence → (read document header - toml, return struct)"); } _make_and_meta_struct = -((_header_body_insertfilelist_imagelist[headBody.header]).match(rgx.toml_header_meta_title)) -? docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()( - _make_and_meta_struct, - _header_body_insertfilelist_imagelist[headBody.header] - ) -: docHeaderMakeAndMetaTupSDLangExtractAndConvertToStruct!()( - _make_and_meta_struct, - _header_body_insertfilelist_imagelist[headBody.header] - ); +docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()( + _make_and_meta_struct, + _header_body_insertfilelist_imagelist[headBody.header] +); debug(steps) { writeln("- step2 complete"); } |