summaryrefslogtreecommitdiffstats
path: root/elaborate.cxx
diff options
context:
space:
mode:
authorddomingo <ddomingo@redhat.com>2008-10-21 16:25:38 +1000
committerddomingo <ddomingo@redhat.com>2008-10-21 16:25:38 +1000
commitdd09ee8f6048ccb7a998c09926d8442182595292 (patch)
tree9903ca81344554b9af7dfb5b1f2e512154b5b066 /elaborate.cxx
parente9a2c05304d28c9f8d249eca323cbe507dcbdd32 (diff)
parentfecccf83624c2f09207cd281f9efc272300e8e55 (diff)
downloadsystemtap-steved-dd09ee8f6048ccb7a998c09926d8442182595292.tar.gz
systemtap-steved-dd09ee8f6048ccb7a998c09926d8442182595292.tar.xz
systemtap-steved-dd09ee8f6048ccb7a998c09926d8442182595292.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'elaborate.cxx')
-rw-r--r--elaborate.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/elaborate.cxx b/elaborate.cxx
index 9f0a2a74..e4251f2a 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -1439,17 +1439,17 @@ systemtap_session::print_error (const semantic_error& e)
for (int i=0; i<2; i++)
{
stringstream message;
-
+
message << "semantic error: " << e.what ();
if (e.tok1 || e.tok2)
message << ": ";
- if (e.tok1)
+ if (e.tok1)
{
if (i == 0) print_token (message, e.tok1);
else message << *e.tok1;
}
message << e.msg2;
- if (e.tok2)
+ if (e.tok2)
{
if (i == 0) print_token (message, e.tok2);
else message << *e.tok2;
@@ -3903,6 +3903,7 @@ typeresolution_info::visit_print_format (print_format* e)
case print_format::conv_unsigned_uppercase_hex:
case print_format::conv_unsigned_lowercase_hex:
case print_format::conv_binary:
+ case print_format::conv_char:
case print_format::conv_memory:
wanted = pe_long;
break;