BaseTools: Various typo
Various typo in BaseTools. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Coeur <coeur@gmx.fr> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
committed by
Liming Gao
parent
325ad62260
commit
fb0b35e05f
@@ -210,7 +210,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
|
||||
|
||||
Sorcerer generated code may contain many calls to _t->type() in a
|
||||
single statement. This change introduces a temporary variable
|
||||
to eliminate unnnecesary function calls.
|
||||
to eliminate unnecesary function calls.
|
||||
|
||||
Change implemented by Tom Molteno (tim videoscript.com).
|
||||
|
||||
@@ -525,11 +525,11 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
|
||||
#275. (Changed in MR23) Addition of -nopurify option to antlr
|
||||
|
||||
A long time ago the PURIFY macro was introduced to initialize
|
||||
return value arguments and get rid of annying messages from program
|
||||
that checked for unitialized variables.
|
||||
return value arguments and get rid of annoying messages from program
|
||||
that checked for uninitialized variables.
|
||||
|
||||
This has caused significant annoyance for C++ users that had
|
||||
classes with virtual functions or non-trivial contructors because
|
||||
classes with virtual functions or non-trivial constructors because
|
||||
it would zero the object, including the pointer to the virtual
|
||||
function table. This could be defeated by redefining
|
||||
the PURIFY macro to be empty, but it was a constant surprise to
|
||||
@@ -656,12 +656,12 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
|
||||
#266. (Changed in MR23) virtual function printMessage()
|
||||
|
||||
Bill Menees (bill.menees gogallagher.com) has completed the
|
||||
tedious taks of replacing all calls to fprintf() with calls
|
||||
tedious tasks of replacing all calls to fprintf() with calls
|
||||
to the virtual function printMessage(). For classes which
|
||||
have a pointer to the parser it forwards the printMessage()
|
||||
call to the parser's printMessage() routine.
|
||||
|
||||
This should make it significanly easier to redirect pccts
|
||||
This should make it significantly easier to redirect pccts
|
||||
error and warning messages.
|
||||
|
||||
#265. (Changed in MR23) Remove "labase++" in C++ mode
|
||||
@@ -1253,7 +1253,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
|
||||
|
||||
#228. (Changed in MR20) dlg crashes on "()"
|
||||
|
||||
The following token defintion will cause DLG to crash.
|
||||
The following token definition will cause DLG to crash.
|
||||
|
||||
#token "()"
|
||||
|
||||
@@ -1747,7 +1747,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
|
||||
|
||||
#195. (Changed in MR14) #line directive not at column 1
|
||||
|
||||
Under certain circunstances a predicate test could generate
|
||||
Under certain circumstances a predicate test could generate
|
||||
a #line directive which was not at column 1.
|
||||
|
||||
Reported with fix by David K<>gedal (davidk lysator.liu.se)
|
||||
@@ -2319,7 +2319,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
|
||||
#164. (Changed in MR13) Unused variable _astp
|
||||
|
||||
For many compilations, we have lived with warnings about
|
||||
the unused variable _astp. It turns out that this varible
|
||||
the unused variable _astp. It turns out that this variable
|
||||
can *never* be used because the code which references it was
|
||||
commented out.
|
||||
|
||||
|
@@ -690,7 +690,7 @@
|
||||
|
||||
The first line of the makefiles require a definition of PCCTS_HOME.
|
||||
|
||||
These are in additiion to the AntlrMSVC50.* and DlgMSVC50.*
|
||||
These are in addition to the AntlrMSVC50.* and DlgMSVC50.*
|
||||
supplied by Jeff Vincent (JVincent@novell.com).
|
||||
|
||||
#137. (Changed in MR11) Token getType(), getText(), getLine() const members
|
||||
@@ -1681,7 +1681,7 @@
|
||||
the variable [zz]traceOptionValueDefault is set to 0 or 1. When
|
||||
the parser is initialized or [zz]traceReset() is called the
|
||||
value of [zz]traceOptionValueDefault is copied to [zz]traceOptionValue.
|
||||
The value of [zz]traceGuessOptionValue is always initialzed to 1,
|
||||
The value of [zz]traceGuessOptionValue is always initialized to 1,
|
||||
but, as noted earlier, nothing will be reported unless
|
||||
[zz]traceOptionValue is also positive.
|
||||
|
||||
@@ -2028,7 +2028,7 @@
|
||||
|
||||
The syntax of the class statement ("class parser-name {")
|
||||
has been extended to allow for the specification of base
|
||||
classes. An arbirtrary number of tokens may now appear
|
||||
classes. An arbitrary number of tokens may now appear
|
||||
between the class name and the "{". They are output
|
||||
again when the class declaration is generated. For
|
||||
example:
|
||||
@@ -2225,7 +2225,7 @@
|
||||
This is especially important for predicates formed by rules
|
||||
like the following:
|
||||
|
||||
uppperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
|
||||
upperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
|
||||
vowel: : <<isVowel(LATEXT(1))>>? LETTERS;
|
||||
|
||||
These predicates are combined using AND since both must be
|
||||
@@ -2492,7 +2492,7 @@
|
||||
a predicate expression tree. Prior to 1.33MR10 this link was never
|
||||
cleared and the next time the guard was used to construct a new
|
||||
tree the link could contain a spurious reference to another element
|
||||
which had previosly been joined to it in the semantic predicate tree.
|
||||
which had previously been joined to it in the semantic predicate tree.
|
||||
|
||||
For example:
|
||||
|
||||
@@ -2565,7 +2565,7 @@
|
||||
tokens. They may not contain references to (...)+ and
|
||||
(...)* blocks. This is now checked. This replaces the
|
||||
fatal error message in item #78 with an appropriate
|
||||
(non-fatal) error messge.
|
||||
(non-fatal) error message.
|
||||
|
||||
In theory, context guards should be allowed to reference
|
||||
rules. However, I have not had time to fix this.
|
||||
@@ -2581,7 +2581,7 @@
|
||||
correctly when the sets were of unequal sizes. Rewrote
|
||||
set_equ to make it simpler and remove unnecessary and
|
||||
expensive calls to set_deg(). This routine was not used
|
||||
in 1.33 vanila.
|
||||
in 1.33 vanilla.
|
||||
|
||||
#85. (Changed in 1.33MR10) Allow redefinition of MaxNumFiles
|
||||
|
||||
@@ -2617,7 +2617,7 @@
|
||||
|
||||
There were no changes in antlr or dlg output from the revised version.
|
||||
|
||||
The following fragment demonstates the problem by giving different
|
||||
The following fragment demonstrates the problem by giving different
|
||||
follow sets (option -pa) for var_access when built with k=1 and ck=2 on
|
||||
1.33 vanilla and 1.33MR10:
|
||||
|
||||
@@ -2658,7 +2658,7 @@
|
||||
|
||||
1. start : r:rule t:Token <<$start=$r;>>
|
||||
|
||||
The $r refrence will not work when combined with
|
||||
The $r reference will not work when combined with
|
||||
the -gt option.
|
||||
|
||||
2. start : t:Token <<$start=$t;>>
|
||||
@@ -3010,7 +3010,7 @@
|
||||
parse by "falling through". The parse can still be easily
|
||||
resumed in other ways, but not in the most natural fashion.
|
||||
|
||||
This results in an inconsistentcy between named exception
|
||||
This results in an inconsistency between named exception
|
||||
handlers and exception handlers for alternatives. When
|
||||
an exception handler for an alternative "falls through"
|
||||
it goes to the nextmost outer handler - not the "normal
|
||||
@@ -3062,7 +3062,7 @@
|
||||
zzconsumeUntil()
|
||||
zzconsumeUntilToken()
|
||||
|
||||
#58. (Changed in 1.33MR7) Added defintion of zzbufsize to dlgauto.h
|
||||
#58. (Changed in 1.33MR7) Added definition of zzbufsize to dlgauto.h
|
||||
|
||||
#57. (Changed in 1.33MR7) Format of #line directive
|
||||
|
||||
@@ -3073,9 +3073,9 @@
|
||||
|
||||
#56. (Added in 1.33MR7) Jan Mikkelsen <janm@zeta.org.au>
|
||||
|
||||
Move PURIFY macro invocaton to after rule's init action.
|
||||
Move PURIFY macro invocation to after rule's init action.
|
||||
|
||||
#55. (Fixed in 1.33MR7) Unitialized variables in ANTLRParser
|
||||
#55. (Fixed in 1.33MR7) Uninitialized variables in ANTLRParser
|
||||
|
||||
Member variables inf_labase and inf_last were not initialized.
|
||||
(See item #50.)
|
||||
@@ -3115,7 +3115,7 @@
|
||||
The reason for "Normal Action" is that the normal flow of the
|
||||
program after a user-written exception handler is to "drop through".
|
||||
In the case of an exception handler for a rule this results in
|
||||
the exection of a "return" statement. In the case of an
|
||||
the execution of a "return" statement. In the case of an
|
||||
exception handler attached to an alternative, rule, or token
|
||||
this is the code that would have executed had there been no
|
||||
exception.
|
||||
@@ -3332,7 +3332,7 @@
|
||||
|
||||
Repair bug introduced by 1.33MR1 for #tokdefs. The original fix
|
||||
placed "DLGmaxToken=9999" and "DLGminToken=0" in the TokenType enum
|
||||
in order to fix a problem with an aggresive compiler assigning an 8
|
||||
in order to fix a problem with an aggressive compiler assigning an 8
|
||||
bit enum which might be too narrow. This caused #tokdefs to assume
|
||||
that there were 9999 real tokens. The repair to the fix causes antlr to
|
||||
ignore TokenTypes "DLGmaxToken" and "DLGminToken" in a #tokdefs file.
|
||||
|
@@ -1350,7 +1350,7 @@
|
||||
the variable [zz]traceOptionValueDefault is set to 0 or 1. When
|
||||
the parser is initialized or [zz]traceReset() is called the
|
||||
value of [zz]traceOptionValueDefault is copied to [zz]traceOptionValue.
|
||||
The value of [zz]traceGuessOptionValue is always initialzed to 1,
|
||||
The value of [zz]traceGuessOptionValue is always initialized to 1,
|
||||
but, as noted earlier, nothing will be reported unless
|
||||
[zz]traceOptionValue is also positive.
|
||||
|
||||
@@ -1766,7 +1766,7 @@
|
||||
This is especially important for predicates formed by rules
|
||||
like the following:
|
||||
|
||||
uppperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
|
||||
upperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
|
||||
vowel: : <<isVowel(LATEXT(1))>>? LETTERS;
|
||||
|
||||
These predicates are combined using AND since both must be
|
||||
@@ -1928,7 +1928,7 @@
|
||||
parse by "falling through". The parse can still be easily
|
||||
resumed in other ways, but not in the most natural fashion.
|
||||
|
||||
This results in an inconsistentcy between named exception
|
||||
This results in an inconsistency between named exception
|
||||
handlers and exception handlers for alternatives. When
|
||||
an exception handler for an alternative "falls through"
|
||||
it goes to the nextmost outer handler - not the "normal
|
||||
@@ -1990,7 +1990,7 @@
|
||||
The reason for "Normal Action" is that the normal flow of the
|
||||
program after a user-written exception handler is to "drop through".
|
||||
In the case of an exception handler for a rule this results in
|
||||
the exection of a "return" statement. In the case of an
|
||||
the execution of a "return" statement. In the case of an
|
||||
exception handler attached to an alternative, rule, or token
|
||||
this is the code that would have executed had there been no
|
||||
exception.
|
||||
|
@@ -22,7 +22,7 @@
|
||||
If the context guard g is not a subset of the lookahead context for r1
|
||||
(in other words g is neither A nor B) then the code may execute r1
|
||||
even when the lookahead context is not satisfied. This is an error
|
||||
by the person coding the grammer, and the error should be reported to
|
||||
by the person coding the grammar, and the error should be reported to
|
||||
the user, but it isn't. expect. Some examples I've run seem to
|
||||
indicate that such an error actually results in the rule becoming
|
||||
unreachable.
|
||||
@@ -184,7 +184,7 @@
|
||||
|
||||
THM: In MR20 have fixed the most common cases.
|
||||
|
||||
The following token defintion will cause DLG to crash.
|
||||
The following token definition will cause DLG to crash.
|
||||
|
||||
#token "()"
|
||||
|
||||
|
@@ -1394,7 +1394,7 @@ tclass()
|
||||
/* MR23 */ if (p!= NULL && akaString != NULL) {
|
||||
/* MR23 */ if (p->akaString != NULL) {
|
||||
/* MR23 */ if (strcmp(p->akaString,akaString) != 0) {
|
||||
/* MR23 */ warnFL(eMsg2("this #tokclass statment conflicts with a previous #tokclass %s(\"%s\") statement",
|
||||
/* MR23 */ warnFL(eMsg2("this #tokclass statement conflicts with a previous #tokclass %s(\"%s\") statement",
|
||||
/* MR23 */ t,p->akaString),
|
||||
/* MR23 */ FileStr[save_file],save_line);
|
||||
/* MR23 */ };
|
||||
@@ -1635,7 +1635,7 @@ token()
|
||||
if (te != NULL && akaString != NULL) {
|
||||
if (te->akaString != NULL) {
|
||||
if (strcmp(te->akaString,akaString) != 0) {
|
||||
warnFL(eMsg2("this #token statment conflicts with a previous #token %s(\"%s\") statement",
|
||||
warnFL(eMsg2("this #token statement conflicts with a previous #token %s(\"%s\") statement",
|
||||
t,te->akaString),
|
||||
FileStr[save_file],save_line);
|
||||
};
|
||||
|
@@ -1331,7 +1331,7 @@ tclass : <<char *t=NULL; TCnode *e; int go=1,tok,totok; TermEntry *p, *term, *to
|
||||
/* MR23 */ if (p!= NULL && akaString != NULL) {
|
||||
/* MR23 */ if (p->akaString != NULL) {
|
||||
/* MR23 */ if (strcmp(p->akaString,akaString) != 0) {
|
||||
/* MR23 */ warnFL(eMsg2("this #tokclass statment conflicts with a previous #tokclass %s(\"%s\") statement",
|
||||
/* MR23 */ warnFL(eMsg2("this #tokclass statement conflicts with a previous #tokclass %s(\"%s\") statement",
|
||||
/* MR23 */ t,p->akaString),
|
||||
/* MR23 */ FileStr[save_file],save_line);
|
||||
/* MR23 */ };
|
||||
@@ -1439,7 +1439,7 @@ token : <<char *t=NULL, *e=NULL, *a=NULL; int tnum=0;>>
|
||||
if (te != NULL && akaString != NULL) {
|
||||
if (te->akaString != NULL) {
|
||||
if (strcmp(te->akaString,akaString) != 0) {
|
||||
warnFL(eMsg2("this #token statment conflicts with a previous #token %s(\"%s\") statement",
|
||||
warnFL(eMsg2("this #token statement conflicts with a previous #token %s(\"%s\") statement",
|
||||
t,te->akaString),
|
||||
FileStr[save_file],save_line);
|
||||
};
|
||||
|
@@ -286,7 +286,7 @@ resource 'cmdo' (128, "Antlr") {
|
||||
"If this option is checked, ANTLR will ge"
|
||||
"nerate a cross reference for all rules. "
|
||||
"For each rule it will print a list of al"
|
||||
"l other rules that refrence it."
|
||||
"l other rules that reference it."
|
||||
},
|
||||
/* [10] */
|
||||
NotDependent {
|
||||
|
@@ -166,7 +166,7 @@ ExceptionGroup *eg;
|
||||
};
|
||||
};
|
||||
|
||||
/* ocurs at a later pass then for the exception_label */
|
||||
/* occurs at a later pass then for the exception_label */
|
||||
/* if an outerEG has been found then fill in the outer EG */
|
||||
/* remove if from the list when the BlkLevel gets smaller */
|
||||
|
||||
|
@@ -353,7 +353,7 @@ set *rk_out;
|
||||
set_orin(&a, b);
|
||||
set_free(b);
|
||||
}
|
||||
set_free(rk); /* this has no members, but free it's memory */
|
||||
set_free(rk); /* this has no members, but free its memory */
|
||||
set_orin(rk_out, rk2); /* remember what we couldn't do */
|
||||
set_free(rk2);
|
||||
if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
|
||||
@@ -937,7 +937,7 @@ int jtype;
|
||||
long n;
|
||||
int thisOverflow=0; /* MR9 */
|
||||
long set_deg_value; /* MR10 */
|
||||
long threshhold; /* MR10 */
|
||||
long threshold; /* MR10 */
|
||||
|
||||
require(block!=NULL, "NULL block");
|
||||
require(block->ntype==nJunction, "invalid block");
|
||||
@@ -954,8 +954,8 @@ int jtype;
|
||||
b = set_and(alt1->fset[i], alt2->fset[i]);
|
||||
/* MR9 */ set_deg_value = set_deg(b);
|
||||
/* MR10 */ if (n > 0) {
|
||||
/* MR10 */ threshhold = LONG_MAX / n;
|
||||
/* MR10 */ if (set_deg_value <= threshhold) {
|
||||
/* MR10 */ threshold = LONG_MAX / n;
|
||||
/* MR10 */ if (set_deg_value <= threshold) {
|
||||
/* MR10 */ n *= set_deg_value;
|
||||
/* MR10 */ } else {
|
||||
/* MR10 */ n=LONG_MAX;
|
||||
|
@@ -739,7 +739,7 @@ set *rk_out;
|
||||
t = tlink(t, u, k2); /* any alts missing k2 toks, add u onto end */
|
||||
Tfree(u); /* MR10 */
|
||||
}
|
||||
set_free(rk); /* rk is empty, but free it's memory */
|
||||
set_free(rk); /* rk is empty, but free its memory */
|
||||
set_orin(rk_out, rk2); /* remember what we couldn't do */
|
||||
set_free(rk2);
|
||||
return t;
|
||||
|
@@ -1590,7 +1590,7 @@ int *lastAltEmpty; /* MR23 */
|
||||
with input "C"
|
||||
|
||||
Before MR21 the error message would be "expecting B - found C". After MR21
|
||||
the error message would be "expcect A, B - found C". This was good, but it
|
||||
the error message would be "expect A, B - found C". This was good, but it
|
||||
caused problems for those using parser exceptions because the reference to
|
||||
B was generated inside the {...} where B really wasn't part of the block.
|
||||
|
||||
@@ -1781,7 +1781,7 @@ Junction *q;
|
||||
followed by a loopBlock whereas the start of a (...)+ block is
|
||||
represented as a single node: a plusBlock. So if first_item_is_guess_block
|
||||
is called when the current node is a loopBegin it starts with the
|
||||
loop block rather than the the sub block which follows the loop block.
|
||||
loop block rather than the sub block which follows the loop block.
|
||||
However, we can't just skip past the loop block because some routines
|
||||
depend on the old implementation. So, we provide a new implementation
|
||||
which does skip the loopBlock. However, which should be called when ?
|
||||
@@ -3496,7 +3496,7 @@ do { /* MR10 Change recursion into iteration */
|
||||
/* MR23
|
||||
If there were only one return value operand and
|
||||
it had an initializer then it would have been
|
||||
initiailized in the declaration.
|
||||
initialized in the declaration.
|
||||
*/
|
||||
|
||||
returnValueInitializer = getInitializer(q->ret); /* MR23 */
|
||||
@@ -3740,7 +3740,7 @@ RuleEntry *r;
|
||||
/* NOTICE: this is done only here, for the method definition, but */
|
||||
/* not for the method declaration inside the class */
|
||||
/* definition. This is exactly the behaviour defined in */
|
||||
/* C++ standard for default paramters. */
|
||||
/* C++ standard for default parameters. */
|
||||
|
||||
DumpANSIFunctionArgDef(output,q, 0 /* emit initializers ? */);
|
||||
_gen("\n");
|
||||
@@ -4726,7 +4726,7 @@ int bInitializer;
|
||||
blocks to look like (...|...| epsilon) since there were
|
||||
intervening generics. This fixes the problem for this
|
||||
particular case. Things like actions or empty blocks of
|
||||
various kinds will still cause problems, but I wasnt't
|
||||
various kinds will still cause problems, but I wasn't
|
||||
prepared to handle pathological cases like (A|()*). It
|
||||
does handle (A | ()), which is a recommended idiom for
|
||||
epsilon.
|
||||
|
@@ -215,7 +215,7 @@ typedef Graph Attrib;
|
||||
|
||||
/* M a x i m u m s */
|
||||
|
||||
/* MR20 Note G. Hobbelt These values are superceded by values in hash.h */
|
||||
/* MR20 Note G. Hobbelt These values are superseded by values in hash.h */
|
||||
|
||||
#ifndef HashTableSize
|
||||
#define HashTableSize 253
|
||||
|
@@ -640,7 +640,7 @@ Junction *q;
|
||||
*
|
||||
*/
|
||||
|
||||
/* MR5 Jan Mikkelsen 26-May-97 - added initalComma parameter */
|
||||
/* MR5 Jan Mikkelsen 26-May-97 - added initialComma parameter */
|
||||
|
||||
void
|
||||
#ifdef __USE_PROTOS
|
||||
@@ -696,7 +696,7 @@ FILE *output;
|
||||
&pSeparator,
|
||||
&nest);
|
||||
|
||||
/* MR26 Handle rule arguments such as: IIR_Bool (IIR_Decl::*contstraint)()
|
||||
/* MR26 Handle rule arguments such as: IIR_Bool (IIR_Decl::*constraint)()
|
||||
For this we need to strip off anything which follows the symbol.
|
||||
*/
|
||||
|
||||
|
@@ -2357,7 +2357,7 @@ NEXT_P:
|
||||
* expression, such as "#pred NotA !A" or "#pred NotXY ! (X && Y) or
|
||||
* "#pred XbarY !(X && Y)". In particular, it cannot be set by any
|
||||
* predicate expression occurring under any other circumstances.
|
||||
* The #pred predicate expresssions are stored with in predEntry->pred
|
||||
* The #pred predicate expressions are stored with in predEntry->pred
|
||||
* and do not normally appear anywhere else until the predicates are
|
||||
* "unfolded" in order to recognize redundancies, conflicts, and
|
||||
* tautologies.
|
||||
|
@@ -90,7 +90,7 @@ set nfa_states;
|
||||
if (dfa_size<=dfa_allocated){
|
||||
/* need to redo array */
|
||||
if (!dfa_array){
|
||||
/* need some to do inital allocation */
|
||||
/* need some to do initial allocation */
|
||||
dfa_size=dfa_allocated+DFA_MIN;
|
||||
dfa_array=(dfa_node **) malloc(sizeof(dfa_node*)*
|
||||
dfa_size);
|
||||
@@ -113,7 +113,7 @@ set nfa_states;
|
||||
}
|
||||
|
||||
|
||||
/* past a pointer to the start start of the nfa graph
|
||||
/* past a pointer to the start of the nfa graph
|
||||
* nfa_to_dfa convers this graph to dfa. The function returns
|
||||
* a pointer to the first dfa state.
|
||||
* NOTE: The function that prints out the table will have to figure out how
|
||||
@@ -219,7 +219,7 @@ FILE *f;
|
||||
#endif
|
||||
|
||||
/* Returns a pointer to a dfa node that has the same nfa nodes in it.
|
||||
* This may or maynot be a newly created node.
|
||||
* This may or may not be a newly created node.
|
||||
*/
|
||||
dfa_node *
|
||||
#ifdef __USE_PROTOS
|
||||
|
@@ -117,7 +117,7 @@ typedef struct {
|
||||
extern char program[]; /* tells what program this is */
|
||||
extern char version[]; /* tells what version this is */
|
||||
extern char *file_str[]; /* file names being used */
|
||||
extern int err_found; /* flag to indicate error occured */
|
||||
extern int err_found; /* flag to indicate error occurred */
|
||||
extern int action_no; /* last action function printed */
|
||||
extern int func_action; /* should actions be turned into functions?*/
|
||||
extern set used_chars; /* used to label trans. arcs */
|
||||
@@ -129,7 +129,7 @@ extern int comp_level; /* what compression level to use */
|
||||
extern int interactive; /* interactive scanner (avoid lookahead)*/
|
||||
extern int mode_counter; /* keeps track of the number of %%name */
|
||||
extern int dfa_basep[]; /* start of each group of dfa */
|
||||
extern int dfa_class_nop[];/* number of transistion arcs in */
|
||||
extern int dfa_class_nop[];/* number of transition arcs in */
|
||||
/* each dfa in each mode */
|
||||
extern int nfa_allocated;
|
||||
extern int dfa_allocated;
|
||||
|
@@ -23,9 +23,9 @@ resource 'cmdo' (128, "Dlg") {
|
||||
{35, 175, 50, 225},
|
||||
"On",
|
||||
"-CC",
|
||||
"When this control is checked, DLG genera"
|
||||
"tes a scanner using C++ classes rather t"
|
||||
"han C functions."
|
||||
"When this control is checked, DLG generates "
|
||||
"a scanner using C++ classes rather than "
|
||||
"C functions."
|
||||
},
|
||||
/* [2] */
|
||||
Or {
|
||||
@@ -41,8 +41,7 @@ resource 'cmdo' (128, "Dlg") {
|
||||
"DLGLexer",
|
||||
keepCase,
|
||||
"-cl",
|
||||
"This entry specifies the name DLG uses f"
|
||||
"or the C++ lexer class."
|
||||
"This entry specifies the name DLG uses for the C++ lexer class."
|
||||
},
|
||||
/* [3] */
|
||||
NotDependent {
|
||||
@@ -90,8 +89,7 @@ resource 'cmdo' (128, "Dlg") {
|
||||
{66, 25, 85, 135},
|
||||
"Output File",
|
||||
"",
|
||||
"Choose the name of the file that will ho"
|
||||
"ld the DLG-produced scanner."
|
||||
"Choose the name of the file that will hold the DLG-produced scanner."
|
||||
},
|
||||
NoMore {
|
||||
|
||||
@@ -161,8 +159,7 @@ resource 'cmdo' (128, "Dlg") {
|
||||
"mode.h",
|
||||
keepCase,
|
||||
"-m",
|
||||
"This entry specifies the name DLG uses f"
|
||||
"or its lexical mode output file."
|
||||
"This entry specifies the name DLG uses for its lexical mode output file."
|
||||
},
|
||||
/* [11] */
|
||||
NotDependent {
|
||||
@@ -171,15 +168,14 @@ resource 'cmdo' (128, "Dlg") {
|
||||
RadioButtons {
|
||||
{ /* array radioArray: 3 elements */
|
||||
/* [1] */
|
||||
{134, 175, 149, 255}, "None", "", Set, "When this option is selected, DLG will n"
|
||||
"ot compress its tables.",
|
||||
{134, 175, 149, 255}, "None", "", Set, "When this option is selected, DLG will not "
|
||||
"compress its tables.",
|
||||
/* [2] */
|
||||
{134, 265, 149, 345}, "Level 1", "-C1", NotSet, "When this option is selected, DLG will r"
|
||||
"emove all unused characters from the tra"
|
||||
"nsition-from table.",
|
||||
{134, 265, 149, 345}, "Level 1", "-C1", NotSet, "When this option is selected, DLG will "
|
||||
"remove all unused characters from the transition-from table.",
|
||||
/* [3] */
|
||||
{134, 360, 149, 450}, "Level 2", "-C2", NotSet, "When this option is selected, DLG will p"
|
||||
"erform level 1 compression plus it will "
|
||||
{134, 360, 149, 450}, "Level 2", "-C2", NotSet, "When this option is selected, DLG will "
|
||||
"perform level 1 compression plus it will "
|
||||
"map equivalent characters into the same "
|
||||
"character classes."
|
||||
}
|
||||
@@ -202,8 +198,8 @@ resource 'cmdo' (128, "Dlg") {
|
||||
{165, 20, 180, 145},
|
||||
"Case Sensitive",
|
||||
"-ci",
|
||||
"When this control is checked, the DLG au"
|
||||
"tomaton will treat upper and lower case "
|
||||
"When this control is checked, the DLG automaton "
|
||||
"will treat upper and lower case "
|
||||
"characters identically."
|
||||
},
|
||||
/* [14] */
|
||||
@@ -215,9 +211,8 @@ resource 'cmdo' (128, "Dlg") {
|
||||
{165, 150, 180, 300},
|
||||
"Interactive Scanner",
|
||||
"-i",
|
||||
"When this control is checked, DLG will g"
|
||||
"enerate as interactive a scanner as poss"
|
||||
"ible."
|
||||
"When this control is checked, DLG will generate "
|
||||
"as interactive a scanner as possible."
|
||||
},
|
||||
/* [15] */
|
||||
NotDependent {
|
||||
@@ -229,8 +224,8 @@ resource 'cmdo' (128, "Dlg") {
|
||||
"Ambiguity Warnings",
|
||||
"-Wambiguity",
|
||||
"When this control is checked, DLG warns "
|
||||
"if more than one regular expression coul"
|
||||
"d match the same character sequence."
|
||||
"if more than one regular expression could "
|
||||
"match the same character sequence."
|
||||
},
|
||||
/* [16] */
|
||||
NotDependent {
|
||||
@@ -240,9 +235,9 @@ resource 'cmdo' (128, "Dlg") {
|
||||
VersionString {
|
||||
"1.33MR"
|
||||
},
|
||||
"PCCTS was written by Terence Parr, Russe"
|
||||
"ll Quong, Will Cohen, and Hank Dietz: 19"
|
||||
"89-1998. MPW port by Scott Haney.",
|
||||
"PCCTS was written by Terence Parr, Russell "
|
||||
"Quong, Will Cohen, and Hank Dietz: 1989-1998. "
|
||||
"MPW port by Scott Haney.",
|
||||
noDialog
|
||||
},
|
||||
/* [17] */
|
||||
@@ -266,8 +261,8 @@ resource 'cmdo' (128, "Dlg") {
|
||||
{142, 20, 157, 148},
|
||||
"Generate ANSI C",
|
||||
"-ga",
|
||||
"When this control is checked, DLG genera"
|
||||
"tes ANSI C compatible code."
|
||||
"When this control is checked, DLG generates "
|
||||
"ANSI C compatible code."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -813,7 +813,7 @@ new_nfa_node()
|
||||
if (nfa_size<=nfa_allocated){
|
||||
/* need to redo array */
|
||||
if (!nfa_array){
|
||||
/* need some to do inital allocation */
|
||||
/* need some to do initial allocation */
|
||||
nfa_size=nfa_allocated+NFA_MIN;
|
||||
nfa_array=(nfa_node **) malloc(sizeof(nfa_node*)*
|
||||
nfa_size);
|
||||
|
@@ -463,7 +463,7 @@ new_nfa_node()
|
||||
if (nfa_size<=nfa_allocated){
|
||||
/* need to redo array */
|
||||
if (!nfa_array){
|
||||
/* need some to do inital allocation */
|
||||
/* need some to do initial allocation */
|
||||
nfa_size=nfa_allocated+NFA_MIN;
|
||||
nfa_array=(nfa_node **) malloc(sizeof(nfa_node*)*
|
||||
nfa_size);
|
||||
|
@@ -134,7 +134,7 @@ int level; /* compression level to uses */
|
||||
|
||||
|
||||
/* given pointer to beginning of graph and recursively walks it trying
|
||||
* to find a maximal partition. This partion in returned in maximal_class
|
||||
* to find a maximal partition. This partition in returned in maximal_class
|
||||
*/
|
||||
#ifdef __USE_PROTOS
|
||||
void intersect_nfa_labels(nfa_node* start,set* maximal_class)
|
||||
|
@@ -69,7 +69,7 @@ ANTLRTokenPtr::~ANTLRTokenPtr()
|
||||
|
||||
//
|
||||
// 8-Apr-97 MR1 Make operator -> a const member function
|
||||
// as weall as some other member functions
|
||||
// as well as some other member functions
|
||||
//
|
||||
ANTLRTokenPtr& ANTLRTokenPtr::operator = (const ANTLRTokenPtr & lhs) // MR1
|
||||
{
|
||||
|
@@ -6,7 +6,7 @@
|
||||
/* By Hubert Holin (Hubert.Holin@Bigfoot.com), 1998. */
|
||||
/* */
|
||||
/* This is completely free stuff, do whatever you want with */
|
||||
/* it (but then, I will take no responsability for whatever */
|
||||
/* it (but then, I will take no responsibility for whatever */
|
||||
/* may happen if you do either... caveat emptor!). */
|
||||
/* */
|
||||
/************************************************************/
|
||||
@@ -24,12 +24,12 @@ PCCTS_NAMESPACE_STD
|
||||
|
||||
|
||||
// NOTES: The semantics of the copy constructor
|
||||
// and the affectation operator may be unwaranted...
|
||||
// and the affectation operator may be unwarranted...
|
||||
// and the stream may not be reset.
|
||||
//
|
||||
// It would have been so much nicer for nextChar()
|
||||
// to throw (of for the DLGInputStream to change status)
|
||||
// upon hiting EOF than to return an "int"...
|
||||
// upon hitting EOF than to return an "int"...
|
||||
|
||||
template <
|
||||
class E,
|
||||
|
@@ -797,7 +797,7 @@ extern int zzguessing;
|
||||
extern zzjmp_buf zzguess_start;
|
||||
#endif
|
||||
|
||||
/* Define global veriables that refer to values exported by the scanner.
|
||||
/* Define global variables that refer to values exported by the scanner.
|
||||
* These declarations duplicate those in dlgdef.h, but are needed
|
||||
* if ANTLR is not to generate a .dlg file (-gx); PS, this is a hack.
|
||||
*/
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/** @file
|
||||
|
||||
VfrCompiler internal defintions.
|
||||
VfrCompiler internal definitions.
|
||||
|
||||
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
|
@@ -45,7 +45,7 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = {
|
||||
{ VFR_RETURN_DATA_STRING_ERROR, ": data field string error or not support"},
|
||||
{ VFR_RETURN_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},
|
||||
{ VFR_RETURN_CONSTANT_ONLY, ": only constant is allowed in the expression"},
|
||||
{ VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR, ": Varstore name is defined by more than one varstores, it can't be referred as varstore, only varstore strucure name could be used."},
|
||||
{ VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR, ": Varstore name is defined by more than one varstores, it can't be referred as varstore, only varstore structure name could be used."},
|
||||
{ VFR_RETURN_BIT_WIDTH_ERROR, ": bit width must be <= sizeof (type) * 8 and the max width can not > 32" },
|
||||
{ VFR_RETURN_STRING_TO_UINT_OVERFLOW, ": String to UINT* Overflow"},
|
||||
{ VFR_RETURN_CODEUNDEFINED, ": undefined Error Code" }
|
||||
|
@@ -945,7 +945,7 @@ CFormPkg::DeclarePendingQuestion (
|
||||
}
|
||||
CNObj.SetFlags (0, Info.mVarType);
|
||||
//
|
||||
// Use maximum value not to limit the vaild value for the undefined question.
|
||||
// Use maximum value not to limit the valid value for the undefined question.
|
||||
//
|
||||
switch (Info.mVarType) {
|
||||
case EFI_IFR_TYPE_NUM_SIZE_64:
|
||||
@@ -1515,7 +1515,7 @@ CIfrRecordInfoDB::IfrRecordAdjust (
|
||||
}
|
||||
//
|
||||
// extract inconsistent opcode list
|
||||
// pNode is Incosistent opcode, tNode is End Opcode
|
||||
// pNode is Inconsistent opcode, tNode is End Opcode
|
||||
//
|
||||
|
||||
//
|
||||
|
@@ -64,7 +64,7 @@ VfrParserStart (
|
||||
//
|
||||
// Define a lexical class for parsing quoted strings. Basically
|
||||
// starts with a double quote, and ends with a double quote that
|
||||
// is not preceeded with a backslash.
|
||||
// is not preceded with a backslash.
|
||||
//
|
||||
#lexclass QUOTED_STRING
|
||||
#token TheString "~[\"]*\"" << mode (START); >>
|
||||
@@ -1214,7 +1214,7 @@ vfrStatementVarStoreNameValue :
|
||||
;
|
||||
|
||||
//
|
||||
// keep classDeinition and validClassNames for compatibility but not generate
|
||||
// keep classDefinition and validClassNames for compatibility but not generate
|
||||
// any IFR object
|
||||
//
|
||||
classDefinition[UINT16 & Class] :
|
||||
@@ -4121,7 +4121,7 @@ vfrStatementExpression [UINT32 RootLevel, UINT32 ExpOpCount = 0] :
|
||||
|
||||
//
|
||||
// Add new sub function for the sub expression extension to remember the ExpOpCount
|
||||
// This funciton is only called by sub expression.
|
||||
// This function is only called by sub expression.
|
||||
//
|
||||
vfrStatementExpressionSub [UINT32 RootLevel, UINT32 & ExpOpCount] :
|
||||
andTerm[$RootLevel, $ExpOpCount]
|
||||
@@ -5615,7 +5615,7 @@ EfiVfrParser::_DeclareDefaultFrameworkVarStore (
|
||||
VSEObj.SetAttributes (0x00000002); //hardcode EFI_VARIABLE_BOOTSERVICE_ACCESS attribute
|
||||
VSEObj.SetGuid (&pNode->mGuid);
|
||||
VSEObj.SetVarStoreId (pNode->mVarStoreId);
|
||||
// Generate old efi varstore storage structure for compatiable with old "VarEqVal" opcode,
|
||||
// Generate old efi varstore storage structure for compatible with old "VarEqVal" opcode,
|
||||
// which is 3 bytes less than new structure define in UEFI Spec 2.3.1.
|
||||
VSEObj.SetBinaryLength (sizeof (EFI_IFR_VARSTORE_EFI) - 3);
|
||||
#ifdef VFREXP_DEBUG
|
||||
|
@@ -1177,7 +1177,7 @@ CVfrVarDataTypeDB::DataTypeAddBitField (
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// Check whether the bit fileds can be contained within one FieldType.
|
||||
// Check whether the bit fields can be contained within one FieldType.
|
||||
//
|
||||
if (pTmp != NULL && pTmp->mIsBitField && strcmp (pTmp->mFieldType->mTypeName, pNewField->mFieldType->mTypeName) == 0 &&
|
||||
(pTmp->mBitOffset - pTmp->mOffset * 8) + pTmp->mBitWidth + pNewField->mBitWidth <= pNewField->mFieldType->mTotalSize * 8) {
|
||||
@@ -2058,7 +2058,7 @@ CVfrDataStorage::GetVarStoreId (
|
||||
*VarStoreId = EFI_VARSTORE_ID_INVALID;
|
||||
|
||||
//
|
||||
// Assume that Data strucutre name is used as StoreName, and check again.
|
||||
// Assume that Data structure name is used as StoreName, and check again.
|
||||
//
|
||||
ReturnCode = GetVarStoreByDataType (StoreName, &pNode, StoreGuid);
|
||||
if (pNode != NULL) {
|
||||
@@ -2843,7 +2843,7 @@ CVfrQuestionDB::PrintAllQuestion (
|
||||
SVfrQuestionNode *pNode = NULL;
|
||||
|
||||
for (pNode = mQuestionList; pNode != NULL; pNode = pNode->mNext) {
|
||||
printf ("Question VarId is %s and QuesitonId is 0x%x\n", pNode->mVarIdStr, pNode->mQuestionId);
|
||||
printf ("Question VarId is %s and QuestionId is 0x%x\n", pNode->mVarIdStr, pNode->mQuestionId);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user