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

Back out previous patch.

Browse Source
This commit is contained in:
Joel E. Denny
2007-01-18 08:32:33 +00:00
parent d4bdb91677
commit 5f340b4884
8 changed files with 32 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@@ -1,27 +1,3 @@
2007-01-18 Joel E. Denny <jdenny@ces.clemson.edu>
Implement @gettext<...@> directive to call gettext from skeletons. It
can be used anywhere including inside arguments of directives of the
form @foo(...@). Eventually, it should be possible to write an
xgettext-like utility to extract @gettext<...@> text from skeletons.
* data/bison.m4 (b4_check_user_names): Use @gettext<...@> when invoking
b4_warn_at since b4_warn_at doesn't invoke gettext anymore.
* data/glr.cc, data/lalr1.cc: Likewise but for b4_fatal and
b4_complain reporting a push-parsing request or a missing %defines.
* src/scan-skel.l (INITIAL): Recognize `@gettext<' to start...
(SC_AT_GETTEXT_ARG): ... this new start condition where gettext is
invoked.
(SC_AT_DIRECTIVE_ARG): Rename to...
(SC_AT_DIRECTIVE_ARGS): ... this, and recognize `@gettext<' to start
SC_AT_GETTEXT_ARG.
(at_directive_perform): Don't invoke gettext for @warn(...@),
@warn_at(...@), etc. Instead, let the skeletons decide what should be
passed to @gettext<...@>.
* tests/skeletons.at (@gettext<...@>): New test case.
* tests/skeletons.at (installed skeleton file name): Rename to...
(installed skeleton file names): ... this.
2007-01-17 Joel E. Denny <jdenny@ces.clemson.edu> 2007-01-17 Joel E. Denny <jdenny@ces.clemson.edu>
Implement support for relative and absolute skeleton file names. Implement support for relative and absolute skeleton file names.

2
data/bison.m4
View File

@@ -328,7 +328,7 @@ m4_pushdef([b4_start], m4_car(m4_shift(b4_occurrence)))dnl
m4_pushdef([b4_end], m4_shift(m4_shift(b4_occurrence)))dnl m4_pushdef([b4_end], m4_shift(m4_shift(b4_occurrence)))dnl
m4_ifndef($3[(]m4_quote(b4_user_name)[)], m4_ifndef($3[(]m4_quote(b4_user_name)[)],
[b4_warn_at([b4_start], [b4_end], [b4_warn_at([b4_start], [b4_end],
[[@gettext<%s `%s' is not used@>]], [[%s `%s' is not used]],
[$1], [b4_user_name])])[]dnl [$1], [b4_user_name])])[]dnl
m4_popdef([b4_occurrence])dnl m4_popdef([b4_occurrence])dnl
m4_popdef([b4_user_name])dnl m4_popdef([b4_user_name])dnl

2
data/c++-skel.m4
View File

@@ -21,7 +21,7 @@
b4_glr_if( [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])]) b4_glr_if( [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])]) b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
b4_push_if([b4_complain([[@gettext<C++ push parsers are not supported@>]])]) b4_push_if([b4_complain([[C++ push parsers are not supported]])])
m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]]) m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]])
m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])

2
data/glr.c
View File

@@ -23,7 +23,7 @@
m4_include(b4_pkgdatadir/[c.m4]) m4_include(b4_pkgdatadir/[c.m4])
b4_push_if([ b4_push_if([
b4_complain([[@gettext<non-deterministic push parsers are not yet supported@>]])]) b4_complain([[non-deterministic push parsers are not yet supported]])])
## ---------------- ## ## ---------------- ##
## Default values. ## ## Default values. ##

2
data/glr.cc
View File

@@ -53,7 +53,7 @@ m4_define([b4_pure_flag], [1])
# The header is mandatory. # The header is mandatory.
b4_defines_if([], b4_defines_if([],
[b4_fatal([b4_skeleton[: @gettext<using %%defines is mandatory@>]])]) [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
m4_include(b4_pkgdatadir/[c++.m4]) m4_include(b4_pkgdatadir/[c++.m4])
m4_include(b4_pkgdatadir/[location.cc]) m4_include(b4_pkgdatadir/[location.cc])

2
data/lalr1.cc
View File

@@ -27,7 +27,7 @@ m4_define([b4_namespace],
# The header is mandatory. # The header is mandatory.
b4_defines_if([], b4_defines_if([],
[b4_fatal([b4_skeleton[: @gettext<using %%defines is mandatory@>]])]) [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
# Backward compatibility. # Backward compatibility.
m4_define([b4_location_constructors]) m4_define([b4_location_constructors])

88
src/scan-skel.l
View File

@@ -53,7 +53,7 @@ static void fail_for_at_directive_too_few_args (void);
static void fail_for_invalid_at (char const *at); static void fail_for_invalid_at (char const *at);
/* In SC_AT_DIRECTIVE_ARG context, the name of the directive. */ /* In SC_AT_DIRECTIVE_ARG context, the name of the directive. */
static char *at_directive_name = NULL; static char *at_directive_name;
/* Currently, only the @warn, @complain, @fatal, @warn_at, @complain_at, and /* Currently, only the @warn, @complain, @fatal, @warn_at, @complain_at, and
@fatal_at directives take multiple arguments, and the last three already @fatal_at directives take multiple arguments, and the last three already
@@ -63,8 +63,7 @@ static int at_directive_argc = 0;
static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX]; static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
%} %}
%x SC_AT_GETTEXT_ARG %x SC_AT_DIRECTIVE_ARG
%x SC_AT_DIRECTIVE_ARGS
%x SC_AT_DIRECTIVE_SKIP_WS %x SC_AT_DIRECTIVE_SKIP_WS
%% %%
@@ -82,16 +81,14 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
"@ofile@" QPUTS (outname); "@ofile@" QPUTS (outname);
"@dir_prefix@" QPUTS (dir_prefix); "@dir_prefix@" QPUTS (dir_prefix);
"@gettext<" BEGIN SC_AT_GETTEXT_ARG;
@[a-z_]+"(" { @[a-z_]+"(" {
yytext[yyleng-1] = '\0'; yytext[yyleng-1] = '\0';
at_directive_name = xstrdup (yytext); at_directive_name = xstrdup (yytext);
BEGIN SC_AT_DIRECTIVE_ARGS; BEGIN SC_AT_DIRECTIVE_ARG;
} }
/* This pattern must not match more than the previous @ patterns. */ /* This pattern must not match more than the previous @ patterns. */
@[^<@{}(\n]* fail_for_invalid_at (yytext); @[^@{}(\n]* fail_for_invalid_at (yytext);
\n out_lineno++; ECHO; \n out_lineno++; ECHO;
[^@\n]+ ECHO; [^@\n]+ ECHO;
@@ -104,48 +101,15 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
return EOF; return EOF;
} }
<SC_AT_GETTEXT_ARG>{ <SC_AT_DIRECTIVE_ARG>{
"@>" { [^@]+ { STRING_GROW; }
char *arg;
obstack_1grow (&obstack_for_string, '\0');
arg = obstack_finish (&obstack_for_string);
if (!at_directive_name)
{
fprintf (yyout, "%s", _(arg));
obstack_free (&obstack_for_string, arg);
BEGIN INITIAL;
}
else
{
char const *translated = _(arg);
size_t parent_size = strlen (at_directive_argv[at_directive_argc]);
size_t translated_size = strlen (translated);
char *copy = xmalloc (parent_size + translated_size + 1);
strcpy (copy, at_directive_argv[at_directive_argc]);
strcpy (copy + parent_size, translated);
obstack_free (&obstack_for_string,
at_directive_argv[at_directive_argc]);
obstack_grow (&obstack_for_string, copy,
parent_size + translated_size);
free (copy);
BEGIN SC_AT_DIRECTIVE_ARGS;
}
}
}
<SC_AT_DIRECTIVE_ARGS>{ "@@" { obstack_1grow (&obstack_for_string, '@'); }
"@{" { obstack_1grow (&obstack_for_string, '['); }
"@}" { obstack_1grow (&obstack_for_string, ']'); }
"@`" /* Emtpy. Useful for starting an argument "@`" /* Emtpy. Useful for starting an argument
that begins with whitespace. */ that begins with whitespace. */
"@gettext<" {
if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
fail_for_at_directive_too_many_args ();
obstack_1grow (&obstack_for_string, '\0');
at_directive_argv[at_directive_argc] =
obstack_finish (&obstack_for_string);
BEGIN SC_AT_GETTEXT_ARG;
}
@[,)] { @[,)] {
if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX) if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
fail_for_at_directive_too_many_args (); fail_for_at_directive_too_many_args ();
@@ -163,29 +127,21 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
obstack_free (&obstack_for_string, at_directive_argv[0]); obstack_free (&obstack_for_string, at_directive_argv[0]);
at_directive_argc = 0; at_directive_argc = 0;
free (at_directive_name); free (at_directive_name);
at_directive_name = NULL;
BEGIN INITIAL; BEGIN INITIAL;
} }
} }
}
<SC_AT_GETTEXT_ARG,SC_AT_DIRECTIVE_ARGS>{
[^@]+ { STRING_GROW; }
"@@" { obstack_1grow (&obstack_for_string, '@'); }
"@{" { obstack_1grow (&obstack_for_string, '['); }
"@}" { obstack_1grow (&obstack_for_string, ']'); }
@.? { fail_for_invalid_at (yytext); } @.? { fail_for_invalid_at (yytext); }
} }
<SC_AT_DIRECTIVE_SKIP_WS>{ <SC_AT_DIRECTIVE_SKIP_WS>{
[ \t\r\n] [ \t\r\n]
. { yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS; } . { yyless (0); BEGIN SC_AT_DIRECTIVE_ARG; }
} }
<SC_AT_GETTEXT_ARG,SC_AT_DIRECTIVE_ARGS,SC_AT_DIRECTIVE_SKIP_WS>{ <SC_AT_DIRECTIVE_ARG,SC_AT_DIRECTIVE_SKIP_WS>{
<<EOF>> { <<EOF>> {
fatal (_("unclosed %s directive in skeleton"), fatal (_("unclosed %s directive in skeleton"), at_directive_name);
at_directive_name ? at_directive_name : "@gettext");
} }
} }
@@ -241,21 +197,21 @@ void at_directive_perform (char **outnamep, int *out_linenop)
switch (at_directive_argc) switch (at_directive_argc)
{ {
case 1: case 1:
func (at_directive_argv[0]); func (_(at_directive_argv[0]));
break; break;
case 2: case 2:
func (at_directive_argv[0], at_directive_argv[1]); func (_(at_directive_argv[0]), at_directive_argv[1]);
break; break;
case 3: case 3:
func (at_directive_argv[0], at_directive_argv[1], func (_(at_directive_argv[0]), at_directive_argv[1],
at_directive_argv[2]); at_directive_argv[2]);
break; break;
case 4: case 4:
func (at_directive_argv[0], at_directive_argv[1], func (_(at_directive_argv[0]), at_directive_argv[1],
at_directive_argv[2], at_directive_argv[3]); at_directive_argv[2], at_directive_argv[3]);
break; break;
case 5: case 5:
func (at_directive_argv[0], at_directive_argv[1], func (_(at_directive_argv[0]), at_directive_argv[1],
at_directive_argv[2], at_directive_argv[3], at_directive_argv[2], at_directive_argv[3],
at_directive_argv[4]); at_directive_argv[4]);
break; break;
@@ -284,21 +240,21 @@ void at_directive_perform (char **outnamep, int *out_linenop)
switch (at_directive_argc) switch (at_directive_argc)
{ {
case 3: case 3:
func (loc, at_directive_argv[2]); func (loc, _(at_directive_argv[2]));
break; break;
case 4: case 4:
func (loc, at_directive_argv[2], at_directive_argv[3]); func (loc, _(at_directive_argv[2]), at_directive_argv[3]);
break; break;
case 5: case 5:
func (loc, at_directive_argv[2], at_directive_argv[3], func (loc, _(at_directive_argv[2]), at_directive_argv[3],
at_directive_argv[4]); at_directive_argv[4]);
break; break;
case 6: case 6:
func (loc, at_directive_argv[2], at_directive_argv[3], func (loc, _(at_directive_argv[2]), at_directive_argv[3],
at_directive_argv[4], at_directive_argv[5]); at_directive_argv[4], at_directive_argv[5]);
break; break;
case 7: case 7:
func (loc, at_directive_argv[2], at_directive_argv[3], func (loc, _(at_directive_argv[2]), at_directive_argv[3],
at_directive_argv[4], at_directive_argv[5], at_directive_argv[4], at_directive_argv[5],
at_directive_argv[6]); at_directive_argv[6]);
break; break;

42
tests/skeletons.at
View File

@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA. # 02110-1301, USA.
AT_BANNER([[Skeleton Support.]]) AT_BANNER([[Skeletons Support.]])
## ------------------------------ ## ## ------------------------------ ##
## relative skeleton file names. ## ## relative skeleton file names. ##
@@ -78,11 +78,11 @@ AT_CHECK([[cat input-cmd-line.tab.c]], [[0]],
AT_CLEANUP AT_CLEANUP
## ------------------------------- ## ## ------------------------------ ##
## installed skeleton file names. ## ## installed skeleton file name. ##
## ------------------------------- ## ## ------------------------------ ##
AT_SETUP([[installed skeleton file names]]) AT_SETUP([[installed skeleton file name]])
m4_pushdef([AT_GRAM], m4_pushdef([AT_GRAM],
[[%{ [[%{
@@ -141,35 +141,3 @@ AT_PARSER_CHECK([[./input-gram]], [[1]], [],
m4_popdef([AT_GRAM]) m4_popdef([AT_GRAM])
AT_CLEANUP AT_CLEANUP
## ---------------- ##
## @gettext<...@>. ##
## ---------------- ##
AT_SETUP([[@gettext<...@>]])
AT_DATA([[skel.c]],
[[m4@&t@_divert_push(0)d@&t@nl
@output(b4_parser_file_name@)d@&t@nl
b4_warn([[@gettext<cannot close file@>]])d@&t@nl
`@gettext<cannot close file@>'
m4@&t@_divert_pop(0)
]])
AT_DATA([[input.y]],
[[%skeleton "./skel.c"
%%
start: ;
]])
AT_CHECK([[LC_ALL= LC_MESSAGES= LANGUAGE=fr LANG=fr_FR bison input.y]], [[0]],
[],
[[input.y: AVERTISSEMENT: ne peut fermer le fichier
]])
AT_CHECK([[cat input.tab.c]], [[0]],
[[`ne peut fermer le fichier'
]])
AT_CLEANUP