Merge pull request #2758 from Geod24/magic

Update assert_writeln_magic to the latest libdparse
merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Author: dlang-bot

ddoc/dub.sdl

@@ -1,6 +1,6 @@
 name "ddoc_preprocessor"
 description "Preprocesses source code before running Ddoc over it"
-dependency "libdparse" version="~>0.8.7"
+dependency "libdparse" version="~>0.15.1"
 dependency "dmd" path="../../dmd"
 versions "DdocOptions"
 buildRequirements "disallowDeprecations"

ddoc/dub.selections.json

@@ -2,7 +2,7 @@
 	"fileVersion": 1,
 	"versions": {
 		"dmd": {"path":"../../dmd"},
-		"libdparse": "0.8.7",
-		"stdx-allocator": "2.77.2"
+		"libdparse": "0.15.4",
+		"stdx-allocator": "2.77.5"
 	}
 }

ddoc/source/assert_writeln_magic.d

@@ -1,6 +1,6 @@
 #!/usr/bin/env dub
 /++ dub.sdl:
-dependency "libdparse" version="0.7.2-alpha.4"
+dependency "libdparse" version="0.15.1"
 name "assert_writeln_magic"
 +/
 /*
@@ -76,7 +76,8 @@ class TestVisitor(Out) : ASTVisitor
             return;
 
         // only look at `a == b` within the AssertExpression
-        if (typeid(expr.assertion) != typeid(CmpExpression))
+        if (!expr.assertArguments ||
+            typeid(expr.assertArguments.assertion) != typeid(CmpExpression))
             return;
 
         lastAssert = expr;
@@ -180,15 +181,15 @@ private:
 void parseString(Visitor)(ubyte[] sourceCode, Visitor visitor)
 {
     import dparse.lexer;
-    import dparse.parser : parseModule;
+    import dparse.parser : parseModule, ParserConfig;
     import dparse.rollback_allocator : RollbackAllocator;
 
     LexerConfig config;
     auto cache = StringCache(StringCache.defaultBucketCount);
     const(Token)[] tokens = getTokensForParser(sourceCode, config, &cache).array;
 
     RollbackAllocator rba;
-    auto m = parseModule(tokens, "magic.d", &rba);
+    auto m = parseModule(ParserConfig(tokens, "magic.d", &rba));
     visitor.visit(m);
 }
 

ddoc/source/preprocessor.d

@@ -114,7 +114,12 @@ auto compile(R)(R buffer, string[] arguments, string inputFile, string[string] m
     import std.process : execute;
     auto ret = execute(args);
     if (ret.status != 0)
+    {
+        stderr.writeln("File content:");
+        stderr.writeln(buffer);
+        stderr.writeln("----------------------------------------");
         stderr.writeln(ret.output);
+    }
     return ret.status;
 }
 

dpl-docs/dub.selections.json

@@ -1,23 +1,23 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"botan": "1.12.10",
+		"botan": "1.12.18",
 		"botan-math": "1.0.3",
 		"ddoc_preprocessor": {"path":"../ddoc"},
-		"ddox": "0.16.11",
-		"diet-ng": "1.5.0",
+		"ddox": "0.16.15",
+		"diet-ng": "1.7.2",
 		"dmd": {"path":"../../dmd"},
-		"eventcore": "0.8.35",
-		"hyphenate": "1.1.1",
-		"libasync": "0.8.3",
-		"libdparse": "0.8.7",
+		"eventcore": "0.9.7",
+		"hyphenate": "1.1.2",
+		"libasync": "0.8.6",
+		"libdparse": "0.15.4",
 		"libevent": "2.0.2+2.0.16",
-		"memutils": "0.4.11",
-		"mir-linux-kernel": "1.0.0",
+		"memutils": "1.0.4",
+		"mir-linux-kernel": "1.0.1",
 		"openssl": "1.1.6+1.0.1g",
-		"stdx-allocator": "2.77.2",
-		"taggedalgebraic": "0.10.11",
-		"vibe-core": "1.4.0",
-		"vibe-d": "0.8.4"
+		"stdx-allocator": "2.77.5",
+		"taggedalgebraic": "0.11.16",
+		"vibe-core": "1.9.3",
+		"vibe-d": "0.9.0"
 	}
 }