From 94b416b1ef82690dba840cacec679cfd8bb7c1de Mon Sep 17 00:00:00 2001 From: k-hara Date: Sat, 10 Jan 2015 12:13:35 +0900 Subject: [PATCH] Update core.demangle to follow the newest mangling scheme Refer: https://github.com/D-Programming-Language/dlang.org/commit/416e78085d70c964c29136fe2707b9efec4c1980 --- src/core/demangle.d | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/core/demangle.d b/src/core/demangle.d index a0c5ec6307b..cb1d57cf450 100644 --- a/src/core/demangle.d +++ b/src/core/demangle.d @@ -1304,6 +1304,10 @@ private struct Demangle TemplateArg TemplateArgs TemplateArg: + TemplateArgX + H TemplateArgX + + TemplateArgX: T Type V Type Value S LName @@ -1315,6 +1319,9 @@ private struct Demangle for( size_t n = 0; true; n++ ) { + if( tok() == 'H' ) + next(); + switch( tok() ) { case 'T': @@ -1909,6 +1916,8 @@ version(unittest) ["_D3foo3Bar6__vtblZ", "foo.Bar.__vtbl"], ["_D3foo3Bar11__interfaceZ", "foo.Bar.__interface"], ["_D3foo7__arrayZ", "foo.__array"], + ["_D8link657428__T3fooVE8link65746Methodi0Z3fooFZi", "int link6574.foo!(0).foo()"], + ["_D8link657429__T3fooHVE8link65746Methodi0Z3fooFZi", "int link6574.foo!(0).foo()"], ]; template staticIota(int x)