From a7e762ad762244592d05466b5b14bdec4ff1b13a Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 9 Jul 2018 22:23:38 -0400
Subject: dmd compiles & run fixes (not required by ldc2)
- dmd compiles without optimize flag
- dmd some variables need re-loading
- D version for both is: 2078 (at commit)
---
dub.sdl | 2 +-
makefile | 1 +
maker.org | 8 +++++++-
org/default_paths.org | 7 +++++++
src/sdp/output/paths_source.d | 7 +++++++
5 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/dub.sdl b/dub.sdl
index ba95a81..3478c9e 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -38,7 +38,7 @@ configuration "sdp-dmd" {
targetName "sdp-dmd"
dflags "-J=views" "-I=src/sdp"
buildRequirements "allowWarnings"
- buildOptions "verbose" "optimize" "inline" # "releaseMode"
+ buildOptions "verbose" "inline" # "optimize" # "releaseMode"
postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd'"
}
configuration "sdp-dmd-version" {
diff --git a/makefile b/makefile
index ec5c469..52e1c71 100644
--- a/makefile
+++ b/makefile
@@ -75,6 +75,7 @@ data/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
data/sisudir/media/text/two_bits.christopher_kelty.sst \
data/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
data/sisudir/media/text/viral_spiral.david_bollier.sst
+default: ldc
markup_samples:
find data/sisupod -name sisupod.manifest | cut -f 1-3 -d / | sort; \
find data/sisudir/media/text -name *.ss[tm] | sort
diff --git a/maker.org b/maker.org
index 26b3651..b41b269 100644
--- a/maker.org
+++ b/maker.org
@@ -145,6 +145,12 @@ data/sisudir/media/text/viral_spiral.david_bollier.sst
**** _dub_ build rebuild :dub:
***** all compiler builds :all:dmd:gdc:ldc:
****** all builds
+******* default
+
+#+BEGIN_SRC makefile :tangle makefile
+default: ldc
+#+END_SRC
+
******* sample markup file list
#+BEGIN_SRC makefile :tangle makefile
@@ -875,7 +881,7 @@ configuration "sdp-dmd" {
targetName "sdp-dmd"
dflags "-J=views" "-I=src/sdp"
buildRequirements "allowWarnings"
- buildOptions "verbose" "optimize" "inline" # "releaseMode"
+ buildOptions "verbose" "inline" # "optimize" # "releaseMode"
postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd'"
}
#+END_SRC
diff --git a/org/default_paths.org b/org/default_paths.org
index 308475a..4da6a85 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -125,6 +125,7 @@ template PathMatters() {
auto _manifest = PodManifest!()(_pth);
struct ManifestMatters_ {
auto env() {
+ auto _env = _env;
struct Env_ {
auto pwd() {
return _env["pwd"];
@@ -136,6 +137,7 @@ template PathMatters() {
return Env_();
}
auto opt() {
+ auto _opt_actions = _opt_actions;
struct Opt_ {
auto action() { // redundant
return _opt_actions;
@@ -204,6 +206,9 @@ template PathMatters() {
return Pod_();
}
auto src() {
+ string _fns = _fns; // required here by dmd & not by ldc (for D:2078)
+ auto _opt_actions = _opt_actions;
+ auto _env = _env;
string _sep = "␣";
struct SRC_ {
auto is_pod() {
@@ -383,6 +388,8 @@ template PathMatters() {
return SRC_();
}
auto output() {
+ auto _opt_actions = _opt_actions;
+ auto _env = _env;
struct Out_ {
auto path() {
auto _output_path = _env["pwd"];
diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d
index d04c9f6..ac5e703 100644
--- a/src/sdp/output/paths_source.d
+++ b/src/sdp/output/paths_source.d
@@ -72,6 +72,7 @@ template PathMatters() {
auto _manifest = PodManifest!()(_pth);
struct ManifestMatters_ {
auto env() {
+ auto _env = _env;
struct Env_ {
auto pwd() {
return _env["pwd"];
@@ -83,6 +84,7 @@ template PathMatters() {
return Env_();
}
auto opt() {
+ auto _opt_actions = _opt_actions;
struct Opt_ {
auto action() { // redundant
return _opt_actions;
@@ -151,6 +153,9 @@ template PathMatters() {
return Pod_();
}
auto src() {
+ string _fns = _fns; // required here by dmd & not by ldc (for D:2078)
+ auto _opt_actions = _opt_actions;
+ auto _env = _env;
string _sep = "␣";
struct SRC_ {
auto is_pod() {
@@ -330,6 +335,8 @@ template PathMatters() {
return SRC_();
}
auto output() {
+ auto _opt_actions = _opt_actions;
+ auto _env = _env;
struct Out_ {
auto path() {
auto _output_path = _env["pwd"];
--
cgit v1.2.3