xemacs-beta: lib-src/make-docfile.c comparison

comparison lib-src/make-docfile.c @ 173:8eaf7971accc r20-3b13

Import from CVS: tag r20-3b13

author	cvs
date	Mon, 13 Aug 2007 09:49:09 +0200
parents	a145efe76779
children	677f6a0ee643

comparison

equal deleted inserted replaced

-:a38aed19690b
+:8eaf7971accc
 #undef chdir
 #endif
 /* Stdio stream for output to the DOC file.  */
 static FILE *outfile;
-static char *extra_elcs = NULL;
 enum
 {
 el_file,
 elc_file,
 main (int argc, char **argv)
 {
 int i;
 int err_count = 0;
 int first_infile;
+char *extra_elcs = NULL;
 progname = argv[0];
 outfile = stdout;
 int in_ident = 0;
 int just_spaced = 0;
 #if 0
 int need_space = 1;
 fprintf (out, "(%s", func);
 #else
 /* XEmacs - "arguments:" is for parsing the docstring.  FSF's help system
 doesn't parse the docstring for arguments like we do, so we're also
 going to omit the function name to preserve compatibility with elisp
 that parses the docstring.  Finally, not prefixing the arglist with
 anything is asking for trouble because it's not uncommon to have an
 unescaped parenthesis at the beginning of a line. --Stig */
 fprintf (out, "arguments: (");
 #endif
 if (*buff == '(')
 ++buff;
 for (p = buff; *p; p++)
 	  p += (sizeof (lo) - 1);
 	  while (isspace (*p))
 	    p++;
 	  c = *p;
 	}
 /* Notice when we start printing a new identifier.  */
 if (C_IDENTIFIER_CHAR_P (c) != in_ident)
 	{
 	  if (!in_ident)
 	    {
 	    in_ident = 0;
 	}
 /* Print the C argument list as it would appear in lisp:
 	 print underscores as hyphens, and print commas as spaces.
-	 Collapse adjacent spaces into one.  */
+	 Collapse adjacent spaces into one. */
 if (c == '_') c = '-';
 if (c == ',') c = ' ';
-/* In C code, `default' is a reserved word, so we spell it
+/* If the C argument name ends with `_', change it to ' ',
-	 `defalt'; unmangle that here.  */
+	 to allow use of C reserved words or global symbols as Lisp args. */
-if (ident_start
+if (c == '-' && ! C_IDENTIFIER_CHAR_P (p[1]))
-	  && strncmp (p, "defalt", 6) == 0
+	{
-	  && ! C_IDENTIFIER_CHAR_P (p[6]))
-	{
-	  fprintf (out, "DEFAULT");
-	  p += 5;
 	  in_ident = 0;
 	  just_spaced = 0;
 	}
 else if (c != ' ' || ! just_spaced)
 	{
 We also look for #@LENGTH CONTENTS^_ at the beginning of the line.
 When we find that, we save it for the following defining-form,
 and we use that instead of reading a doc string within that defining-form.
 For defun, defmacro, and autoload, we know how to skip over the arglist.
 For defvar, defconst, and fset we skip to the docstring with a kludgy
 formatting convention: all docstrings must appear on the same line as the
 initial open-paren (the one in column zero) and must contain a backslash
 and a double-quote immediately after the initial double-quote.  No newlines
 must appear between the beginning of the form and the first double-quote.
 The only source file that must follow this convention is loaddefs.el; aside
 from that, it is always the .elc file that we look at, and they are no
 problem because byte-compiler output follows this convention.
 	*fillp++ = c;
 }
 if (! buffer[0])
 fprintf (stderr, "## expected a symbol, got '%c'\n", c);
 skip_white (infile);
 }
 static int
 scan_lisp_file (CONST char *filename, CONST char *mode)
 		    {
 		      getc (infile);
 		      getc (infile);
 		      goto nextchar;
 		    }
 		  c2 = c1;
 		  c1 = c;
 		nextchar:
 		  c = getc (infile);
 		}
 	      /* If two previous characters were " and \,
 		 this is a doc string.  Otherwise, there is none.  */
 	      if (c2 != '"' || c1 != '\\')
 		{
 #ifdef DEBUG
 		{
 		  c2 = c1;
 		  c1 = c;
 		  c = getc (infile);
 		}
 	      /* If two previous characters were " and \,
 		 this is a doc string.  Otherwise, there is none.  */
 	      if (c2 != '"' || c1 != '\\')
 		{
 #ifdef DEBUG

Mercurial > hg > xemacs-beta

comparison lib-src/make-docfile.c @ 173:8eaf7971accc r20-3b13