rename variable class --> kw_class

This commit is contained in:
rlar 2011-05-01 19:45:12 +00:00
parent 77431f8ac5
commit 66289067ba
3 changed files with 22 additions and 17 deletions

View File

@ -1,3 +1,8 @@
2011-05-01 Robert Larice
* src/frontend/parser/complete.c ,
* src/include/cpextern.h :
rename variable class --> kw_class
2011-05-01 Robert Larice
* src/spicelib/analysis/analysis.c ,
* src/spicelib/analysis/analysis.h ,

View File

@ -513,17 +513,17 @@ cp_remcomm(char *word)
/* Add a keyword to the database. */
void
cp_addkword(int class, char *word)
cp_addkword(int kw_class, char *word)
{
struct ccom *cc;
if ((class < 1) || (class >= NCLASSES)) {
if ((kw_class < 1) || (kw_class >= NCLASSES)) {
fprintf(cp_err, "cp_addkword: Internal Error: bad class %d\n",
class);
kw_class);
return;
}
/* word = copy(word); va: not necessary, clookup copies itself (memory leak) */
cc = clookup(word, &keywords[class], FALSE, TRUE);
cc = clookup(word, &keywords[kw_class], FALSE, TRUE);
cc->cc_invalid = 0;
return;
}
@ -531,18 +531,18 @@ cp_addkword(int class, char *word)
/* Remove a keyword from the database. */
void
cp_remkword(int class, char *word)
cp_remkword(int kw_class, char *word)
{
struct ccom *cc;
if ((class < 1) || (class >= NCLASSES)) {
if ((kw_class < 1) || (kw_class >= NCLASSES)) {
fprintf(cp_err, "cp_remkword: Internal Error: bad class %d\n",
class);
kw_class);
return;
}
cc = clookup(word, &keywords[class], FALSE, FALSE);
cc = clookup(word, &keywords[kw_class], FALSE, FALSE);
if (cc)
cdelete(cc, &keywords[class]);
cdelete(cc, &keywords[kw_class]);
return;
}
@ -552,17 +552,17 @@ cp_remkword(int class, char *word)
*/
char *
cp_kwswitch(int class, char *tree)
cp_kwswitch(int kw_class, char *tree)
{
char *old;
if ((class < 1) || (class >= NCLASSES)) {
if ((kw_class < 1) || (kw_class >= NCLASSES)) {
fprintf(cp_err, "cp_addkword: Internal Error: bad class %d\n",
class);
kw_class);
return (NULL);
}
old = (char *) keywords[class];
keywords[class] = (struct ccom *) tree;
old = (char *) keywords[kw_class];
keywords[kw_class] = (struct ccom *) tree;
return (old);
}

View File

@ -33,14 +33,14 @@ extern wordlist *cp_bquote(wordlist *wlist);
extern bool cp_nocc;
extern bool cp_comlook(char *word);
extern char *cp_kwswitch(int class, char *tree);
extern char *cp_kwswitch(int kw_class, char *tree);
extern void cp_addcomm(char *word, long int bits0, long int bits1, long int bits2, long int bits3);
extern void cp_addkword(int class, char *word);
extern void cp_addkword(int kw_class, char *word);
extern void cp_ccom(wordlist *wlist, char *buf, bool esc);
extern void cp_ccon(bool on);
extern void cp_ccrestart(bool kwords);
extern void cp_remcomm(char *word);
extern void cp_remkword(int class, char *word);
extern void cp_remkword(int kw_class, char *word);
extern wordlist *cp_cctowl(char *stuff);
/* cshpar.c */