[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-166-g445f31f

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=445f31fc06d338f0cafda188d0287f935c2edc3c

The branch, master has been updated
       via  445f31fc06d338f0cafda188d0287f935c2edc3c (commit)
      from  06bfe276c8bfd71cf601761659d6b20acebc23b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 445f31fc06d338f0cafda188d0287f935c2edc3c
Author: Andy Wingo <address@hidden>
Date:   Sun Jan 17 18:22:51 2010 +0100

    fix doc snarfing with fedora 12
    
    * module/scripts/snarf-check-and-output-texi.scm
      (process-multiline-directive): Be more accepting of source location
      markers in the preprocessed source, by adding a couple cases in which
      they can appear. Not foolproof, but it does adapt to what new GCCs are
      putting out (e.g. cpp (GCC) 4.4.2 20091222 (Red Hat 4.4.2-20)).

-----------------------------------------------------------------------

Summary of changes:
 module/scripts/snarf-check-and-output-texi.scm |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/module/scripts/snarf-check-and-output-texi.scm 
b/module/scripts/snarf-check-and-output-texi.scm
index 0e7efae..f92c833 100644
--- a/module/scripts/snarf-check-and-output-texi.scm
+++ b/module/scripts/snarf-check-and-output-texi.scm
@@ -262,6 +262,17 @@
       (set! *file* file)
       (set! *line* line))
 
+     ;; newer gccs like to throw around more location markers into the
+     ;; preprocessed source; these (hash . hash) bits are what they translate 
to
+     ;; in snarfy terms.
+     (('location ('string . file) ('int . line) ('hash . 'hash))
+      (set! *file* file)
+      (set! *line* line))
+
+     (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 
'hash))
+      (set! *file* file)
+      (set! *line* line))
+
      (('arglist rest ...)
       (set! *args* (do-arglist rest)))
 


hooks/post-receive
-- 
GNU Guile