summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Slice/Scanner.cpp26
-rw-r--r--cpp/src/Slice/Scanner.l67
-rw-r--r--cpp/src/slice2cpp/Gen.cpp8
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.err5
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.ice3
5 files changed, 54 insertions, 55 deletions
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index 27d362e04c9..62d1a7a6d85 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -1138,6 +1138,9 @@ YY_RULE_SETUP
{
case '\\':
{
+ //
+ // add extra escape to our internal string
+ //
str->v += '\\';
str->v += '\\';
break;
@@ -1243,7 +1246,11 @@ YY_RULE_SETUP
{
IceUtil::Int64 value = 0;
string escape = "";
- while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
+
+ //
+ // Unlike C++, we limit hex escape sequences to 2 hex digits
+ //
+ while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))) && escape.length() < 2)
{
escape += next;
}
@@ -1256,16 +1263,11 @@ YY_RULE_SETUP
{
unit->error("illegal NUL character in string constant");
}
- else if(value > 255)
- {
- ostringstream os;
- os << "hex escape sequence out of range: '\\x" << hex << value << "'";
- unit->warning(os.str());
- }
+ assert(value >= 0 && value <= 255);
str->v += static_cast<char>(value);
break;
}
-
+
//
// Universal character name \unnnn code point U+nnnn
//
@@ -1367,12 +1369,10 @@ YY_RULE_SETUP
ostringstream os;
os << "unknown escape sequence '\\" << next << "'";
unit->warning(os.str());
- //
- // We escape the backslack in a unknown escape sequence
- // to keep compativility with 3.6"
- //
+
+ // Escape the \ in this unknown escape sequence
+ str->v += '\\';
str->v += '\\';
- str->v += c;
unput(next);
}
}
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index a9c381b7260..aadffc22bc1 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -264,6 +264,9 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
{
case '\\':
{
+ //
+ // add extra escape to our internal string
+ //
str->v += '\\';
str->v += '\\';
break;
@@ -274,13 +277,13 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
str->v += next;
break;
}
-
+
case 'n':
{
str->v += '\n';
break;
}
-
+
case 'r':
{
str->v += '\r';
@@ -292,13 +295,13 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
str->v += '\t';
break;
}
-
+
case 'v':
{
str->v += '\v';
break;
}
-
+
case 'f':
{
str->v += '\f';
@@ -324,7 +327,7 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
}
//
- // Octal value \nnn limited to three octal digits but terminate at the first character
+ // Octal value \nnn limited to three octal digits but terminate at the first character
// that is not a valid octal digit if encountered sooner.
//
case '0':
@@ -347,11 +350,11 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
unput(next);
break;
}
- escape += next;
+ escape += next;
}
str->literal += escape;
value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
-
+
if(value == 0)
{
unit->error("illegal NUL character in string constant");
@@ -365,16 +368,21 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
str->v += static_cast<char>(value);
break;
}
+
case 'x':
{
IceUtil::Int64 value = 0;
string escape = "";
- while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
+
+ //
+ // Unlike C++, we limit hex escape sequences to 2 hex digits
+ //
+ while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))) && escape.length() < 2)
{
escape += next;
}
unput(next);
-
+
str->literal += escape;
value = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
@@ -382,16 +390,11 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
{
unit->error("illegal NUL character in string constant");
}
- else if(value > 255)
- {
- ostringstream os;
- os << "hex escape sequence out of range: '\\x" << hex << value << "'";
- unit->warning(os.str());
- }
+ assert(value >= 0 && value <= 255);
str->v += static_cast<char>(value);
break;
}
-
+
//
// Universal character name \unnnn code point U+nnnn
//
@@ -411,7 +414,7 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
}
escape += next;
}
-
+
value = escape.size() == 4 ? IceUtilInternal::strToInt64(escape.c_str(), 0, 16) : -1;
ostringstream os;
@@ -419,16 +422,16 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
os.fill('0');
os.width(4);
os << hex << value;
-
+
if(value == 0)
{
unit->error("illegal NUL character in string constant");
}
-
-
+
+
//
// Determine if a character is a surrogate:
- //
+ //
// * High surrogate code point, ranging from 0xd800 to 0xdbff, inclusive
// * Low surrogate code point, ranging from 0xdc00 to 0xdfff, inclusive.
//
@@ -438,15 +441,15 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
}
str->v += os.str();
-
+
break;
}
-
+
case 'U':
{
IceUtil::Int64 value = 0;
string escape = "";
-
+
for(int i = 0; i < 8; ++i)
{
next = static_cast<char>(yyinput());
@@ -459,7 +462,7 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
}
escape += next;
}
-
+
value = escape.size() == 8 ? IceUtilInternal::strToInt64(escape.c_str(), 0, 16) : -1;
ostringstream os;
@@ -467,15 +470,15 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
os.fill('0');
os.width(8);
os << hex << value;
-
+
if(value == 0)
{
unit->error("illegal NUL character in string constant");
}
-
+
//
// Determine if a character is a surrogate:
- //
+ //
// * High surrogate code point, ranging from 0xd800 to 0xdbff, inclusive
// * Low surrogate code point, ranging from 0xdc00 to 0xdfff, inclusive.
//
@@ -493,12 +496,10 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]
ostringstream os;
os << "unknown escape sequence '\\" << next << "'";
unit->warning(os.str());
- //
- // We escape the backslack in a unknown escape sequence
- // to keep compativility with 3.6"
- //
+
+ // Escape the \ in this unknown escape sequence
+ str->v += '\\';
str->v += '\\';
- str->v += c;
unput(next);
}
}
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 140438eb37e..582f6edf732 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -204,7 +204,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
else
{
//
- // Write any pedding characters in the utf8 buffer
+ // Write any padding characters in the utf8 buffer
//
if(!u8buffer.empty())
{
@@ -229,7 +229,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
//
// An even number of slash \ will escape the backslash and
- // the codepoint will be interpreted as its charaters
+ // the codepoint will be interpreted as its characters
//
// \\U00000041 - ['\\', 'U', '0', '0', '0', '0', '0', '0', '4', '1']
// \\\U00000041 - ['\\', 'A'] (41 is the codepoint for 'A')
@@ -243,7 +243,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
size_t sz = value[j] == 'U' ? 8 : 4;
string codepoint = value.substr(j + 1, sz);
- assert(codepoint.size() == sz);
+ assert(codepoint.size() == sz);
IceUtil::Int64 v = IceUtilInternal::strToInt64(codepoint.c_str(), 0, 16);
out << u32CodePoint(static_cast<unsigned int>(v), cpp11);
@@ -271,7 +271,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
}
//
- // Write any pedding characters in the utf8 buffer
+ // Write any padding characters in the utf8 buffer
//
if(!u8buffer.empty())
{
diff --git a/cpp/test/Slice/errorDetection/ConstDef.err b/cpp/test/Slice/errorDetection/ConstDef.err
index 7784f8c8fef..119b4f8fc44 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.err
+++ b/cpp/test/Slice/errorDetection/ConstDef.err
@@ -30,6 +30,5 @@ ConstDef.ice:150: warning: unknown escape sequence '\g'
ConstDef.ice:151: unknown escape sequence in string constant: "a\u000N
ConstDef.ice:152: unknown escape sequence in string constant: "a\U0000000K
ConstDef.ice:153: warning: octal escape sequence out of range: '\455'
-ConstDef.ice:154: warning: hex escape sequence out of range: '\xfff'
-ConstDef.ice:155: unknown escape sequence in string constant: '\ud83c'
-ConstDef.ice:155: unknown escape sequence in string constant: '\udf4c' \ No newline at end of file
+ConstDef.ice:154: unknown escape sequence in string constant: '\ud83c'
+ConstDef.ice:154: unknown escape sequence in string constant: '\udf4c' \ No newline at end of file
diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice
index e6682e80300..df183958f16 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.ice
+++ b/cpp/test/Slice/errorDetection/ConstDef.ice
@@ -23,7 +23,7 @@ const int intconst = 0;
const long longconst = 0;
const float floatconst = 0.;
const double doubleconst = 0.;
-const string stringconst = "X\aX\x00001X\rX\007\xff\xff\xff";
+const string stringconst = "X\aX\x01000\x100\rX\007\xff\xff\xff\x0ff\xfff\x1X";
const string stringconst2 = "Hello World!";
enum color { red, green, blue };
const color colorconst = blue;
@@ -151,7 +151,6 @@ const string unknowescape = "a\g"; // Unknown escape sequence
const string invalidCodepoint = "a\u000N"; // Invalid code point
const string invalidCodepoint1 = "a\U0000000K"; // Invalid code point
const string octalRange = "\455"; // OCT escape sequence out of range
-const string hexRange = "\xFFF"; // HEX escape sequence out of range
const string surrogatePair = "\uD83C\uDF4C"; // surrogate pair not allow in slice
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 10:48:07 +0000