Stop using implicit string literal concatenation
Implicit string litaral concatenation was deprecated with this DMD PR: dlang/dmd/pull/6155.
This commit is contained in:
parent
8d5b75b879
commit
bc1a2c2d0f
|
@ -110,7 +110,7 @@ final class Composer
|
||||||
{
|
{
|
||||||
//Get the root node of the next document.
|
//Get the root node of the next document.
|
||||||
assert(!parser_.checkEvent(EventID.StreamEnd),
|
assert(!parser_.checkEvent(EventID.StreamEnd),
|
||||||
"Trying to get a node from Composer when there is no node to "
|
"Trying to get a node from Composer when there is no node to " ~
|
||||||
"get. use checkNode() to determine if there is a node.");
|
"get. use checkNode() to determine if there is a node.");
|
||||||
|
|
||||||
return composeDocument();
|
return composeDocument();
|
||||||
|
@ -120,14 +120,14 @@ final class Composer
|
||||||
Node getSingleNode() @trusted
|
Node getSingleNode() @trusted
|
||||||
{
|
{
|
||||||
assert(!parser_.checkEvent(EventID.StreamEnd),
|
assert(!parser_.checkEvent(EventID.StreamEnd),
|
||||||
"Trying to get a node from Composer when there is no node to "
|
"Trying to get a node from Composer when there is no node to " ~
|
||||||
"get. use checkNode() to determine if there is a node.");
|
"get. use checkNode() to determine if there is a node.");
|
||||||
|
|
||||||
Node document = composeDocument();
|
Node document = composeDocument();
|
||||||
|
|
||||||
//Ensure that the stream contains no more documents.
|
//Ensure that the stream contains no more documents.
|
||||||
enforce(parser_.checkEvent(EventID.StreamEnd),
|
enforce(parser_.checkEvent(EventID.StreamEnd),
|
||||||
new ComposerException("Expected single document in the stream, "
|
new ComposerException("Expected single document in the stream, " ~
|
||||||
"but found another document.",
|
"but found another document.",
|
||||||
parser_.getEvent().startMark));
|
parser_.getEvent().startMark));
|
||||||
|
|
||||||
|
@ -292,11 +292,11 @@ final class Composer
|
||||||
void error(Node node)
|
void error(Node node)
|
||||||
{
|
{
|
||||||
//this is Composer, but the code is related to Constructor.
|
//this is Composer, but the code is related to Constructor.
|
||||||
throw new ConstructorException("While constructing a mapping, "
|
throw new ConstructorException("While constructing a mapping, " ~
|
||||||
"expected a mapping or a list of "
|
"expected a mapping or a list of " ~
|
||||||
"mappings for merging, but found: "
|
"mappings for merging, but found: " ~
|
||||||
~ node.type.toString() ~
|
node.type.toString() ~
|
||||||
" NOTE: line/column shows topmost parent "
|
" NOTE: line/column shows topmost parent " ~
|
||||||
"to which the content is being merged",
|
"to which the content is being merged",
|
||||||
startMark, endMark);
|
startMark, endMark);
|
||||||
}
|
}
|
||||||
|
|
|
@ -352,7 +352,7 @@ final class Constructor
|
||||||
assert((tag in fromScalar_) is null &&
|
assert((tag in fromScalar_) is null &&
|
||||||
(tag in fromSequence_) is null &&
|
(tag in fromSequence_) is null &&
|
||||||
(tag in fromMapping_) is null,
|
(tag in fromMapping_) is null,
|
||||||
"Constructor function for tag " ~ tag.get ~ " is already "
|
"Constructor function for tag " ~ tag.get ~ " is already " ~
|
||||||
"specified. Can't specify another one.");
|
"specified. Can't specify another one.");
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -297,7 +297,7 @@ struct Dumper
|
||||||
foreach(handle, prefix; tags)
|
foreach(handle, prefix; tags)
|
||||||
{
|
{
|
||||||
assert(handle.length >= 1 && handle[0] == '!' && handle[$ - 1] == '!',
|
assert(handle.length >= 1 && handle[0] == '!' && handle[$ - 1] == '!',
|
||||||
"A tag handle is empty or does not start and end with a "
|
"A tag handle is empty or does not start and end with a " ~
|
||||||
"'!' character : " ~ handle);
|
"'!' character : " ~ handle);
|
||||||
assert(prefix.length >= 1, "A tag prefix is empty");
|
assert(prefix.length >= 1, "A tag prefix is empty");
|
||||||
t ~= TagDirective(handle, prefix);
|
t ~= TagDirective(handle, prefix);
|
||||||
|
|
|
@ -228,7 +228,7 @@ struct Emitter
|
||||||
int popIndent() @trusted
|
int popIndent() @trusted
|
||||||
{
|
{
|
||||||
enforce(indents_.length > 0,
|
enforce(indents_.length > 0,
|
||||||
new YAMLException("Emitter: Need to pop an indent level but there"
|
new YAMLException("Emitter: Need to pop an indent level but there" ~
|
||||||
" are no indent levels left"));
|
" are no indent levels left"));
|
||||||
const result = indents_.back;
|
const result = indents_.back;
|
||||||
indents_.length = indents_.length - 1;
|
indents_.length = indents_.length - 1;
|
||||||
|
@ -490,7 +490,7 @@ struct Emitter
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Error("Expected Alias, Scalar, SequenceStart or "
|
throw new Error("Expected Alias, Scalar, SequenceStart or " ~
|
||||||
"MappingStart, but got: " ~ event_.idString);
|
"MappingStart, but got: " ~ event_.idString);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,17 +52,17 @@ struct Flags(names ...) if(names.length <= 8)
|
||||||
foreach(index, name; names)
|
foreach(index, name; names)
|
||||||
{
|
{
|
||||||
string istr = to!string(index);
|
string istr = to!string(index);
|
||||||
result ~= "\n"
|
result ~= "\n" ~
|
||||||
"@property bool " ~ name ~ "(bool value) pure @safe nothrow\n"
|
"@property bool " ~ name ~ "(bool value) pure @safe nothrow\n" ~
|
||||||
"{\n"
|
"{\n" ~
|
||||||
" flags_ = value ? flags_ | (1 <<" ~ istr ~ ")\n"
|
" flags_ = value ? flags_ | (1 <<" ~ istr ~ ")\n" ~
|
||||||
" : flags_ & (0xFF ^ (1 << " ~ istr ~"));\n"
|
" : flags_ & (0xFF ^ (1 << " ~ istr ~"));\n" ~
|
||||||
" return value;\n"
|
" return value;\n" ~
|
||||||
"}\n"
|
"}\n" ~
|
||||||
"\n"
|
"\n" ~
|
||||||
"@property bool " ~ name ~ "() const pure @safe nothrow\n"
|
"@property bool " ~ name ~ "() const pure @safe nothrow\n" ~
|
||||||
"{\n"
|
"{\n" ~
|
||||||
" return (flags_ >> " ~ istr ~ ") & 1;\n"
|
" return (flags_ >> " ~ istr ~ ") & 1;\n" ~
|
||||||
"}\n";
|
"}\n";
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|
|
@ -454,7 +454,7 @@ struct Node
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
assert(keys.length == values.length,
|
assert(keys.length == values.length,
|
||||||
"Lengths of keys and values arrays to construct "
|
"Lengths of keys and values arrays to construct " ~
|
||||||
"a YAML node from don't match");
|
"a YAML node from don't match");
|
||||||
}
|
}
|
||||||
body
|
body
|
||||||
|
|
|
@ -99,7 +99,7 @@ final class Reader
|
||||||
auto endianResult = fixUTFByteOrder(buffer);
|
auto endianResult = fixUTFByteOrder(buffer);
|
||||||
if(endianResult.bytesStripped > 0)
|
if(endianResult.bytesStripped > 0)
|
||||||
{
|
{
|
||||||
throw new ReaderException("Size of UTF-16 or UTF-32 input not aligned "
|
throw new ReaderException("Size of UTF-16 or UTF-32 input not aligned " ~
|
||||||
"to 2 or 4 bytes, respectively");
|
"to 2 or 4 bytes, respectively");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -226,33 +226,33 @@ final class Resolver
|
||||||
void addImplicitResolvers() @safe
|
void addImplicitResolvers() @safe
|
||||||
{
|
{
|
||||||
addImplicitResolver("tag:yaml.org,2002:bool",
|
addImplicitResolver("tag:yaml.org,2002:bool",
|
||||||
regex(r"^(?:yes|Yes|YES|no|No|NO|true|True|TRUE"
|
regex(r"^(?:yes|Yes|YES|no|No|NO|true|True|TRUE" ~
|
||||||
"|false|False|FALSE|on|On|ON|off|Off|OFF)$"),
|
"|false|False|FALSE|on|On|ON|off|Off|OFF)$"),
|
||||||
"yYnNtTfFoO");
|
"yYnNtTfFoO");
|
||||||
addImplicitResolver("tag:yaml.org,2002:float",
|
addImplicitResolver("tag:yaml.org,2002:float",
|
||||||
regex(r"^(?:[-+]?([0-9][0-9_]*)\\.[0-9_]*"
|
regex(r"^(?:[-+]?([0-9][0-9_]*)\\.[0-9_]*" ~
|
||||||
"(?:[eE][-+][0-9]+)?|[-+]?(?:[0-9][0-9_]"
|
"(?:[eE][-+][0-9]+)?|[-+]?(?:[0-9][0-9_]" ~
|
||||||
"*)?\\.[0-9_]+(?:[eE][-+][0-9]+)?|[-+]?"
|
"*)?\\.[0-9_]+(?:[eE][-+][0-9]+)?|[-+]?" ~
|
||||||
"[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]"
|
"[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]" ~
|
||||||
"*|[-+]?\\.(?:inf|Inf|INF)|\\."
|
"*|[-+]?\\.(?:inf|Inf|INF)|\\." ~
|
||||||
"(?:nan|NaN|NAN))$"),
|
"(?:nan|NaN|NAN))$"),
|
||||||
"-+0123456789.");
|
"-+0123456789.");
|
||||||
addImplicitResolver("tag:yaml.org,2002:int",
|
addImplicitResolver("tag:yaml.org,2002:int",
|
||||||
regex(r"^(?:[-+]?0b[0-1_]+"
|
regex(r"^(?:[-+]?0b[0-1_]+" ~
|
||||||
"|[-+]?0[0-7_]+"
|
"|[-+]?0[0-7_]+" ~
|
||||||
"|[-+]?(?:0|[1-9][0-9_]*)"
|
"|[-+]?(?:0|[1-9][0-9_]*)" ~
|
||||||
"|[-+]?0x[0-9a-fA-F_]+"
|
"|[-+]?0x[0-9a-fA-F_]+" ~
|
||||||
"|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$"),
|
"|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$"),
|
||||||
"-+0123456789");
|
"-+0123456789");
|
||||||
addImplicitResolver("tag:yaml.org,2002:merge", regex(r"^<<$"), "<");
|
addImplicitResolver("tag:yaml.org,2002:merge", regex(r"^<<$"), "<");
|
||||||
addImplicitResolver("tag:yaml.org,2002:null",
|
addImplicitResolver("tag:yaml.org,2002:null",
|
||||||
regex(r"^$|^(?:~|null|Null|NULL)$"), "~nN\0");
|
regex(r"^$|^(?:~|null|Null|NULL)$"), "~nN\0");
|
||||||
addImplicitResolver("tag:yaml.org,2002:timestamp",
|
addImplicitResolver("tag:yaml.org,2002:timestamp",
|
||||||
regex(r"^[0-9][0-9][0-9][0-9]-[0-9][0-9]-"
|
regex(r"^[0-9][0-9][0-9][0-9]-[0-9][0-9]-" ~
|
||||||
"[0-9][0-9]|[0-9][0-9][0-9][0-9]-[0-9]"
|
"[0-9][0-9]|[0-9][0-9][0-9][0-9]-[0-9]" ~
|
||||||
"[0-9]?-[0-9][0-9]?[Tt]|[ \t]+[0-9]"
|
"[0-9]?-[0-9][0-9]?[Tt]|[ \t]+[0-9]" ~
|
||||||
"[0-9]?:[0-9][0-9]:[0-9][0-9]"
|
"[0-9]?:[0-9][0-9]:[0-9][0-9]" ~
|
||||||
"(?:\\.[0-9]*)?(?:[ \t]*Z|[-+][0-9]"
|
"(?:\\.[0-9]*)?(?:[ \t]*Z|[-+][0-9]" ~
|
||||||
"[0-9]?(?::[0-9][0-9])?)?$"),
|
"[0-9]?(?::[0-9][0-9])?)?$"),
|
||||||
"0123456789");
|
"0123456789");
|
||||||
addImplicitResolver("tag:yaml.org,2002:value", regex(r"^=$"), "=");
|
addImplicitResolver("tag:yaml.org,2002:value", regex(r"^=$"), "=");
|
||||||
|
|
|
@ -320,7 +320,7 @@ final class Scanner
|
||||||
default: if(checkPlain()) { return fetchPlain(); }
|
default: if(checkPlain()) { return fetchPlain(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new ScannerException("While scanning for the next token, found character "
|
throw new ScannerException("While scanning for the next token, found character " ~
|
||||||
"\'%s\', index %s that cannot start any token"
|
"\'%s\', index %s that cannot start any token"
|
||||||
.format(c, to!int(c)), reader_.mark);
|
.format(c, to!int(c)), reader_.mark);
|
||||||
}
|
}
|
||||||
|
@ -368,7 +368,7 @@ final class Scanner
|
||||||
{
|
{
|
||||||
// Check if a simple key is required at the current position.
|
// Check if a simple key is required at the current position.
|
||||||
const required = (flowLevel_ == 0 && indent_ == reader_.column);
|
const required = (flowLevel_ == 0 && indent_ == reader_.column);
|
||||||
assert(allowSimpleKey_ || !required, "A simple key is required only if it is "
|
assert(allowSimpleKey_ || !required, "A simple key is required only if it is " ~
|
||||||
"the first token in the current line. Therefore it is always allowed.");
|
"the first token in the current line. Therefore it is always allowed.");
|
||||||
|
|
||||||
if(!allowSimpleKey_) { return; }
|
if(!allowSimpleKey_) { return; }
|
||||||
|
@ -1606,7 +1606,7 @@ final class Scanner
|
||||||
if(overflow)
|
if(overflow)
|
||||||
{
|
{
|
||||||
error("While scanning a double quoted scalar", startMark,
|
error("While scanning a double quoted scalar", startMark,
|
||||||
"overflow when parsing an escape sequence of "
|
"overflow when parsing an escape sequence of " ~
|
||||||
"hexadecimal numbers.", reader_.mark);
|
"hexadecimal numbers.", reader_.mark);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1773,7 +1773,7 @@ final class Scanner
|
||||||
reader_.sliceBuilder.finish();
|
reader_.sliceBuilder.finish();
|
||||||
reader_.forward(length);
|
reader_.forward(length);
|
||||||
error("While scanning a plain scalar", startMark,
|
error("While scanning a plain scalar", startMark,
|
||||||
"found unexpected ':' . Please check "
|
"found unexpected ':' . Please check " ~
|
||||||
"http://pyyaml.org/wiki/YAMLColonInFlowContext for details.",
|
"http://pyyaml.org/wiki/YAMLColonInFlowContext for details.",
|
||||||
reader_.mark);
|
reader_.mark);
|
||||||
return Token.init;
|
return Token.init;
|
||||||
|
@ -2015,7 +2015,7 @@ final class Scanner
|
||||||
const dchar c = reader_.peek(k);
|
const dchar c = reader_.peek(k);
|
||||||
if(!c.isHexDigit)
|
if(!c.isHexDigit)
|
||||||
{
|
{
|
||||||
auto msg = expected("URI escape sequence of 2 hexadecimal "
|
auto msg = expected("URI escape sequence of 2 hexadecimal " ~
|
||||||
"numbers", c);
|
"numbers", c);
|
||||||
error(contextMsg, startMark, msg, reader_.mark);
|
error(contextMsg, startMark, msg, reader_.mark);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue