Commit 7168a188 authored by unknown's avatar unknown

Cleanups for reserved words table.


Docs/Support/update-reserved-words.pl:
  Fill last row to full # of columns in reserved words table.
Docs/manual.texi:
  Regenerated reserved words table (also removed trailing spaces).
parent cb99222d
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
# 2001-11-20 Fixups by arjen@mysql.com, 2 keywords and 15 synonyms were missing # 2001-11-20 Fixups by arjen@mysql.com, 2 keywords and 15 synonyms were missing
# 2001-12-07 Fixup by arjen@mysql.com, add column headings for multitable. # 2001-12-07 Fixup by arjen@mysql.com, add column headings for multitable.
# 2002-05-01 Fixup by arjen@mysql.com, use 3 columns instead of 4. # 2002-05-01 Fixup by arjen@mysql.com, use 3 columns instead of 4.
# 2002-05-03 Fixup by arjen@mysql.com, fill last row to full # of columns.
print STDERR "Scanning lex.h for symbols..\n"; print STDERR "Scanning lex.h for symbols..\n";
open LEX, "<../sql/lex.h"; open LEX, "<../sql/lex.h";
...@@ -28,11 +29,6 @@ while(($line = <YACC>) =~ /[\s|]+([A-Z_]+)/) { ...@@ -28,11 +29,6 @@ while(($line = <YACC>) =~ /[\s|]+([A-Z_]+)/) {
close YACC; close YACC;
$list = sprintf("\@c Reserved word list updated %s by %s.\n".
"\@c To regenerate, use Support/update-reserved-words.pl.\n\n",
&pretty_date, $ENV{USER});
print STDERR "Copying reserved words to an array...\n"; print STDERR "Copying reserved words to an array...\n";
foreach(keys %words) { push @words, $words{$_}; }; foreach(keys %words) { push @words, $words{$_}; };
...@@ -42,11 +38,15 @@ print STDERR "Sorting array...\n"; ...@@ -42,11 +38,15 @@ print STDERR "Sorting array...\n";
printf STDERR "There are %i reserved words.\n", scalar @words; printf STDERR "There are %i reserved words.\n", scalar @words;
@pre = ("\@item", " \@tab", " \@tab"); @pre = ("\@item", " \@tab", " \@tab");
@post = ("\n", "\n", "\n");
$list = "";
for($i=0; $word = shift(@words); $i++) { for($i=0; $word = shift(@words); $i++) {
$list .= sprintf "%s %-30s %s", $pre[$i%3], "\@code\{$word\}", $post[$i%3]; $list .= sprintf "%s %s\n", $pre[$i%3], "\@code\{$word\}";
}; $list .= "\n"; }
# Fill last row to full # of columns.
for( ; $i%3; $i++) {
$list .= sprintf "%s\n", $pre[$i%3];
}
open OLD, "<manual.texi"; open OLD, "<manual.texi";
open NEW, ">manual-tmp.texi"; open NEW, ">manual-tmp.texi";
...@@ -54,10 +54,14 @@ open NEW, ">manual-tmp.texi"; ...@@ -54,10 +54,14 @@ open NEW, ">manual-tmp.texi";
print STDERR "Copying beginning of manual.texi...\n"; print STDERR "Copying beginning of manual.texi...\n";
while(($line = <OLD>) !~ /START_OF_RESERVED_WORDS/) { print NEW $line; }; while(($line = <OLD>) !~ /START_OF_RESERVED_WORDS/) { print NEW $line; };
print NEW "\@c START_OF_RESERVED_WORDS\n\n"; print NEW "\@c START_OF_RESERVED_WORDS\n\n";
printf NEW "\@c Reserved word list updated %s by %s.\n".
"\@c To regenerate, use Support/update-reserved-words.pl.\n\n",
&pretty_date, $ENV{USER};
print STDERR "Inserting list of reserved words...\n"; print STDERR "Inserting list of reserved words...\n";
# Ensure the fractions add up to 100% otherwise it looks funny in print: # Ensure the fractions add up to 100% otherwise it looks funny in print:
print NEW "\@multitable \@columnfractions .33 .33 .34\n"; print NEW "\@multitable \@columnfractions .33 .33 .34\n";
print NEW "\@item \@strong{Word} \@tab \@strong{Word} \@tab \@strong{Word}\n"; print NEW "\@item \@strong{Word}\n \@tab \@strong{Word}\n \@tab \@strong{Word}\n";
print NEW $list; print NEW $list;
print NEW "\@end multitable\n"; print NEW "\@end multitable\n";
print STDERR "Skipping over old list...\n"; print STDERR "Skipping over old list...\n";
......
...@@ -28247,11 +28247,13 @@ A few are reserved because MySQL needs them and is ...@@ -28247,11 +28247,13 @@ A few are reserved because MySQL needs them and is
@c START_OF_RESERVED_WORDS @c START_OF_RESERVED_WORDS
@multitable @columnfractions .33 .33 .34 @c Reserved word list updated Fri May 3 08:41:00 2002 by arjen.
@item @strong{Word} @tab @strong{Word} @tab @strong{Word}
@c Reserved word list updated Wed May 1 10:50:08 2002 by arjen.
@c To regenerate, use Support/update-reserved-words.pl. @c To regenerate, use Support/update-reserved-words.pl.
@multitable @columnfractions .33 .33 .34
@item @strong{Word}
@tab @strong{Word}
@tab @strong{Word}
@item @code{ADD} @item @code{ADD}
@tab @code{ALL} @tab @code{ALL}
@tab @code{ALTER} @tab @code{ALTER}
...@@ -28436,7 +28438,8 @@ A few are reserved because MySQL needs them and is ...@@ -28436,7 +28438,8 @@ A few are reserved because MySQL needs them and is
@tab @code{WRITE} @tab @code{WRITE}
@tab @code{YEAR_MONTH} @tab @code{YEAR_MONTH}
@item @code{ZEROFILL} @item @code{ZEROFILL}
@tab
@tab
@end multitable @end multitable
@c END_OF_RESERVED_WORDS @c END_OF_RESERVED_WORDS
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment