Fix additional typos in comments within lemon. Ticket #3215. (CVS 5405)
FossilOrigin-Name: 372147699585ca4bd11100983de924f63c5cfce5
This commit is contained in:
drh
parent
b5bd49e9cb
commit
34ff57b12f
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
||||
C Fix\sa\sbug\sin\sthe\s#line\sgenerator\sof\slemon.\sTicket\s#3214.\s(CVS\s5404)
|
||||
D 2008-07-14T12:21:08
|
||||
C Fix\sadditional\stypos\sin\scomments\swithin\slemon.\s\sTicket\s#3215.\s(CVS\s5405)
|
||||
D 2008-07-14T12:27:52
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -583,8 +583,8 @@ F test/where6.test 42c4373595f4409d9c6a9987b4a60000ad664faf
|
||||
F test/zeroblob.test 792124852ec61458a2eb527b5091791215e0be95
|
||||
F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
|
||||
F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
|
||||
F tool/lemon.c e307368d18e0edab70d6a6f377def2df0fb17da1
|
||||
F tool/lempar.c aab54f1758c554e550ff5c4b191053a819279a2b
|
||||
F tool/lemon.c 13e9c37ab9e0cc182cc10b93ac0e5270bbf472c8
|
||||
F tool/lempar.c 1a2caec816704bce9ebefeb4b46f54d6b2f8970e
|
||||
F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
|
||||
F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
|
||||
F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
|
||||
@ -605,7 +605,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P d618a883304d5a84540daf5e3397de677786aff8
|
||||
R d246c1c43f9887c2d7543ad7eeb3272b
|
||||
P dc697c26668929c4eed5ab8cde6975125a7e66c7
|
||||
R 1732e578d6bf76381bd12e8772b890d1
|
||||
U drh
|
||||
Z e65f4d0ffa1fb542437cde4899bed914
|
||||
Z 5e2dbbb9892e14a4a7c834028e8bd672
|
||||
|
||||
@ -1 +1 @@
|
||||
dc697c26668929c4eed5ab8cde6975125a7e66c7
|
||||
372147699585ca4bd11100983de924f63c5cfce5
|
||||
14
tool/lemon.c
14
tool/lemon.c
@ -128,7 +128,7 @@ struct symbol {
|
||||
RIGHT,
|
||||
NONE,
|
||||
UNK
|
||||
} assoc; /* Associativity if predecence is defined */
|
||||
} assoc; /* Associativity if precedence is defined */
|
||||
char *firstset; /* First-set for all rules of this symbol */
|
||||
Boolean lambda; /* True if NT and can generate an empty string */
|
||||
int useCnt; /* Number of times used */
|
||||
@ -212,7 +212,7 @@ struct action {
|
||||
struct state {
|
||||
struct config *bp; /* The basis configurations for this state */
|
||||
struct config *cfp; /* All configurations in this set */
|
||||
int statenum; /* Sequencial number for this state */
|
||||
int statenum; /* Sequential number for this state */
|
||||
struct action *ap; /* Array of actions for this state */
|
||||
int nTknAct, nNtAct; /* Number of actions on terminals and nonterminals */
|
||||
int iTknOfst, iNtOfst; /* yy_action[] offset for terminals and nonterms */
|
||||
@ -263,7 +263,7 @@ struct lemon {
|
||||
int nconflict; /* Number of parsing conflicts */
|
||||
int tablesize; /* Size of the parse tables */
|
||||
int basisflag; /* Print only basis configurations */
|
||||
int has_fallback; /* True if any %fallback is seen in the grammer */
|
||||
int has_fallback; /* True if any %fallback is seen in the grammar */
|
||||
char *argv0; /* Name of the program */
|
||||
};
|
||||
|
||||
@ -986,7 +986,7 @@ struct lemon *lemp;
|
||||
}
|
||||
|
||||
/* Resolve a conflict between the two given actions. If the
|
||||
** conflict can't be resolve, return non-zero.
|
||||
** conflict can't be resolved, return non-zero.
|
||||
**
|
||||
** NO LONGER TRUE:
|
||||
** To resolve a conflict, first look to see if either action
|
||||
@ -1997,7 +1997,7 @@ struct pstate *psp;
|
||||
}else if( x[0]=='{' ){
|
||||
if( psp->prevrule==0 ){
|
||||
ErrorMsg(psp->filename,psp->tokenlineno,
|
||||
"There is not prior rule opon which to attach the code \
|
||||
"There is no prior rule opon which to attach the code \
|
||||
fragment which begins on this line.");
|
||||
psp->errorcnt++;
|
||||
}else if( psp->prevrule->code!=0 ){
|
||||
@ -2424,7 +2424,7 @@ to follow the previous rule.");
|
||||
}
|
||||
}
|
||||
|
||||
/* Run the proprocessor over the input file text. The global variables
|
||||
/* Run the preprocessor over the input file text. The global variables
|
||||
** azDefine[0] through azDefine[nDefine-1] contains the names of all defined
|
||||
** macros. This routine looks for "%ifdef" and "%ifndef" and "%endif" and
|
||||
** comments them out. Text in between is also commented out as appropriate.
|
||||
@ -3828,7 +3828,7 @@ int mhflag; /* Output in makeheaders format if true */
|
||||
tplt_xfer(lemp->name,in,out,&lineno);
|
||||
|
||||
/* Generate a table containing a text string that describes every
|
||||
** rule in the rule set of the grammer. This information is used
|
||||
** rule in the rule set of the grammar. This information is used
|
||||
** when tracing REDUCE actions.
|
||||
*/
|
||||
for(i=0, rp=lemp->rule; rp; rp=rp->next, i++){
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/* Driver template for the LEMON parser generator.
|
||||
** The author disclaims copyright to this source code.
|
||||
*/
|
||||
/* First off, code is include which follows the "include" declaration
|
||||
** in the input file. */
|
||||
/* First off, code is included that follows the "include" declaration
|
||||
** in the input grammar file. */
|
||||
#include <stdio.h>
|
||||
%%
|
||||
/* Next is all token values, in a form suitable for use by makeheaders.
|
||||
@ -64,7 +64,7 @@
|
||||
** YYMINORTYPE objects to zero. */
|
||||
static const YYMINORTYPE yyzerominor;
|
||||
|
||||
/* Next are that tables used to determine what action to take based on the
|
||||
/* Next are the tables used to determine what action to take based on the
|
||||
** current state and lookahead token. These tables are used to implement
|
||||
** functions that take a state number and lookahead value and return an
|
||||
** action integer.
|
||||
@ -119,7 +119,7 @@ static const YYMINORTYPE yyzerominor;
|
||||
**
|
||||
** %fallback ID X Y Z.
|
||||
**
|
||||
** appears in the grammer, then ID becomes a fallback token for X, Y,
|
||||
** appears in the grammar, then ID becomes a fallback token for X, Y,
|
||||
** and Z. Whenever one of the tokens X, Y, or Z is input to the parser
|
||||
** but it does not parse, the type of the token is changed to ID and
|
||||
** the parse is retried before an error is thrown.
|
||||
@ -451,7 +451,7 @@ static void yy_shift(
|
||||
yyParser *yypParser, /* The parser to be shifted */
|
||||
int yyNewState, /* The new state to shift in */
|
||||
int yyMajor, /* The major token to shift in */
|
||||
YYMINORTYPE *yypMinor /* Pointer ot the minor token to shift in */
|
||||
YYMINORTYPE *yypMinor /* Pointer to the minor token to shift in */
|
||||
){
|
||||
yyStackEntry *yytos;
|
||||
yypParser->yyidx++;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user