Merge remote-tracking branch 'upstream/master' into merge_master

.gitignore

@@ -32,8 +32,6 @@ css/cssmenu.css
 *.min.*
 
 deleteme.*
-docs-prerelease.json
-docs.json
 .dub/
 dpl-docs/dpl-docs
 modlist-release.ddoc

.travis.yml

@@ -0,0 +1,9 @@
+dist: trusty
+sudo: false
+
+language: d
+os:
+ - linux
+
+script:
+  - make -f posix.mak test

areas-of-d-usage.dd

@@ -12,7 +12,7 @@ $(DIVC page-contents quickindex,
             $(LI $(RELATIVE_LINK2 web, Web applications))
             $(LI $(RELATIVE_LINK2 gui, GUI applications))
         )
-        $(LI $(RELATIVE_LINK2 system_programming, Systems Programming)) $(OL
+        $(LI $(RELATIVE_LINK2 system-programming, Systems Programming)) $(OL
             $(LI $(RELATIVE_LINK2 operating_systems, Operating systems))
             $(LI $(RELATIVE_LINK2 compilers, Compilers))
             $(LI $(RELATIVE_LINK2 embedded, Embedded applications))
@@ -30,7 +30,7 @@ $(DIVC page-contents quickindex,
 
 $(DIVC start-icons,
     $(START_ICONS_ENTRY Industry, industry, industry)
-    $(START_ICONS_ENTRY Systems Programming, gears, systems-programming)
+    $(START_ICONS_ENTRY Systems Programming, gears, system-programming)
     $(START_ICONS_ENTRY Research, flask, cutting-edge)
     $(START_ICONS_ENTRY Academia, graduation-cap, academia)
 )
@@ -114,7 +114,7 @@ $(AREA_SECTION3 $(LNAME2 gui, GUI Applications), $(ARTICLE_FA_ICON desktop),
     D's high productivity is also beneficial when creating GUI applications.
 
     Some examples are the Linux tiling terminal emulator
-    $(HTTP github.com/gnunn1/terminix, terminix),
+    $(HTTP github.com/gnunn1/tilix, tilix),
     the D development environment
     $(HTTPS github.com/buggins/dlangide, DLangIDE), which is itself based
     on the cross-platform D library $(HTTPS github.com/buggins/dlangui, dlangui).

assert_writeln_magic.d

@@ -43,14 +43,13 @@ private string formatNode(T)(const T t)
     return writer.data;
 }
 
-class TestVisitor : ASTVisitor
+class TestVisitor(Out) : ASTVisitor
 {
     import dparse.lexer : tok, Token;
 
-    this(string fileName, string destFile)
+    this(Out fl)
     {
-        this.fileName = fileName;
-        fl = FileLines(fileName, destFile);
+        this.fl = fl;
     }
 
     alias visit = ASTVisitor.visit;
@@ -77,6 +76,10 @@ class TestVisitor : ASTVisitor
         if (inFunctionCall)
             return;
 
+        // only look at `a == b` within the AssertExpression
+        if (typeid(expr.assertion) != typeid(CmpExpression))
+            return;
+
         lastAssert = expr;
         inAssert = true;
         expr.accept(this);
@@ -172,31 +175,40 @@ private:
     Rebindable!(const AssertExpression) lastAssert;
     Rebindable!(const EqualExpression) lastEqualExpression;
 
-    string fileName;
-    FileLines fl;
+    Out fl;
 }
 
-void parseFile(string fileName, string destFile)
+void parseString(Visitor)(ubyte[] sourceCode, string fileName, Visitor visitor)
 {
     import dparse.lexer;
     import dparse.parser : parseModule;
     import dparse.rollback_allocator : RollbackAllocator;
-    import std.array : uninitializedArray;
 
-    auto inFile = File(fileName);
-    if (inFile.size == 0)
-        warningf("%s is empty", inFile.name);
-
-    ubyte[] sourceCode = uninitializedArray!(ubyte[])(to!size_t(inFile.size));
-    inFile.rawRead(sourceCode);
     LexerConfig config;
     auto cache = StringCache(StringCache.defaultBucketCount);
     const(Token)[] tokens = getTokensForParser(sourceCode, config, &cache).array;
 
     RollbackAllocator rba;
     auto m = parseModule(tokens, fileName, &rba);
-    auto visitor = new TestVisitor(fileName, destFile);
     visitor.visit(m);
+}
+
+void parseFile(string fileName, string destFile)
+{
+    import std.array : uninitializedArray;
+
+    auto inFile = File(fileName);
+    if (inFile.size == 0)
+        warningf("%s is empty", inFile.name);
+
+    ubyte[] sourceCode = uninitializedArray!(ubyte[])(to!size_t(inFile.size));
+    if (sourceCode.length == 0)
+        return;
+
+    inFile.rawRead(sourceCode);
+    auto fl = FileLines(fileName, destFile);
+    auto visitor = new TestVisitor!(typeof(fl))(fl);
+    parseString(sourceCode, fileName, visitor);
     delete visitor;
 }
 
@@ -208,6 +220,7 @@ string rebasePath(string path, string oldBase, string newBase)
     return buildPath(newBase, path.absolutePath.relativePath(oldBase.absolutePath));
 }
 
+version(unittest) { void main(){} } else
 void main(string[] args)
 {
     import std.file;
@@ -321,3 +334,68 @@ struct FileLines
         lines[i] = line;
     }
 }
+
+version(unittest)
+{
+    struct FileLinesMock
+    {
+        string[] lines;
+        string opIndex(size_t i) { return lines[i]; }
+        void opIndexAssign(string line, size_t i) {
+            lines[i] = line;
+        }
+    }
+    auto runTest(string sourceCode)
+    {
+        import std.string : representation;
+        auto mock = FileLinesMock(sourceCode.split("\n"));
+        auto visitor = new TestVisitor!(typeof(mock))(mock);
+        parseString(sourceCode.representation.dup, "testmodule", visitor);
+        delete visitor;
+        return mock;
+    }
+}
+
+
+unittest
+{
+    "Running tests for assert_writeln_magic".writeln;
+
+    // purposefully not indented
+    string testCode = q{
+unittest
+{
+assert(equal(splitter!(a => a == ' ')("hello  world"), [ "hello", "", "world" ]));
+assert(equal(splitter!(a => a == 0)(a), w));
+}
+    };
+    auto res = runTest(testCode);
+    assert(res.lines[3 .. $ - 2] == [
+        "assert(equal(splitter!(a => a == ' ')(\"hello  world\"), [ \"hello\", \"\", \"world\" ]));",
+        "assert(equal(splitter!(a => a == 0)(a), w));"
+    ]);
+}
+
+unittest
+{
+    string testCode = q{
+unittest
+{
+assert(1 == 2);
+assert(foo() == "bar");
+assert(foo() == bar);
+assert(arr == [0, 1, 2]);
+assert(r.back == 1);
+}
+    };
+    auto res = runTest(testCode);
+    assert(res.lines[3 .. $ - 2] == [
+        "writeln(1); // 2",
+        "writeln(foo()); // \"bar\"",
+        "writeln(foo()); // bar",
+        "writeln(arr); // [0, 1, 2]",
+        "writeln(r.back); // 1",
+    ]);
+
+    "Successfully ran tests for assert_writeln_magic".writeln;
+}

changelog/2.072.0.dd

@@ -372,13 +372,13 @@ $(BUGSTITLE Library Changes,
             or program may malfunction due to changed call order of module static construction/destruction.
             In order to preserve the program behaviour without the need to specify `--DRT-oncycle` command line argument,
             it is possible to instruct the linker by declaring the following array in the source code:)
-            
+
             ---
             extern(C) __gshared string[] rt_options = [ "oncycle=ignore" ];
             ---
-            
+
         ($P For more information, please consult the D language specification, section Overriding Cycle Detection Abort in chapter 4
-            and chapter 28.7 Configuring the Garbage Collector.)        
+            and chapter 28.7 Configuring the Garbage Collector.)
     )
 
     $(LI $(LNAME2 std-digest-murmurhash, Implementation of `std.digest.murmurhash`).

changelog/2.073.0.dd

@@ -37,7 +37,7 @@ $(BUGSTITLE Compiler changes,
 $(LI $(LNAME2 mscrtlib-option,New command line option $(B -mscrtlib=$(I libname)) for Windows MS-COFF object files.)
     $(P
         If building MS-COFF object files with -m64 or -m32mscoff, this option
-        specifies the reference to the C runtime library $(I libname) that is 
+        specifies the reference to the C runtime library $(I libname) that is
         embedded into the object file containing `main`,
         `DllMain` or `WinMain` for automatic linking. The default is $(TT libcmt)
         (release version with static linkage), the other usual alternatives are

code_coverage.dd

@@ -65,7 +65,7 @@ and is integrated into gcc.)
 $(P The D code coverage analyser is built in as part of the D compiler.
 Therefore, it is always in perfect synchronization with the language
 implementation. It's implemented by establishing a counter for each
-line in each module compiled with the $(DDSUBLINK dmd-windows,switch-cov, $(B -cov)) switch.
+line in each module compiled with the $(DDSUBLINK dmd,switch-cov, $(B -cov)) switch.
 Code is inserted
 at the beginning of each statement to increment the corresponding counter.
 When the program finishes, the runtime collects all
@@ -215,7 +215,7 @@ $(H3 Controlling the Coverage Analyser)
 $(COMMENT The behavior of the coverage analyser can be controlled through
 the $(DRUNTIMESRC rt/cover.d) module.)
 
-$(P When the $(DDSUBLINK dmd-windows,switch-cov, $(B -cov)) switch is thrown,
+$(P When the $(DDSUBLINK dmd,switch-cov, $(B -cov)) switch is thrown,
 the $(DDSUBLINK spec/version, PredefinedVersions, version identifier)
 $(B D_Coverage) is defined.)
 

css/ddox.css

@@ -14,6 +14,10 @@ h1 code a {
 	border-bottom: 1px dashed #CCC;
 }
 
+.hyphenate code {
+	hyphens: manual;
+}
+
 col.caption {
 	min-width: 170pt;
 }

css/style.css

@@ -382,7 +382,7 @@ span#search-submit span /* hide 'go' */
 {
     background: #F5F5F5;
     border: 0 solid #CCC;
-    border-width: 0 1px;
+    border-width: 0 1px 1px;
     padding-left: 1em;
     padding-right: 1em;
     width: 15em;
@@ -1723,6 +1723,12 @@ input.resetButton{display: none}
 .d_example_buttons {
     text-align: left;
 }
+.runnable-examples-stdin {
+    display: none;
+}
+.runnable-examples-args {
+    display: none;
+}
 /* Runnable-examples css -end */
 
 .page-contents

dcompiler.dd

@@ -424,7 +424,9 @@ dmd -cov -unittest myprog.d
       )
 
       $(SWITCH $(SWNAME -D),
-        generate $(LINK2 spec/ddoc.html, documentation) from source
+        $(P Generate $(LINK2 spec/ddoc.html, documentation) from source.)
+
+        $(P Note: mind the $(LINK2 spec/ddoc.html#security, security considerations).)
       )
 
       $(SWITCH $(SWNAME -Dd)$(I docdir),
@@ -665,6 +667,14 @@ dmd -cov -unittest myprog.d
         )
       )
 
+      $(SWITCH $(SWNAME -mv)=$(I package.module)=$(I path/filename),
+        Use $(I path/filename) as the source file for $(I package.module).
+        This is used when the source file path and names are not the same
+        as the package and module hierarchy.
+        The rightmost components of the  $(I path/filename) and $(I package.module)
+        can be omitted if they are the same.
+      )
+
     $(WINDOWS
       $(SWITCH $(SWNAME -mscrt)=$(I libname),
         if building MS-COFF object files with -m64 or -m32mscoff, embed a reference to

deprecate.dd

@@ -16,7 +16,7 @@ $(SPEC_S Deprecated Features,
         $(TROW $(DEPLINK scope for allocating classes on the stack),              future,  ,  ,  )
         $(TROW $(DEPLINK Imaginary and complex types),                            future,  ,  ,  )
         $(TROW $(DEPLINK Implicit catch statement),                               2.072, 2.072,  future, future )
-        $(TROW $(DEPLINK .sort and .reverse properties for arrays),               ?,     2.072;,  ,  )
+        $(TROW $(DEPLINK .sort and .reverse properties for arrays),               ?,     2.072,   , 2.075)
         $(TROW $(DEPLINK C-style array pointers),                                 ?,     2.072;,  ,  )
         $(TROW $(DEPLINK Floating point NCEG operators),                          ?,     2.066,  2.072,   )
         $(TROW $(DEPLINK clear),                                                  2.060, 2.066,   , 2.068 )

dlang.org.ddoc

@@ -136,7 +136,7 @@ DDOCKEYVAL2=$(DIVC keyval $1, $(SPANC key key$1, $2:) $(DIVC val val$1, $(TAIL $
 DDSUBLINK=$(LINK2 $(ROOT_DIR)$1.html#$2, $3)
 _=
 
-DMDSRC=$(HTTPS github.com/D-Programming-Language/dmd/blob/master/src/$0, $0)
+DMDSRC=$(HTTPS github.com/dlang/dmd/blob/master/src/dmd/$0, $0)
 DOT_PREFIXED=.$1$(DOT_PREFIXED $+)
 DOT_PREFIXED_SKIP=$(DOT_PREFIXED $+)
 DRUNTIMESRC=$(HTTPS github.com/dlang/druntime/blob/master/src/$0, $0)
@@ -282,7 +282,7 @@ $(DIVID tools, $(DIV,
 		)
 	)
 	$(DIVC tip smallprint,
-		<a href="https://github.com/dlang/$(PROJECT)/edit/master/$(SRCFILENAME)">Improve this page</a>
+		<a href="https://github.com/dlang/$(PROJECT)/edit/master/$(PROJECT_SOURCE_DIR)$(SRCFILENAME)">Improve this page</a>
 		$(DIV,
 			Quickly fork, edit online, and submit a pull request for this page.
 			Requires a signed-in GitHub account. This works well for small changes.
@@ -351,6 +351,10 @@ _=
 RELATIVE_LINK2=$(ALOCAL $1, $+)
 _=
 
+RUNNABLE_EXAMPLE=$(DIVC runnable-examples, $1)
+RUNNABLE_EXAMPLE_STDIN=<code class="runnable-examples-stdin">$0</code>
+RUNNABLE_EXAMPLE_ARGS=<code class="runnable-examples-args">$0</code>
+
 SAMPLESRC=$(SPANC sample_src, $(AHTTPS github.com/dlang/dmd/blob/master/samples/$0, /dmd/samples/d/$0))
 SCINI=$(TC pre, scini notranslate, $0)
 SCRIPTLOAD=<script type="text/javascript" src="$1"$+></script>
@@ -486,4 +490,6 @@ _=
 
 YELLOW=$(SPANC yellow, $0)
 YES=$(CHECKMARK)
+
+PROJECT_SOURCE_DIR=
 _=

download.dd

@@ -37,11 +37,11 @@ $(TABLEC download-compilers,
       $(UL
         $(LI $(LINK2 http://llvm.org/, LLVM)-based D compiler)
         $(LI Strong optimization)
-        $(LI Alpha support for mobile:
-          $(LINK2 https://github.com/smolt/ldc-iphone-dev/releases, iOS),
-          $(LINK2 https://github.com/joakim-noah/android/releases, Android)
+        $(LI Mobile support:
+          $(LINK2 https://github.com/smolt/ldc-iphone-dev/releases, iOS alpha),
+          $(LINK2 https://github.com/joakim-noah/android/releases, Android beta)
         )
-        $(LI Architectures: i386, amd64, armel, $(LINK2 https://wiki.dlang.org/Compilers#Comparison,others))
+        $(LI Architectures: i386, amd64, armel, armhf, $(LINK2 https://wiki.dlang.org/Compilers#Comparison,others))
       )
     )
   )

dpl-docs/dub.json

@@ -3,5 +3,5 @@
 	"dependencies": {
 		"ddox": "~>0.15.0"
 	},
-	"versions": ["VibeCustomMain"]
+	"versions": ["VibeCustomMain", "VibeNoSSL"]
 }

dpl-docs/dub.selections.json

@@ -4,12 +4,11 @@
 		"ddox": "0.15.18",
 		"experimental_allocator": "2.70.0-b1",
 		"hyphenate": "1.1.1",
-		"libasync": "0.7.9",
-		"libdparse": "0.7.0-beta.2",
+		"libasync": "0.8.3",
+		"libdparse": "0.7.0",
 		"libev": "5.0.0+4.04",
 		"libevent": "2.0.2+2.0.16",
-		"memutils": "0.4.8",
-		"openssl": "1.1.4+1.0.1g",
-		"vibe-d": "0.7.30"
+		"memutils": "0.4.9",
+		"vibe-d": "0.7.31"
 	}
 }