Mercurial > projects > ldc
view gen/logger.cpp @ 1442:0a5f7890f327
Adjust some more code that was depending on the function and delegate calling
conventions being equal.
There's also an instance in `tango.text.convert.Layout` that should be adjusted:
{{{
Index: tango/text/convert/Layout.d
===================================================================
--- tango/text/convert/Layout.d (revision 4578)
+++ tango/text/convert/Layout.d (working copy)
-660,8 +660,12 @@
case TypeCode.STRUCT:
auto s = cast(TypeInfo_Struct) type;
- if (s.xtoString)
- return Utf.fromString8 (s.xtoString(p), result);
+ if (s.xtoString) {
+ char[] delegate() toString;
+ toString.ptr = p;
+ toString.funcptr = cast(char[] function()) s.xtoString;
+ return Utf.fromString8 (toString(), result);
+ }
goto default;
case TypeCode.INTERFACE:
}}}
author | Frits van Bommel <fvbommel wxs.nl> |
---|---|
date | Sun, 31 May 2009 15:27:01 +0200 |
parents | e7f0c2b48047 |
children | 2292878925f4 |
line wrap: on
line source
#include <cassert> #include <cstdarg> #include <cstdio> #include <cstdlib> #include <fstream> #include <string> #include "mars.h" #include "llvm/Support/CommandLine.h" #include "gen/logger.h" namespace Logger { static std::string indent_str; llvm::cl::opt<bool> _enabled("vv", llvm::cl::desc("Very verbose"), llvm::cl::ZeroOrMore); void indent() { if (_enabled) { indent_str += "* "; } } void undent() { if (_enabled) { assert(!indent_str.empty()); indent_str.resize(indent_str.size()-2); } } llvm::OStream cout() { if (_enabled) return llvm::cout << indent_str; else return 0; } void println(const char* fmt,...) { if (_enabled) { printf("%s", indent_str.c_str()); va_list va; va_start(va,fmt); vprintf(fmt,va); va_end(va); printf("\n"); } } void print(const char* fmt,...) { if (_enabled) { printf("%s", indent_str.c_str()); va_list va; va_start(va,fmt); vprintf(fmt,va); va_end(va); } } void enable() { _enabled = true; } void disable() { _enabled = false; } bool enabled() { return _enabled; } void attention(Loc loc, const char* fmt,...) { va_list va; va_start(va,fmt); vwarning(loc,fmt,va); va_end(va); } }