summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/guile-snarf.in19
-rw-r--r--module/scripts/snarf-check-and-output-texi.scm15
2 files changed, 13 insertions, 21 deletions
diff --git a/libguile/guile-snarf.in b/libguile/guile-snarf.in
index c73e8ce1e..47bbc0422 100644
--- a/libguile/guile-snarf.in
+++ b/libguile/guile-snarf.in
@@ -1,7 +1,8 @@
#!/bin/sh
# Extract the initialization actions from source files.
#
-# Copyright (C) 1996, 97, 98, 99, 2000, 2001, 2002, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 97, 98, 99, 2000, 2001, 2002, 2004, 2006, 2008,
+# 2009, 2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -51,19 +52,21 @@ modern_snarf () # writes stdout
## empty file.
echo "/* cpp arguments: $@ */" ;
${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
- sed -ne 's/ *\^ *: *\^/\
+ sed -ne 's/ *\^ *\^ */\
/
-h
-s/\n.*//
+s/.*\n//
t x
d
: x
-s/.*\^ *\^ *\(.*\)/\1;/
+s/ *\^ *: *\^ */;\
+/
t y
-d
+N
+s/\n\(#.*\)/ /
+s/\n/ /
+t x
: y
-p
-x
+P
D' ${temp}
}
diff --git a/module/scripts/snarf-check-and-output-texi.scm b/module/scripts/snarf-check-and-output-texi.scm
index 6ca07a1f4..82d71f4a9 100644
--- a/module/scripts/snarf-check-and-output-texi.scm
+++ b/module/scripts/snarf-check-and-output-texi.scm
@@ -1,6 +1,6 @@
;;; snarf-check-and-output-texi --- called by the doc snarfer.
-;; Copyright (C) 2001, 2002, 2006, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2006, 2011, 2014 Free Software Foundation, Inc.
;;
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public License
@@ -63,7 +63,7 @@
(let loop ((s s))
(cond
((stream-null? s) #t)
- ((eq? 'eol (stream-car s))
+ ((memq (stream-car s) '(eol hash))
(loop (stream-cdr s)))
(else (cons (stream-car s) (stream-cdr s))))))
(port->stream port read)))))
@@ -265,17 +265,6 @@
(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)))