summaryrefslogtreecommitdiff
path: root/pidl/lib/Parse
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2013-02-06 10:17:57 +0200
committerAlexander Bokovoy <ab@samba.org>2013-02-06 11:51:11 +0100
commit6ba7ab5c14801aecae96373d5a9db7ab82957526 (patch)
treecc177efb8ecdfdc945fc9c24da1dbcee6f23a7f0 /pidl/lib/Parse
parent1aa1d658c8f60ab890772e2c0044e2f939db79c4 (diff)
downloadsamba-6ba7ab5c14801aecae96373d5a9db7ab82957526.tar.gz
samba-6ba7ab5c14801aecae96373d5a9db7ab82957526.tar.bz2
samba-6ba7ab5c14801aecae96373d5a9db7ab82957526.zip
PIDL: fix parsing linemarkers in preprocessor output
When PIDL calls out to C preprocessor to expand IDL files and parse the output, it filters out linemarkers and line control information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control With gcc 4.8 stdc-predef.h is included automatically and linemarker for the file has extended flags that PIDL couldn't parse ('system header that needs to be extern "C" protected for C++') Thanks to Jakub Jelinek <jakub@redhat.com> for explanation of the linemarker format. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517 Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'pidl/lib/Parse')
-rw-r--r--pidl/lib/Parse/Pidl/IDL.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index d4820ffe92..6927c89255 100644
--- a/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
@@ -2576,7 +2576,9 @@ again:
for ($parser->YYData->{INPUT}) {
if (/^\#/) {
- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
+ # Linemarker format is described at
+ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
$parser->YYData->{LINE} = $1-1;
$parser->YYData->{FILE} = $2;
goto again;