Mercurial > hg > xemacs-beta
view lib-src/make-po.c @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | 576fb035e263 |
children |
line wrap: on
line source
/* Generate .po file from doc-string file. Scan specified doc-string file, creating .po format messages for processing with msgfmt. The results go to standard output or to a file specified with -a or -o (-a to append, -o to start from nothing). Kludge to make up for shortcoming in make-docfile and Snarf-documentation: If arg before input filename is -p, we are scanning an add-on package, which requires slightly different processing. */ #include <stdio.h> #include <stdlib.h> #ifndef EXIT_SUCCESS #define EXIT_SUCCESS 0 #define EXIT_FAILURE 1 #endif /* #define BUFSIZE 8192 */ /* #define BUFSIZE 16384 */ #define BUFSIZE 32768 #define NEWSTRING 31 /* Character signalling start of new doc string */ #define LINEEND "\\n" #define ENDSTRING "\"\n" #define LINEBEGIN " \"" #define LINEBREAK ENDSTRING LINEBEGIN /* some brain-dead headers define this ... */ #undef FALSE #undef TRUE enum boolean { FALSE, TRUE }; /***********************/ /* buffer pseudo-class */ /***********************/ typedef struct _buffer { size_t index; /* current position in buf[] */ size_t size; /* size of buf */ char *buf; } buffer_struct; #define BUF_NULL {0, 0, NULL} int buf_init (buffer_struct *buffer, size_t size); void buf_free (buffer_struct *buffer); void buf_clear (buffer_struct *buffer); int buf_putc (buffer_struct *buffer, int c); int buf_print (buffer_struct *buffer, const char *s); /********************/ /* global variables */ /********************/ FILE *infile = NULL; FILE *outfile = NULL; buffer_struct buf = BUF_NULL; void scan_file (enum boolean package); void initialize (void); void clean_exit (int status); void buf_putc_safe (int c); void buf_print_safe (const char *s); void terminate_string (void); main (int argc, char *argv[]) { register int i; enum boolean package = FALSE; /* TRUE if scanning add-on package */ initialize (); outfile = stdout; /* If first two args are -o FILE, output to FILE. */ i = 1; if (argc > i + 1 && strcmp (argv[i], "-o") == 0) { outfile = fopen (argv[++i], "w"); ++i; } /* ...Or if args are -a FILE, append to FILE. */ if (argc > i + 1 && strcmp (argv[i], "-a") == 0) { outfile = fopen (argv[++i], "a"); ++i; } if (!outfile) { fprintf (stderr, "Unable to open output file %s\n", argv[--i]); return 1; } if (argc > i && !strcmp (argv[i], "-p")) { package = TRUE; ++i; } infile = fopen (argv[i], "r"); if (!infile) { fprintf (stderr, "Unable to open input file %s\n", argv[i]); return 1; } scan_file (package); clean_exit (EXIT_SUCCESS); } void scan_file (enum boolean package) { register int c; /* Character read in */ fprintf (outfile, "###############\n"); fprintf (outfile, "# DOC strings #\n"); fprintf (outfile, "###############\n"); while (c = getc (infile), !feof (infile)) { if (c == NEWSTRING) { /* If a string was being processed, terminate it. */ if (buf.index > 0) terminate_string (); /* Skip function or variable name. */ while (c != '\n') c = getc (infile); c = getc (infile); /* Begin a new string. */ fprintf (outfile, "msgid \""); buf_print_safe ("msgstr \""); } if (c == '\n') { /* Peek at next character. */ c = getc (infile); ungetc (c, infile); /* For add-on (i.e., non-preloaded) documentation, ignore the last carriage return of a string. */ if (!(package && c == NEWSTRING)) { fprintf (outfile, LINEEND); buf_print_safe (LINEEND); } /* If not end of string, continue it on the next line. */ if (c != NEWSTRING) { fprintf (outfile, LINEBREAK); buf_print_safe (LINEBREAK); } } else { /* If character is \ or ", precede it by a backslash. */ if (c == '\\' || c == '\"') { putc ('\\', outfile); buf_putc_safe ('\\'); } putc (c, outfile); buf_putc_safe (c); } } terminate_string (); } /* initialize sets up the global variables. */ void initialize (void) { if (buf_init (&buf, BUFSIZE) != 0) clean_exit (EXIT_FAILURE); } /* clean_exit returns any resources and terminates the program. An error message is printed if status is EXIT_FAILURE. */ void clean_exit (int status) { if (buf.size > 0) buf_free (&buf); if (outfile) fclose (outfile); if (infile) fclose (infile); if (status == EXIT_FAILURE) fprintf (stderr, "make-po abnormally terminated\n"); exit (status); } /* buf_putc_safe writes the character c on the global buffer buf, checking to make sure that the operation was successful. */ void buf_putc_safe (int c) { register int status; status = buf_putc (&buf, c); if (status == EOF) clean_exit (EXIT_FAILURE); } /* buf_putc_safe writes the string s on the global buffer buf, checking to make sure that the operation was successful. */ void buf_print_safe (const char *s) { register int status; status = buf_print (&buf, s); if (status < 0) clean_exit (EXIT_FAILURE); } /* terminate_string terminates the current doc string and outputs the buffer. */ void terminate_string (void) { fprintf (outfile, ENDSTRING); /* Make the "translation" different from the original string. */ buf_print_safe ("_X"); buf_print_safe (ENDSTRING); fprintf (outfile, "%s", buf.buf); buf_clear (&buf); } /*********************************/ /* buffer pseudo-class functions */ /*********************************/ /* buf_init initializes a buffer to the specified size. It returns non-zero if the attempt fails. */ int buf_init (buffer_struct *buffer, size_t size) { buffer->buf = malloc (size); if (buffer->buf == NULL) return 1; buffer->size = size; buf_clear (buffer); return 0; } /* buf_free releases the memory allocated for the buffer. */ void buf_free (buffer_struct *buffer) { free (buffer->buf); buffer->size = 0; } /* buf_clear resets a buffer to an empty string. */ void buf_clear (buffer_struct *buffer) { buffer->index = 0; buffer->buf[0] = '\0'; } /* buf_putc writes the character c on the buffer. It returns the character written, or EOF for error. */ int buf_putc (buffer_struct *buffer, int c) { if (buffer->index >= buffer->size) return EOF; buffer->buf[buffer->index++] = c; return c; } /* buf_print writes the string s on the buffer. It returns the number of characters written, or negative if an error occurred. */ int buf_print (buffer_struct *buffer, const char *s) { register int len; len = strlen (s); if (buffer->index + len >= buffer->size) return -1; sprintf (&(buffer->buf[buffer->index]), s); buffer->index += len; return len; }