* Renamed SCM__X tokens to better readable ones that also follow the

  SCM_SNARF_ prefix convention.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 1a1104b..d575c7c 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-21  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * guile-snarf.awk.in, guile-snarf.in, snarf.h:  Rename SCM__I to
+       SCM_SNARF_INIT_START, SCM__D to SCM_SNARF_DOC_START, SCM__S to
+       SCM_SNARF_DOCSTRING_START and SCM__E to SCM_SNARF_DOCSTRING_END.
+
 2000-06-21  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
        * eval.c, eval.h (scm_top_level_lookup_closure_var): Added.

diff --git a/libguile/guile-snarf.awk.in b/libguile/guile-snarf.awk.in
index 582b5a6..9fa44aa 100644 (file)
--- a/libguile/guile-snarf.awk.in
+++ b/libguile/guile-snarf.awk.in
@@ -9,16 +9,16 @@ BEGIN { FS="|";
         printf "" > dot_doc_file;
 }
 
-/^[ \t]*SCM__I/ { copy = $0; 
-               gsub(/[ \t]*SCM__I/, "", copy); 
-               gsub(/SCM__D.*$/, "", copy); 
+/^[ \t]*SCM_SNARF_INIT_START/ { copy = $0; 
+               gsub(/[ \t]*SCM_SNARF_INIT_START/, "", copy); 
+               gsub(/SCM_SNARF_DOC_START.*$/, "", copy); 
                print copy; } 
 
-/SCM__D/,/SCM__S/ { copy = $0; 
-                 if (match(copy,/SCM__DR/)) { registering = 1; } 
+/SCM_SNARF_DOC_START/,/SCM_SNARF_DOCSTRING_START/ { copy = $0; 
+                 if (match(copy,/SCM_SNARF_DOC_STARTR/)) { registering = 1; } 
                  else {registering = 0; } 
-                 gsub(/.*SCM__D./,"", copy); 
-                 gsub(/SCM__S.*/,"",copy); 
+                 gsub(/.*SCM_SNARF_DOC_START./,"", copy); 
+                 gsub(/SCM_SNARF_DOCSTRING_START.*/,"",copy); 
                  gsub(/[ \t]+/," ", copy); 
                 sub(/^[ \t]*/,"(", copy);
                  gsub(/\"/,"",copy); 
@@ -51,10 +51,10 @@ BEGIN { FS="|";
                   { print location ":*** `" copy "' is improperly registered as having " numactuals " arguments" > std_err; }
                 print "\f\n" copy (registering?")":"") > dot_doc_file ; }
 
-/SCM__S/,/SCM__E.*$/ { copy = $0; 
-                      gsub(/.*SCM__S/,"",copy); 
+/SCM_SNARF_DOCSTRING_START/,/SCM_SNARF_DOCSTRING_END.*$/ { copy = $0; 
+                      gsub(/.*SCM_SNARF_DOCSTRING_START/,"",copy); 
                      sub(/^[ \t]*"?/,"", copy);
-                     sub(/\"?[ \t]*SCM__E.*$/,"", copy);
+                     sub(/\"?[ \t]*SCM_SNARF_DOCSTRING_END.*$/,"", copy);
                       gsub(/\\n\\n"?/,"\n",copy);
                       gsub(/\\n"?[ \t]*$/,"",copy);
                       gsub(/\\\"[ \t]*$/,"\"",copy);
@@ -62,7 +62,7 @@ BEGIN { FS="|";
                       if (copy != "") { print copy > dot_doc_file }
                 }
 
-/SCM__E[ \t]/ { print "\ 1[" location "]" >> dot_doc_file; }
+/SCM_SNARF_DOCSTRING_END[ \t]/ { print "\ 1[" location "]" >> dot_doc_file; }
 
 /\*&\*&\*&\*SCM_ARG_BETTER_BE_IN_POSITION/ { copy = $0;
          sub(/.*\*&\*&\*&\*SCM_ARG_BETTER_BE_IN_POSITION\([ \t]*/,"",copy);

diff --git a/libguile/guile-snarf.in b/libguile/guile-snarf.in
index d134703..a606b44 100644 (file)
--- a/libguile/guile-snarf.in
+++ b/libguile/guile-snarf.in
@@ -10,7 +10,7 @@ test -n "${CPP+set}" || CPP="@CPP@"
 ## We must use a temporary file here, instead of a pipe, because we
 ## need to know if CPP exits with a non-zero status.
 ${CPP} -DSCM_MAGIC_SNARFER "$@" > ${temp} || exit $?
-< ${temp} grep "^ *SCM__I" | sed -e "s/^ *SCM__I//" -e 's/SCM__D.*$//g'
+< ${temp} grep "^ *SCM_SNARF_INIT_START" | sed -e "s/^ *SCM_SNARF_INIT_START//" -e 's/SCM_SNARF_DOC_START.*$//g'
 
 ## Apparently, AIX's preprocessor is unhappy if you try to #include an
 ## empty file.

diff --git a/libguile/snarf.h b/libguile/snarf.h
index ee6d915..9537124 100644 (file)
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -67,7 +67,8 @@
  *     SCM_SNARF_INIT (NAME = foo ())
  *
  * The SCM_SNARF_INIT text goes into the corresponding .x file
- * up through the first occurrence of SCM__D on that line, if any.
+ * up through the first occurrence of SCM_SNARF_DOC_START on that
+ * line, if any.
  */
 
 #ifndef SCM_MAGIC_SNARFER
@@ -76,7 +77,7 @@
 #  define SCM_SNARF_DOCS(X)
 #else
 #  define SCM_SNARF_HERE(X)
-#  define SCM_SNARF_INIT(X) SCM__I X
+#  define SCM_SNARF_INIT(X) SCM_SNARF_INIT_START X
 #  define SCM_SNARF_DOCS(X) X
 #endif
 
@@ -90,7 +91,8 @@ scm_make_gsubr (s_ ## FNAME, REQ, OPT, VAR, \
                 (SCM_FUNC_CAST_ARBITRARY_ARGS) FNAME); \
 )\
 SCM_SNARF_DOCS(\
-SCM__DP PRIMNAME #ARGLIST | REQ | OPT | VAR | __FILE__:__LINE__ | SCM__S DOCSTRING SCM__E \
+SCM_SNARF_DOC_STARTP PRIMNAME #ARGLIST | REQ | OPT | VAR | __FILE__:__LINE__ | \
+ SCM_SNARF_DOCSTRING_START DOCSTRING SCM_SNARF_DOCSTRING_END \
 )
 
 #define SCM_DEFINE1(FNAME, PRIMNAME, TYPE, ARGLIST, DOCSTRING) \
@@ -100,7 +102,8 @@ SCM FNAME ARGLIST\
 )\
 SCM_SNARF_INIT(scm_make_subr (s_ ## FNAME, TYPE, FNAME); ) \
 SCM_SNARF_DOCS(\
-SCM__D1 PRIMNAME #ARGLIST | 2 | 0 | 0 | __FILE__:__LINE__ | SCM__S DOCSTRING SCM__E \
+SCM_SNARF_DOC_START1 PRIMNAME #ARGLIST | 2 | 0 | 0 | __FILE__:__LINE__ | \
+ SCM_SNARF_DOCSTRING_START DOCSTRING SCM_SNARF_DOCSTRING_END \
 )
 
 #define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
@@ -113,7 +116,8 @@ SCM_SNARF_HERE(static const char RANAME[]=STR) \
 SCM_SNARF_INIT(scm_make_gsubr (RANAME, REQ, OPT, VAR, \
                                (SCM_FUNC_CAST_ARBITRARY_ARGS) CFN);) \
 SCM_SNARF_DOCS(\
-SCM__DR STR | REQ | OPT | VAR | __FILE__:__LINE__ | SCM__S CFN SCM__E \
+SCM_SNARF_DOC_STARTR STR | REQ | OPT | VAR | __FILE__:__LINE__ | \
+ SCM_SNARF_DOCSTRING_START CFN SCM_SNARF_DOCSTRING_END \
 )
 
 #define SCM_GPROC(RANAME, STR, REQ, OPT, VAR, CFN, GF)  \