MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-17 17:39:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove TOK_ from tokens

Browse Source
This commit is contained in:
Ron Pedde 2003-12-05 06:00:30 +00:00
parent 9eb513bfa8
commit e6673b0f5d
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/parser.y
View File

@ -11,9 +11,13 @@ extern PL_NODE *pl_newpredicate(int tag, int op, char *value);
extern PL_NODE *pl_newexpr(PL_NODE *arg1, int op, PL_NODE *arg2); extern PL_NODE *pl_newexpr(PL_NODE *arg1, int op, PL_NODE *arg2);
extern int pl_addplaylist(char *name, PL_NODE *root); extern int pl_addplaylist(char *name, PL_NODE *root);
/* Globals */
int pl_number=2;
%} %}
%left TOK_OR TOK_AND %left OR AND
%union { %union {
unsigned int ival; unsigned int ival;
@ -21,18 +25,18 @@ extern int pl_addplaylist(char *name, PL_NODE *root);
PL_NODE *plval; PL_NODE *plval;
} }
%token <ival> TOK_ARTIST %token <ival> ARTIST
%token <ival> TOK_ALBUM %token <ival> ALBUM
%token <ival> TOK_GENRE %token <ival> GENRE
%token <ival> TOK_IS %token <ival> IS
%token <ival> TOK_INCLUDES %token <ival> INCLUDES
%token <ival> TOK_OR %token <ival> OR
%token <ival> TOK_AND %token <ival> AND
%token <ival> TOK_NOT %token <ival> NOT
%token <cval> TOK_ID %token <cval> ID
%type <plval> expression %type <plval> expression
%type <plval> predicate %type <plval> predicate
@ -43,32 +47,32 @@ extern int pl_addplaylist(char *name, PL_NODE *root);
%% %%
playlistlist: playlist playlistlist: playlist {}
| playlistlist playlist | playlistlist playlist {}
; ;
playlist: TOK_ID '{' expression '}' { $$ = pl_addplaylist($1, $3); } playlist: ID '{' expression '}' { $$ = pl_addplaylist($1, $3); }
; ;
expression: expression TOK_AND expression { $$=pl_newexpr($1,$2,$3); } expression: expression AND expression { $$=pl_newexpr($1,$2,$3); }
| expression TOK_OR expression { $$=pl_newexpr($1,$2,$3); } | expression OR expression { $$=pl_newexpr($1,$2,$3); }
| '(' expression ')' { $$=$2; } | '(' expression ')' { $$=$2; }
| predicate | predicate
; ;
predicate: idtag boolarg value { $$=pl_newpredicate($1, $2, $3); } predicate: idtag boolarg value { $$=pl_newpredicate($1, $2, $3); }
idtag: TOK_ARTIST idtag: ARTIST
| TOK_ALBUM | ALBUM
| TOK_GENRE | GENRE
; ;
boolarg: TOK_IS boolarg: IS { $$=$1; }
| TOK_INCLUDES | INCLUDES { $$=$1; }
| TOK_NOT boolarg { $$=$2 | 0x80000000; } | NOT boolarg { $$=$2 | 0x80000000; }
; ;
value: TOK_ID value: ID
; ;
@ -110,6 +114,7 @@ int pl_addplaylist(char *name, PL_NODE *root) {
pnew->next=pl_smart.next; pnew->next=pl_smart.next;
pnew->name=name; pnew->name=name;
pnew->root=root; pnew->root=root;
pnew->id=pl_number++;
pl_smart.next=pnew; pl_smart.next=pnew;
return 0; return 0;