X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/cae601224e356773fcd101dce0677f558e7c4357..41cce2f604996c7713d9025f8a719ea56d83783e:/src/files.c diff --git a/src/files.c b/src/files.c index 5240c410..92573585 100644 --- a/src/files.c +++ b/src/files.c @@ -1,5 +1,6 @@ /* Open and close files for bison, - Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -27,13 +28,12 @@ #include "complain.h" /* From basename.c. Almost a lie, as it returns a char *. */ -const char *base_name PARAMS ((char const *name)); +const char *base_name (char const *name); FILE *finput = NULL; -struct obstack action_obstack; -struct obstack attrs_obstack; -struct obstack output_obstack; +struct obstack pre_prologue_obstack; +struct obstack post_prologue_obstack; /* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is tempting, but don't do that: for the time being our handling of the @@ -51,18 +51,20 @@ char *spec_defines_file = NULL; /* for --defines. */ char *parser_file_name = NULL; char *infile = NULL; -char *attrsfile = NULL; static char *full_base_name = NULL; + +/* Prefix used to generate output file names. */ char *short_base_name = NULL; +/* Infix used to generate output file names (i.e., `.tab', or `_tab', + or `'). */ +char *output_infix = NULL; + /* C source file extension (the parser source). */ const char *src_extension = NULL; /* Header file extension (if option ``-d'' is specified). */ const char *header_extension = NULL; - -/* Should we insert '.tab' in yacc-compatible parsers? */ -int tab_extension = 0; /*--------------------------. @@ -97,49 +99,6 @@ stringappend (const char *string1, const char *string2) return res; } - -/*-----------------------------------------------------------------. -| Computes the macro name used to avoid double inclusion in the | -| header of the parser and store it in header_macro_name. Be sure | -| to produce valid CPP names (don't start with digit, remain | -| alphanumerical + underscore). | -`-----------------------------------------------------------------*/ - -char * -compute_header_macro (void) -{ - const char *prefix = "BISON_"; - char *macro_name, *cp; - - if (spec_defines_file) - { - macro_name = XMALLOC (char, - strlen (prefix) + - strlen (spec_defines_file) + 1); - cp = stpcpy (macro_name, prefix); - cp = stpcpy (cp, spec_defines_file); - } - else - { - macro_name = XMALLOC (char, - strlen (prefix) + - strlen (full_base_name) + - strlen (header_extension) + 1); - cp = stpcpy (macro_name, prefix); - cp = stpcpy (cp, full_base_name); - cp = stpcpy (cp, header_extension); - } - - for (cp = macro_name; *cp; ++cp) - if (islower (*cp)) - *cp = toupper (*cp); - else if (!isalnum (*cp)) - *cp = '_'; - - return macro_name; -} - - /*-----------------------------------------------------------------. | Try to open file NAME with mode MODE, and print an error message | | if fails. | @@ -152,7 +111,7 @@ xfopen (const char *name, const char *mode) ptr = fopen (name, mode); if (!ptr) - error (2, errno, _("cannot open file `%s'"), name); + error (EXIT_FAILURE, errno, _("cannot open file `%s'"), name); return ptr; } @@ -171,63 +130,10 @@ xfclose (FILE *ptr) result = fclose (ptr); if (result == EOF) - error (2, errno, _("cannot close file")); + error (EXIT_FAILURE, errno, _("cannot close file")); return result; } - - -/*------------------------------------------------------------------. -| Return the path to the skeleton which locaction might be given in | -| ENVVAR, otherwise return SKELETON_NAME. | -`------------------------------------------------------------------*/ - -const char * -skeleton_find (const char *envvar, const char *skeleton_name) -{ - const char *res = getenv (envvar); - -#if defined (MSDOS) || defined (_WIN32) - if (!res) - { - /* Skeleton file name without path */ - const char *skel_name = strrchr (skeleton_name, '/'); - if (!skel_name) - skel_name = strrchr (skeleton_name, '\\'); - if (!skel_name) - skel_name = skeleton_name; - else - ++skel_name; - - /* File doesn't exist in current directory; try in INIT directory. */ - const char *cp = getenv ("INIT"); - if (cp) - { - res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2); - sprintf (res, "%s%c%s", cp, '\\', skel_name); - } - else if (access (skel_name, 4) == 0) /* Look in current dir. */ - res = skel_name; - else - { - /* Look in program locations dir. */ - extern char *program_name; - cp = strrchr(program_name, '\\'); - if (!cp) - return skeleton_name; - else - ++cp; - res = XMALLOC (char, cp - program_name + strlen (skel_name) + 1); - strncpy (res, program_name, cp - program_name); - strcpy (res + (cp - program_name), skel_name); - } - } -#endif /* defined (MSDOS) || defined (_WIN32) */ - if (!res) - res = skeleton_name; - - return res; -} /*----------------------------------------------------------------. @@ -347,14 +253,16 @@ compute_base_names (void) full_base_name = xstrndup (spec_outfile, (strlen (spec_outfile) - (ext ? strlen (ext) : 0))); + /* The short base name goes up to TAB, excluding it. */ short_base_name = xstrndup (spec_outfile, (strlen (spec_outfile) - (tab ? strlen (tab) : (ext ? strlen (ext) : 0)))); - /* Do we have a tab part? */ - tab_extension = !!tab; + if (tab) + output_infix = xstrndup (tab, + (strlen (tab) - (ext ? strlen (ext) : 0))); if (ext) compute_exts_from_src (ext); @@ -380,15 +288,16 @@ compute_base_names (void) else { /* Otherwise, the short base name is computed from the input - grammar: `foo.yy' => `foo'. */ + grammar: `foo/bar.yy' => `bar'. */ filename_split (infile, &base, &tab, &ext); short_base_name = - xstrndup (infile, - (strlen (infile) - (ext ? strlen (ext) : 0))); + xstrndup (base, + (strlen (base) - (ext ? strlen (ext) : 0))); } /* In these cases, always append `.tab'. */ - tab_extension = 1; + output_infix = xstrdup (EXT_TAB); + full_base_name = XMALLOC (char, strlen (short_base_name) + strlen (EXT_TAB) + 1); @@ -396,7 +305,7 @@ compute_base_names (void) /* Computes the extensions from the grammar file name. */ filename_split (infile, &base, &tab, &ext); - if (ext) + if (ext && !yacc_flag) compute_exts_from_gf (ext); } } @@ -410,15 +319,15 @@ compute_output_file_names (void) { compute_base_names (); - parser_file_name = - spec_outfile ? spec_outfile : stringappend (full_base_name, src_extension); - /* If not yet done. */ if (!src_extension) src_extension = ".c"; if (!header_extension) header_extension = ".h"; + parser_file_name = + spec_outfile ? spec_outfile : stringappend (full_base_name, src_extension); + /* It the defines filename if not given, we create it. */ if (!spec_defines_file) spec_defines_file = stringappend (full_base_name, header_extension); @@ -428,6 +337,4 @@ compute_output_file_names (void) spec_graph_file = stringappend (short_base_name, ".vcg"); spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT); - - attrsfile = stringappend (short_base_name, EXT_STYPE_H); }