Merge pull request #2095 from tbabej/test_fixes

TW-1511: Interpret string subtraction as concanetation with a dash
This commit is contained in:
Paul Beckingham 2019-01-02 08:02:12 -05:00 committed by GitHub
commit 660b7c09af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1278,8 +1278,19 @@ Variant& Variant::operator-= (const Variant& other)
break; break;
case type_string: case type_string:
switch (right._type)
{
case type_string:
cast (type_string); _string += '-' + right._string; break;
case type_boolean:
case type_integer:
case type_real:
case type_date:
case type_duration:
throw std::string (STRING_VARIANT_SUB_STRING); throw std::string (STRING_VARIANT_SUB_STRING);
break; break;
}
break;
case type_date: case type_date:
switch (right._type) switch (right._type)