MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lingering pl_newpredicate error

This commit is contained in:
Ron Pedde 2004-03-07 06:16:41 +00:00
parent 7df7ce5c83
commit 4d14d11dff
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/parser.y
View File

@ -25,13 +25,17 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "playlist.h" #include "playlist.h"
#define YYERROR_VERBOSE 1 #define YYERROR_VERBOSE 1
extern int yyerror(char *msg);
/* Forwards */ /* Forwards */
extern PL_NODE *pl_newpredicate(int tag, int op, char *value, int type); extern PL_NODE *pl_newcharpredicate(int tag, int op, char *value);
extern PL_NODE *pl_newintpredicate(int tag, int op, int 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);
@ -93,8 +97,8 @@ expression: expression AND expression { $$=pl_newexpr($1,$2,$3); }
| predicate | predicate
; ;
predicate: strtag strbool ID { $$=pl_newpredicate($1, $2, $3, T_STR); } predicate: strtag strbool ID { $$=pl_newcharpredicate($1, $2, $3); }
| inttag intbool NUM { $$=pl_newpredicate($1, $2, $3, T_INT); } | inttag intbool NUM { $$=pl_newintpredicate($1, $2, $3); }
; ;
inttag: YEAR inttag: YEAR
@ -119,8 +123,7 @@ strbool: IS { $$=$1; }
; ;
%% %%
PL_NODE *pl_newintpredicate(int tag, int op, int value) {
PL_NODE *pl_newpredicate(int tag, int op, char *value, int type) {
PL_NODE *pnew; PL_NODE *pnew;
pnew=(PL_NODE*)malloc(sizeof(PL_NODE)); pnew=(PL_NODE*)malloc(sizeof(PL_NODE));
@ -128,7 +131,21 @@ PL_NODE *pl_newpredicate(int tag, int op, char *value, int type) {
return NULL; return NULL;
pnew->op=op; pnew->op=op;
pnew->type=type; pnew->type=T_INT;
pnew->arg1.ival=tag;
pnew->arg2.ival=value;
return pnew;
}
PL_NODE *pl_newcharpredicate(int tag, int op, char *value) {
PL_NODE *pnew;
pnew=(PL_NODE*)malloc(sizeof(PL_NODE));
if(!pnew)
return NULL;
pnew->op=op;
pnew->type=T_STR;
pnew->arg1.ival=tag; pnew->arg1.ival=tag;
pnew->arg2.cval=value; pnew->arg2.cval=value;
return pnew; return pnew;