debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #27 from ColdenCullen/patch-1

Browse source 
Changed exceptions to take line as a size_t
This commit is contained in:
Ferdinand Majerech 2014-09-19 19:02:56 +02:00
parent 034f5d8f86 df0624fa1f
commit e3c6c52dea
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/dyaml/exception.d
View file

@ -20,7 +20,7 @@ alias to!string str;
class YAMLException : Exception class YAMLException : Exception
{ {
/// Construct a YAMLException with specified message and position where it was thrown. /// Construct a YAMLException with specified message and position where it was thrown.
public this(string msg, string file = __FILE__, int line = __LINE__) public this(string msg, string file = __FILE__, size_t line = __LINE__)
@safe pure nothrow @safe pure nothrow
{ {
super(msg, file, line); super(msg, file, line);
@ -79,7 +79,7 @@ abstract class MarkedYAMLException : YAMLException
{ {
// Construct a MarkedYAMLException with specified context and problem. // Construct a MarkedYAMLException with specified context and problem.
this(string context, const Mark contextMark, string problem, const Mark problemMark, this(string context, const Mark contextMark, string problem, const Mark problemMark,
string file = __FILE__, int line = __LINE__) @safe pure nothrow string file = __FILE__, size_t line = __LINE__) @safe pure nothrow
{ {
const msg = context ~ '\n' ~ const msg = context ~ '\n' ~
(contextMark != problemMark ? contextMark.toString() ~ '\n' : "") ~ (contextMark != problemMark ? contextMark.toString() ~ '\n' : "") ~
@ -89,7 +89,7 @@ abstract class MarkedYAMLException : YAMLException
// Construct a MarkedYAMLException with specified problem. // Construct a MarkedYAMLException with specified problem.
this(string problem, const Mark problemMark, this(string problem, const Mark problemMark,
string file = __FILE__, int line = __LINE__) string file = __FILE__, size_t line = __LINE__)
@safe pure nothrow @safe pure nothrow
{ {
super(problem ~ '\n' ~ problemMark.toString(), file, line); super(problem ~ '\n' ~ problemMark.toString(), file, line);
@ -107,7 +107,7 @@ abstract class MarkedYAMLException : YAMLException
// See_Also: YAMLException // See_Also: YAMLException
template ExceptionCtors() template ExceptionCtors()
{ {
public this(string msg, string file = __FILE__, int line = __LINE__) public this(string msg, string file = __FILE__, size_t line = __LINE__)
@safe pure nothrow @safe pure nothrow
{ {
super(msg, file, line); super(msg, file, line);
@ -121,7 +121,7 @@ template MarkedExceptionCtors()
{ {
public: public:
this(string context, const Mark contextMark, string problem, this(string context, const Mark contextMark, string problem,
const Mark problemMark, string file = __FILE__, int line = __LINE__) const Mark problemMark, string file = __FILE__, size_t line = __LINE__)
@safe pure nothrow @safe pure nothrow
{ {
super(context, contextMark, problem, problemMark, super(context, contextMark, problem, problemMark,
@ -129,7 +129,7 @@ template MarkedExceptionCtors()
} }
this(string problem, const Mark problemMark, this(string problem, const Mark problemMark,
string file = __FILE__, int line = __LINE__) string file = __FILE__, size_t line = __LINE__)
@safe pure nothrow @safe pure nothrow
{ {
super(problem, problemMark, file, line); super(problem, problemMark, file, line);