Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-12 13:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/skeleton.h: New.

Browse Source 
* src/output.c (output_parser, output_master_parser): Remove, dead
code.
* src/output.h (get_lines_number, actions_output, guards_output)
(token_definitions_output): Prototype them.
* src/parse-skel.y: Add the license notice.
Include output.h and skeleton.h.
(process_skeleton): Returns void, and takes a single parameter.
* src/scan-skel.l: Add the license notice.
Include skeleton.h.
Don't use %option yylineno: it seems that then Flex imagines
REJECT has been used, and therefore it won't reallocate its
buffers (which makes no other sense to me than a bug).  It results
in warnings for `unused: yy_flex_realloc'.
to guess if the generated parsers should have '.tab' in their
* src/Makefile.am (bison_SOURCES): Add scan-skel.l and
This commit is contained in:
Akim Demaille
2001-12-30 21:05:12 +00:00
parent 9b3add5beb
commit 1239777d4f
15 changed files with 168 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/output.c
View File

@@ -101,7 +101,7 @@
#include "symtab.h"
#include "conflicts.h"
#include "muscle_tab.h"
#include "skeleton.h"
static int nvectors;
static int nentries;
@@ -961,111 +961,12 @@ output_actions (void)
}
/*------------------------------------------------------------.
| Copy the parser code from SKEL_FILENAME into OOUT obstack. |
| and do the muscle substitution. |
`------------------------------------------------------------*/
/*---------------------------.
| Call the skeleton parser. |
`---------------------------*/
static void
output_parser (const char *skel_filename, FILE *out)
{
int c;
FILE *fskel;
size_t output_line;
size_t skeleton_line;
fskel = xfopen (skel_filename, "r");
/* New output code. */
output_line = 1;
skeleton_line = 1;
c = getc (fskel);
while (c != EOF)
{
if (c != '%')
{
if (c == '\n')
{
++output_line;
++skeleton_line;
}
putc (c, out);
c = getc (fskel);
}
else if ((c = getc (fskel)) == '%')
{
/* Read the muscle. */
const char *muscle_key = 0;
const char *muscle_value = 0;
while (isalnum (c = getc (fskel)) || c == '-')
obstack_1grow (&muscle_obstack, c);
obstack_1grow (&muscle_obstack, 0);
/* Output the right value, or see if it's something special. */
muscle_key = obstack_finish (&muscle_obstack);
muscle_value = muscle_find (muscle_key);
if (!strcmp (muscle_key, "actions"))
actions_output (out, &output_line);
else if (!strcmp (muscle_key, "guards"))
guards_output (out, &output_line);
else if (!strcmp (muscle_key, "line"))
fprintf (out, "%d", output_line);
else if (!strcmp (muscle_key, "tokendef"))
token_definitions_output (out, &output_line);
else if (!strcmp (muscle_key, "skeleton-line"))
fprintf (out, "%d", skeleton_line);
else if (muscle_value)
{
fputs (muscle_value, out);
output_line += get_lines_number (muscle_value);
}
else
{
fputs ("%%", out);
fputs (muscle_key, out);
}
}
else
putc ('%', out);
}
/* End. */
xfclose (fskel);
}
/*----------------------------------------.
| Prepare the master parser to be output |
`----------------------------------------*/
static void
output_master_parser (void)
{
FILE *parser = xfopen (parser_file_name, "w");
/* FIXME: Remove the two following lines. */
printf ("Test: %s\n", infile);
printf ("Test: %s\n", parser_file_name);
if (!skeleton)
{
if (semantic_parser)
skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY);
else
skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
}
muscle_insert ("skeleton", skeleton);
muscle_insert ("parser-file-name", parser_file_name);
output_parser (skeleton, parser);
xfclose (parser);
}
/* Call the skeleton parser. */
static
void
output_skeleton ()
output_skeleton (void)
{
/* Find the right skeleton file. */
if (!skeleton)
@@ -1078,7 +979,7 @@ output_skeleton ()
/* Parse the skeleton file and output the needed parsers. */
muscle_insert ("skeleton", skeleton);
process_skeleton (infile, skeleton);
process_skeleton (skeleton);
}
static void
@@ -1190,10 +1091,6 @@ output (void)
/* Process the selected skeleton file. */
output_skeleton ();
/* Output the parser. */
#if 0
output_master_parser ();
#endif
/* Output the header if needed. */
if (defines_flag)
header_output ();

8
src/output.h
View File

@@ -1,5 +1,5 @@
/* Output the generated parsing program for bison,
Copyright 2000 Free Software Foundation, Inc.
Copyright 2000, 2001 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -26,6 +26,12 @@ extern int error_verbose;
/* Output the parsing tables and the parser code to FTABLE. */
void output PARAMS ((void));
size_t get_lines_number PARAMS ((const char *s));
void actions_output PARAMS ((FILE *out, size_t *line));
void guards_output PARAMS ((FILE *out, size_t *line));
void token_definitions_output PARAMS ((FILE *out, size_t *line));
extern struct obstack muscle_obstack;
#endif /* !OUTPUT_H_ */

72
src/parse-skel.y
View File

@@ -1,14 +1,36 @@
%{
/* -*- C -*- */
/* Parse Bison Skeletons.
Copyright (C) 2001 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
Bison is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
Bison is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with Bison; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
%debug
%defines
%error-verbose
%{
#include "system.h"
#include "obstack.h"
#include "files.h"
#include "output.h"
#include "skeleton.h"
#include "muscle_tab.h"
#define YYDEBUG 1
#define YYERROR_VERBOSE 1
extern FILE* yyin;
extern int yylineno;
@@ -18,7 +40,8 @@ FILE* parser = NULL;
size_t output_line;
size_t skeleton_line;
extern struct obstack muscle_obstack;
static int merror PARAMS ((const char* error));
static int yyerror PARAMS ((const char* error));
%}
@@ -30,9 +53,9 @@ extern struct obstack muscle_obstack;
int yacc;
}
%token< muscle > MUSCLE
%token< string > STRING
%token< character > CHARACTER
%token <muscle> MUSCLE
%token <string> STRING
%token <character> CHARACTER
%token LINE
%token SLINE
@@ -44,7 +67,7 @@ extern struct obstack muscle_obstack;
%token TOKENS
%token ACTIONS
%type< yacc > section.yacc
%type <yacc> section.yacc
%start skeleton
@@ -59,9 +82,9 @@ section : section.header section.body { }
section.header : SECTION gb MUSCLE gb STRING gb section.yacc gb '\n'
{
char* name = 0;
char* limit = 0;
char* suffix = $5;
char *name = 0;
char *limit = 0;
char *suffix = $5;
/* Close the previous parser. */
if (parser)
@@ -70,7 +93,7 @@ section.header : SECTION gb MUSCLE gb STRING gb section.yacc gb '\n'
/* If the following section should be named with the yacc-style, and it's
suffix is of the form 'something.h' or 'something.c', then add '.tab' in
the middle of the suffix. */
if (tab_extension && $7 && (strsuffix (suffix, ".h") ||
if (tab_extension && $7 && (strsuffix (suffix, ".h") ||
strsuffix (suffix, ".c")))
{
size_t prefix_len = strlen (prefix);
@@ -93,7 +116,7 @@ section.header : SECTION gb MUSCLE gb STRING gb section.yacc gb '\n'
}
else
name = stringappend (prefix, suffix);
/* Prepare the next parser to be output. */
parser = xfopen (name, "w");
MUSCLE_INSERT_STRING ("parser-file-name", name);
@@ -107,7 +130,7 @@ section.yacc : /* Empty. */ { $$ = 0; }
| YACC { $$ = 1; }
;
section.body
section.body
: /* Empty. */ { }
| section.body '\n' { fputc ('\n', parser); ++output_line; ++skeleton_line; }
| section.body LINE { fprintf (parser, "%d", output_line); }
@@ -116,7 +139,7 @@ section.body
| section.body TOKENS { token_definitions_output (parser, &output_line); }
| section.body ACTIONS { actions_output (parser, &output_line); }
| section.body CHARACTER { fputc ($2, parser); }
| section.body MUSCLE {
| section.body MUSCLE {
const char* value = muscle_find ($2);
if (value)
{
@@ -137,26 +160,23 @@ gb : /* Empty. */ { }
%%
int
static int
merror (const char* error)
{
printf ("line %d: %%{%s} undeclared.\n", skeleton_line, error);
return 0;
}
int
static int
yyerror (const char* error)
{
printf ("line %d: %s.\n", yylineno, error);
fprintf (stderr, "%s\n", error);
return 0;
}
int
process_skeleton (const char* grammar,
const char* skeleton)
void
process_skeleton (const char* skel)
{
const char* limit = 0;
/* Compute prefix. Actually, it seems that the processing I need here is
done in compute_base_names, and the result stored in short_base_name. */
prefix = short_base_name;
@@ -166,7 +186,7 @@ process_skeleton (const char* grammar,
skeleton_line = 1;
/* Output. */
yyin = fopen (skeleton, "r");
yyin = fopen (skel, "r");
yydebug = 0;
yyparse ();

34
src/scan-skel.l
View File

@@ -1,15 +1,41 @@
/* -*- C -*- */
/* Scan Bison Skeletons.
Copyright (C) 2001 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
Bison is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
Bison is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with Bison; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
%{
#include <stdlib.h>
#include <string.h>
#include "system.h"
#include "skeleton.h"
#include "parse-skel.h"
%}
%option nounput
%option noyywrap
%option yylineno
/* If we enable
%option yylineno
Then we have warning: `yy_flex_realloc' defined but not used.
Seems like a Flex bug to me: Why the heck yylineno would trigger
the REJECT exception??? */
%%

32
src/skeleton.h Normal file
View File

@@ -0,0 +1,32 @@
/* Parse Bison Skeletons.
Copyright (C) 2001 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
Bison is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
Bison is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with Bison; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
#ifndef SKELETON_H_
# define SKELETON_H_
/* From parse-skel.y. */
void process_skeleton PARAMS ((const char* skel));
/* From scan-skel.l. */
# define YY_DECL \
int yylex PARAMS ((void))
YY_DECL;
#endif SKELETON_H_