Skip to content

Update assert_writeln_magic to the latest libdparse #2758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 3 commits into from
Aug 4, 2020
Merged

Update assert_writeln_magic to the latest libdparse #2758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
481e0bf
Make assert_writeln_magic executable
Geod24 Feb 19, 2020
f2af919
Update assert_writeln_magic & dpl-docs to the latest libdparse
Geod24 Feb 19, 2020
65d3d8c
Magic: Print the content of the buffer on failure
Geod24 Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ddoc/dub.sdl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ddoc/dub.selections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
9 changes: 5 additions & 4 deletions ddoc/source/assert_writeln_magic.d
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
+/
/*
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
5 changes: 5 additions & 0 deletions ddoc/source/preprocessor.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
26 changes: 13 additions & 13 deletions dpl-docs/dub.selections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}