Skip to content

Commit 6c6673e

Browse files
ibuclawibuclaw
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents 0966547 + 8079ec8 commit 6c6673e

24 files changed

+886
-338
lines changed

‎.circleci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ run_make()
109109
make -v
110110
111111
# -j1 is used for a better error log
112-
make -f posix.mak -j1 DIFFABLE=1 release
112+
make -f posix.mak -j1 DIFFABLE=1 BUILD_JOBS=3 release
113113
}
114114
115115
case $1 in

‎changelog/2.106.1_pre.dd

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Ddoc
2+
3+
$(CHANGELOG_NAV_INJECT)
4+
5+
$(VERSION Jan 01, 2024, =================================================,
6+
7+
$(CHANGELOG_HEADER_STATISTICS
8+
$(VER) comes with 1 fixed Bugzilla issue.
9+
A huge thanks goes to the
10+
$(LINK2 #contributors, 2 contributors)
11+
who made $(VER) possible.)
12+
13+
$(CHANGELOG_SEP_HEADER_TEXT_NONEMPTY)
14+
15+
$(CHANGELOG_SEP_HEADER_TEXT)
16+
17+
$(CHANGELOG_SEP_TEXT_BUGZILLA)
18+
19+
$(BUGSTITLE_BUGZILLA DMD Compiler bug fixes,
20+
21+
$(LI $(BUGZILLA 24281): Segfault with missing field after named argument)
22+
)
23+
)
24+
$(D_CONTRIBUTORS_HEADER 2)
25+
$(D_CONTRIBUTORS
26+
$(D_CONTRIBUTOR Dennis Korpel)
27+
$(D_CONTRIBUTOR Iain Buclaw)
28+
)
29+
$(D_CONTRIBUTORS_FOOTER)
30+
$(CHANGELOG_NAV_INJECT)
31+
32+
Macros:
33+
VER=2.106.1
34+
TITLE=Change Log: $(VER)

‎deprecate.dd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ $(SPEC_S Deprecated Features,
1111
$(TABLE2 Deprecated Features,
1212
$(THEAD Feature, Spec, Dep, Error, Gone)
1313
$(TROW $(DEPLINK Throwing from contracts of nothrow functions),  , 2.101, 2.111,  )
14-
$(TROW $(DEPLINK body keyword), 2.075, 2.097, 2.097, 2.117)
1514
$(TROW $(DEPLINK Hexstring literals), 2.079, 2.079, 2.086,  )
1615
$(TROW $(DEPLINK Class allocators and deallocators),  , 2.080, 2.087, 2.100 )
1716
$(TROW $(DEPLINK Implicit comparison of different enums), 2.075, 2.075, 2.081,  )

‎images/orgs-using-d/bildhuus.svg

Lines changed: 46 additions & 0 deletions
Loading

‎images/orgs-using-d/tagion.svg

Lines changed: 11 additions & 0 deletions
Loading

‎index.dd

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -234,19 +234,17 @@ void main()
234234
{
235235
import std.stdio, std.string, std.algorithm, std.conv;
236236

237-
// Reduce the RPN expression using a stack
238-
readln.split.fold!((stack, op)
237+
// arr is real[] and sym is the current symbol
238+
readln.split.fold!((arr, sym)
239239
{
240-
switch (op)
241-
{
242-
// Generate operator switch cases statically
243-
static foreach (c; "+-*/")
244-
case [c]:
245-
return stack[0 .. $ - 2] ~
246-
mixin("stack[$ - 2] " ~ c ~
247-
" stack[$ - 1]");
248-
default: return stack ~ op.to!real;
249-
}
240+
static foreach (c; "+-*/")
241+
if (sym == [c])
242+
// replace the last 2 elements with the binary op
243+
return arr[0 .. $-2] ~
244+
mixin("arr[$-2] " ~ c ~ " arr[$-1]");
245+
246+
// sym must be a number
247+
return arr ~ sym.to!real;
250248
})((real[]).init).writeln;
251249
}
252250
----
@@ -365,10 +363,6 @@ $(DIVID news,
365363
<iframe src="https://forum.dlang.org/frame-announcements"></iframe>
366364
<iframe src="https://forum.dlang.org/frame-discussions"></iframe>
367365
)
368-
$(DIVID twitter,
369-
<a class="twitter-timeline" data-height="420" href="https://twitter.com/D_Programming?ref_src=twsrc%5Etfw">Tweets by D_Programming</a>
370-
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
371-
)
372366
)
373367

374368
$(DIVC boxes,

‎orgs-using-d.dd

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,16 @@ $(DIVC orgs-using-d center,
5959
$(FA_TESTIMONIAL) $(LINK2 http://www.auburnsounds.com/blog/2016-02-08_Making-a-Windows-VST-plugin-with-D.html, Testimonial)
6060
)
6161
)
62+
$(DORG Bildhuus, https://bildhuus.com, bildhuus.svg,
63+
Photography Software,
64+
$(FA_QUOTE
65+
The meta programming capabilites of D are unmatched and are essential for our whole software stack.
66+
)
67+
$(LINK_ROW
68+
$(FA_GITHUB bildhuus) $(FA_SEPARATOR)
69+
$(FA_TESTIMONIAL aspect.bildhuus.com/blog/how-we-are-using-d-to-develop-aspect, Testimonial)
70+
)
71+
)
6272
$(DORG CERERIS, http://www.myriad-corp.com, cereris.png,
6373
Hardware and Software development,
6474
$(FA_QUOTE
@@ -222,6 +232,15 @@ $(DIVC orgs-using-d center,
222232
$(FA_HIRING github.com/symmetryinvestments/overview/blob/master/hiring.md)
223233
)
224234
)
235+
$(DORG Tagion, https://www.tagion.org/, tagion.svg,
236+
Tagion is a decentralized network for high volume transactions and distributed solutions,
237+
$(FA_QUOTE
238+
D is not just a programming language; it is a paradigm shift towards effiency, safety and expressiveness.
239+
)
240+
$(LINK_ROW
241+
$(FA_GITHUB tagion)
242+
)
243+
)
225244
$(DORG Tamedia, https://www.tamedia.ch/en/group/dts, tamedia.png,
226245
Largest Swiss media company,
227246
$(FA_QUOTE

‎posix.mak

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ SPEC_ROOT=$(addprefix spec/, \
322322
const3 function operatoroverloading template template-mixin contracts \
323323
version traits errors unittest garbage float iasm ddoc \
324324
interfaceToC cpp_interface objc_interface portability entity memory-safe-d \
325-
abi simd betterc importc ob windows glossary)
325+
abi simd betterc importc ob windows glossary legacy)
326326
SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))
327327

328328
CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd)))
@@ -593,27 +593,29 @@ ${DMD_DIR}/VERSION : ${DMD_DIR}
593593
# dmd compiler, latest released build and current build
594594
################################################################################
595595

596+
BUILD_JOBS_ARG:=$(if $(BUILD_JOBS),-j$(BUILD_JOBS),)
597+
596598
$(DMD) : ${DMD_DIR}
597-
${MAKE} --directory=${DMD_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1
599+
bash ${DMD_DIR}/compiler/src/bootstrap.sh $(BUILD_JOBS_ARG)
598600

599601
$(DMD_LATEST) : ${DMD_LATEST_DIR}
600-
${MAKE} --directory=${DMD_LATEST_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1
602+
bash ${DMD_LATEST_DIR}/compiler/src/bootstrap.sh $(BUILD_JOBS_ARG)
601603
sed -i -e "s|../druntime/import |../../dmd-${LATEST}/druntime/import |" -e "s|../phobos |../phobos-${LATEST} |" $@.conf
602604

603605
dmd-prerelease : $(STD_DDOC_PRERELEASE) druntime-target $G/changelog/next-version
604-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML)
606+
bash $(DMD_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_PRERELEASE_HTML) $(BUILD_JOBS_ARG)
605607

606608
dmd-release : $(STD_DDOC_RELEASE) druntime-target
607-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML)
609+
bash $(DMD_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_RELEASE_HTML) $(BUILD_JOBS_ARG)
608610

609611
dmd-latest : $(STD_DDOC_LATEST) druntime-latest-target
610-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML)
612+
bash $(DMD_LATEST_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_LATEST_HTML) $(BUILD_JOBS_ARG)
611613

612614
dmd-prerelease-verbatim : $W/phobos-prerelease/mars.verbatim
613615
$W/phobos-prerelease/mars.verbatim: $(STD_DDOC_PRERELEASE) druntime-target \
614616
verbatim.ddoc $G/changelog/next-version
615617
mkdir -p $(dir $@)
616-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_VERBATIM)
618+
bash $(DMD_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_PRERELEASE_VERBATIM)
617619
$(call CHANGE_SUFFIX,html,verbatim,$W/phobos-prerelease-verbatim)
618620
mv $W/phobos-prerelease-verbatim/* $(dir $@)
619621
rm -r $W/phobos-prerelease-verbatim

0 commit comments

Comments
 (0)