zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lemon update 2012-01-09 14:19:05 on branch trunk

Browse source 
- Cosmetic changes to lemon. No changes to core functionality nor impact on SQLite. (user: drh)
This commit is contained in:
Randy Heit 2016-03-20 10:01:41 -05:00
parent cb7eb1abc5
commit c5e4f05fe2
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/lemon/lemon.c
View file

@ -122,8 +122,6 @@ void ResortStates(struct lemon *);
void SetSize(int); /* All sets will be of size N */ void SetSize(int); /* All sets will be of size N */
char *SetNew(void); /* A new set for element 0..N */ char *SetNew(void); /* A new set for element 0..N */
void SetFree(char*); /* Deallocate a set */ void SetFree(char*); /* Deallocate a set */
char *SetNew(void); /* A new set for element 0..N */
int SetAdd(char*,int); /* Add element to a set */ int SetAdd(char*,int); /* Add element to a set */
int SetUnion(char *,char *); /* A <- A U B, thru element N */ int SetUnion(char *,char *); /* A <- A U B, thru element N */
#define SetFind(X,Y) (X[Y]) /* True if Y is in set X */ #define SetFind(X,Y) (X[Y]) /* True if Y is in set X */
@ -973,7 +971,7 @@ void FindFollowSets(struct lemon *lemp)
}while( progress ); }while( progress );
} }
static int resolve_conflict(struct action *,struct action *, struct symbol *); static int resolve_conflict(struct action *,struct action *);
/* Compute the reduce actions, and resolve conflicts. /* Compute the reduce actions, and resolve conflicts.
*/ */
@ -1027,7 +1025,7 @@ void FindActions(struct lemon *lemp)
for(nap=ap->next; nap && nap->sp==ap->sp; nap=nap->next){ for(nap=ap->next; nap && nap->sp==ap->sp; nap=nap->next){
/* The two actions "ap" and "nap" have the same lookahead. /* The two actions "ap" and "nap" have the same lookahead.
** Figure out which one should be used */ ** Figure out which one should be used */
lemp->nconflict += resolve_conflict(ap,nap,lemp->errsym); lemp->nconflict += resolve_conflict(ap,nap);
} }
} }
} }
@ -1062,8 +1060,7 @@ void FindActions(struct lemon *lemp)
*/ */
static int resolve_conflict( static int resolve_conflict(
struct action *apx, struct action *apx,
struct action *apy, struct action *apy
struct symbol *errsym /* The error symbol (if defined. NULL otherwise) */
){ ){
struct symbol *spx, *spy; struct symbol *spx, *spy;
int errcnt = 0; int errcnt = 0;