From cbdb6d9145df09f406f2bf6525e4c97e3f9ae608 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 5 Jun 2012 09:02:36 +0200 Subject: [PATCH] maint: fix comment typos Using http://github.com/lyda/misspell-check, massage its output into sed commands to perform the suggested changes. Initially, I filtered out the THRU->Through changes, because that failed to retain capitalization in the grammar token. Instead, do this manually, beforehand: sed -i s/THRU/THROUGH/ tests/existing.at git ls-files|misspellings -f -|perl -nl \ -e '/^(.*?)\[(\d+)\]: (\w+) -> "(.*?)"$/ or next;' \ -e '($file,$n,$l,$r)=($1,$2,$3,$4); $q="'\''"; $r=~s/$q/$q\\$q$q/g;'\ -e 'print "sed -i $q${n}s!$l!$r!$q $file"'|bash --- ChangeLog-2012 | 12 ++++++------ data/yacc.c | 2 +- djgpp/README.in | 2 +- djgpp/config.bat | 2 +- doc/Doxyfile.in | 2 +- src/parse-gram.c | 2 +- tests/existing.at | 6 +++--- tests/local.at | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog-2012 b/ChangeLog-2012 index b341b11c..789e7605 100644 --- a/ChangeLog-2012 +++ b/ChangeLog-2012 @@ -8196,7 +8196,7 @@ (PERCENT_LEX_PARAM, PERCENT_PARSE_PARAM): Remove the {...} part, which is now, again, a separate token. Adjust all dependencies. - Whereever actions with $ and @ are used, use translate_code. + Wherever actions with $ and @ are used, use translate_code. (action): Remove this nonterminal which is now useless. * src/reader.c: Include assert.h, scan-gram.h and scan-code.h. (grammar_current_rule_action_append): Use translate_code. @@ -9382,10 +9382,10 @@ * Makefile.am: DJGPP specific files added to EXTRA_DIST. * djgpp/Makefile.maint: Fix PACKAGE variable computation. - * djgpp/config.bat: Replace every occurence of the file name + * djgpp/config.bat: Replace every occurrence of the file name scan-gram-c.c with c-scan-gram.c. The same for scan-skel-c.c with c-scan-skel.c to conform with the 8.3 file name restriction on MSDOS. - * djgpp/config.sed: Replace every occurence of the file name + * djgpp/config.sed: Replace every occurrence of the file name scan-gram-c.c with c-scan-gram.c. The same for scan-skel-c.c with c-scan-skel.c to conform with the 8.3 file name restriction on MSDOS. * djgpp/djunpack.bat: DJGPP specific file. @@ -12658,7 +12658,7 @@ (YYERROR): Goto to yyerrorlab, not yyerrlab1. (yyerrlab1): Remove, but where it used to be (now the bottom part of yyerrlab), when hitting EOF, pop the whole stack here instead of - merely falling thru the default error handling mechanism. + merely falling through the default error handling mechanism. (yyerrorlab): New label, with the old contents of YYERROR, plus the following change: pop the stack of rhs corresponding to the production that invoked YYERROR. That is how Yacc @@ -16380,7 +16380,7 @@ 2002-07-30 Akim Demaille - `stage' was accidently included in a previous patch. + `stage' was accidentally included in a previous patch. Initiate its autoconfiscation. * configure.in: Look for malloc.h and sys/times.h. @@ -19383,7 +19383,7 @@ (insert_accepting_state, augment_automaton): Remove, since now these states are automatically computed from the initial state. (generate_states): Adjust. - * src/print.c: When reporting a rule number to the user, substract + * src/print.c: When reporting a rule number to the user, subtract 1, so that the axiom rule is rule 0, and the first user rule is 1. * src/reduce.c: Likewise. * src/print_graph.c (print_core): For the time being, just as for diff --git a/data/yacc.c b/data/yacc.c index 19fd3011..dbaff877 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -197,7 +197,7 @@ m4_define([b4_declare_parser_state_variables], [b4_pure_if([[ `yyvs': related to semantic values.]b4_locations_if([[ `yyls': related to locations.]])[ - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ diff --git a/djgpp/README.in b/djgpp/README.in index 154c8a29..60fd952a 100644 --- a/djgpp/README.in +++ b/djgpp/README.in @@ -179,7 +179,7 @@ along with this program. If not, see . This will install the products into your DJGPP installation tree given by the default prefix "/dev/env/DJDIR". If you prefer to install them - into some other directory you will have to set prefix to the appropiate + into some other directory you will have to set prefix to the appropriate value: make install prefix=z:/some/other/place diff --git a/djgpp/config.bat b/djgpp/config.bat index e30c939f..ab566d70 100644 --- a/djgpp/config.bat +++ b/djgpp/config.bat @@ -471,7 +471,7 @@ redir -e /dev/null rm %XSRC%/po/stamp-cat-id Rem Update the arguments file for the configure script. Rem We prefer without-included-gettext because libintl.a from gettext package -Rem is the only one that is garanteed to have been ported to DJGPP. +Rem is the only one that is guaranteed to have been ported to DJGPP. echo --enable-nls --without-included-gettext >> args goto ConfigurePackage diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 3d2ea64e..b5557518 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -982,7 +982,7 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similiar to the OMG's Unified Modeling +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO diff --git a/src/parse-gram.c b/src/parse-gram.c index 989c91c2..c5bf878c 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1925,7 +1925,7 @@ YYLTYPE yylloc; `yyvs': related to semantic values. `yyls': related to locations. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ diff --git a/tests/existing.at b/tests/existing.at index a34f9238..582f6b3d 100644 --- a/tests/existing.at +++ b/tests/existing.at @@ -1478,7 +1478,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]], %token RAND %token SRAND %token COPY -%token THRU +%token THROUGH %token TOP %token BOTTOM %token UPPER @@ -1604,12 +1604,12 @@ placeless_element: {} DELIMITED | COPY TEXT - | COPY TEXT THRU + | COPY TEXT THROUGH {} DELIMITED {} until - | COPY THRU + | COPY THROUGH {} DELIMITED {} diff --git a/tests/local.at b/tests/local.at index 65e528f9..54ac833d 100644 --- a/tests/local.at +++ b/tests/local.at @@ -619,7 +619,7 @@ main (void) # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before # expanding macros, so it corrupts some special characters in the # macros. To avoid this, expand now and pass it the result with proper -# string quotation. Assume args 7 thru 12 expand to properly quoted +# string quotation. Assume args 7 through 12 expand to properly quoted # strings. m4_if(m4_index(m4_quote($3), [no-xml]), -1, -- 2.45.2