9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve shfit/reduce conflict in timespec production (#54)

Browse source 
Resolve shfit/reduce conflict in timespec production (no operational change)
This commit is contained in:
Eric Mertens 2020-11-07 19:54:25 -08:00 committed by GitHub
parent 92c6e47b4a
commit 8e1bdeda92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ircd/ircd_parser.y
View file

@ -170,7 +170,7 @@ static void add_cur_list(int type, char *str, int number)
%token <number> NUMBER %token <number> NUMBER
%type <string> qstring string %type <string> qstring string
%type <number> number timespec %type <number> number timespec unittimespec
%type <conf_parm> oneitem single itemlist %type <conf_parm> oneitem single itemlist
%start conf %start conf
@ -308,7 +308,7 @@ qstring: QSTRING { strcpy($$, $1); } ;
string: STRING { strcpy($$, $1); } ; string: STRING { strcpy($$, $1); } ;
number: NUMBER { $$ = $1; } ; number: NUMBER { $$ = $1; } ;
timespec: number string unittimespec: number string
{ {
time_t t; time_t t;
@ -320,7 +320,13 @@ timespec: number string
$$ = $1 * t; $$ = $1 * t;
} }
| timespec timespec ;
timespec: unittimespec
{
$$ = $1;
}
| timespec unittimespec
{ {
$$ = $1 + $2; $$ = $1 + $2;
} }