aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2008-11-29 12:21:10 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2008-11-29 12:21:10 +0000
commitcc95528267653020ce9ceb0ddb24dd501c0264f8 (patch)
tree58c63589d15c64b4eb84432c527da1fbb4d5d36e /libcpp
parentf9805f52d581f361e33ac770f26fc5c48580a72a (diff)
downloadgcc-cc95528267653020ce9ceb0ddb24dd501c0264f8.zip
gcc-cc95528267653020ce9ceb0ddb24dd501c0264f8.tar.gz
gcc-cc95528267653020ce9ceb0ddb24dd501c0264f8.tar.bz2
lex.c (cpp_token_len): Use 6 as default length.
libcpp: * lex.c (cpp_token_len): Use 6 as default length. gcc/testsuite: * g++.dg/cpp/stringop-1.C: New test. From-SVN: r142275
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog4
-rw-r--r--libcpp/lex.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 1d0d28c..9f6148e 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-29 Joseph Myers <joseph@codesourcery.com>
+
+ * lex.c (cpp_token_len): Use 6 as default length.
+
2008-10-31 Manuel López-Ibáñez <manu@gcc.gnu.org>
* expr.c (struct op): Add location.
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 57364f0..96d1a99 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1362,7 +1362,7 @@ cpp_token_len (const cpp_token *token)
switch (TOKEN_SPELL (token))
{
- default: len = 4; break;
+ default: len = 6; break;
case SPELL_LITERAL: len = token->val.str.len; break;
case SPELL_IDENT: len = NODE_LEN (token->val.node) * 10; break;
}