X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fspotlight%2Fslmod_sparql_parser.c;h=66e0f59d731572829a13d3f090f2423839b95d7c;hp=9772b9ee604ebc1f5aa7065a9d1d90d8b9015def;hb=371efee757ed56fd9e2f46b39fae625924d2cfc2;hpb=f6880d95f390585810c679d071aa8310248afc85 diff --git a/etc/spotlight/slmod_sparql_parser.c b/etc/spotlight/slmod_sparql_parser.c index 9772b9ee..66e0f59d 100644 --- a/etc/spotlight/slmod_sparql_parser.c +++ b/etc/spotlight/slmod_sparql_parser.c @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 2.7. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "2.7" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,14 +58,11 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 /* Copy the first part of user declarations. */ - -/* Line 268 of yacc.c */ +/* Line 371 of yacc.c */ #line 1 "slmod_sparql_parser.y" #include @@ -103,15 +100,18 @@ /* local vars */ static gchar *ssp_result; static char sparqlvar; + static char *result_limit; +/* Line 371 of yacc.c */ +#line 107 "slmod_sparql_parser.c" -/* Line 268 of yacc.c */ -#line 110 "slmod_sparql_parser.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -121,11 +121,17 @@ # define YYERROR_VERBOSE 1 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_YY_SLMOD_SPARQL_PARSER_H_INCLUDED +# define YY_YY_SLMOD_SPARQL_PARSER_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; #endif - /* Tokens. */ #ifndef YYTOKENTYPE @@ -167,13 +173,11 @@ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 293 of yacc.c */ -#line 45 "slmod_sparql_parser.y" +/* Line 387 of yacc.c */ +#line 46 "slmod_sparql_parser.y" int ival; const char *sval; @@ -181,34 +185,47 @@ typedef union YYSTYPE time_t tval; - -/* Line 293 of yacc.c */ -#line 187 "slmod_sparql_parser.c" +/* Line 387 of yacc.c */ +#line 190 "slmod_sparql_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -/* "%code provides" blocks. */ +extern YYSTYPE yylval; -/* Line 340 of yacc.c */ -#line 39 "slmod_sparql_parser.y" +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ +/* "%code provides" blocks. */ +/* Line 387 of yacc.c */ +#line 40 "slmod_sparql_parser.y" #define SPRAW_TIME_OFFSET 978307200 extern int map_spotlight_to_sparql_query(slq_t *slq, gchar **sparql_result); extern slq_t *ssp_slq; +/* Line 387 of yacc.c */ +#line 222 "slmod_sparql_parser.c" -/* Line 340 of yacc.c */ -#line 206 "slmod_sparql_parser.c" +#endif /* !YY_YY_SLMOD_SPARQL_PARSER_H_INCLUDED */ /* Copy the second part of user declarations. */ - -/* Line 343 of yacc.c */ -#line 212 "slmod_sparql_parser.c" +/* Line 390 of yacc.c */ +#line 229 "slmod_sparql_parser.c" #ifdef short # undef short @@ -261,24 +278,24 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -314,6 +331,7 @@ YYID (yyi) # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif @@ -405,20 +423,20 @@ union yyalloc #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ while (YYID (0)) # endif # endif @@ -506,13 +524,13 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 67, 67, 69, 73, 83, 89, 95, 96, 97, - 98, 99, 108, 109, 110, 111, 112, 113, 114, 115, - 119, 123, 124 + 0, 68, 68, 70, 74, 88, 94, 104, 105, 106, + 107, 112, 121, 122, 123, 124, 125, 126, 127, 128, + 132, 136, 137 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -520,7 +538,7 @@ static const char *const yytname[] = "$end", "error", "$undefined", "WORD", "BOOL", "FUNC_INRANGE", "DATE_ISO", "OBRACE", "CBRACE", "EQUAL", "UNEQUAL", "GT", "LT", "COMMA", "QUOTE", "AND", "OR", "$accept", "input", "line", "expr", "match", - "function", "date", 0 + "function", "date", YY_NULL }; #endif @@ -602,10 +620,10 @@ static const yytype_uint8 yytable[] = 0, 50, 28 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-10)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-10))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int8 yycheck[] = @@ -657,62 +675,35 @@ static const yytype_uint8 yystos[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - /* This macro is provided for backward compatibility. */ - #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (YYLEX_PARAM) #else @@ -762,6 +753,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) YYSTYPE const * const yyvaluep; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT @@ -773,7 +766,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) switch (yytype) { default: - break; + break; } } @@ -1013,12 +1006,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULL; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1078,11 +1070,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -1102,10 +1096,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1165,32 +1161,27 @@ yydestruct (yymsg, yytype, yyvaluep) { default: - break; + break; } } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /* The lookahead symbol. */ int yychar; + +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1230,7 +1221,7 @@ yyparse () `yyss': related to states. `yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1248,7 +1239,7 @@ yyparse () int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1266,9 +1257,8 @@ yyparse () Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1277,14 +1267,6 @@ yyparse () yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -1425,7 +1407,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1462,22 +1446,24 @@ yyreduce: switch (yyn) { case 4: - -/* Line 1806 of yacc.c */ -#line 73 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 74 "slmod_sparql_parser.y" { + if (ssp_slq->slq_result_limit) + result_limit = talloc_asprintf(ssp_slq, "LIMIT %ld", ssp_slq->slq_result_limit); + else + result_limit = ""; ssp_result = talloc_asprintf(ssp_slq, - "SELECT DISTINCT ?url WHERE " - "{ ?obj nie:url ?url FILTER(regex(?url, '^file://%s/')) . %s}", - ssp_slq->slq_vol->v_path, (yyvsp[(1) - (1)].sval)); + "SELECT ?url WHERE " + "{ %s . ?obj nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s", + (yyvsp[(1) - (1)].sval), ssp_slq->slq_vol->v_path, result_limit); (yyval.sval) = ssp_result; } break; case 5: - -/* Line 1806 of yacc.c */ -#line 83 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 88 "slmod_sparql_parser.y" { if ((yyvsp[(1) - (1)].bval) == false) YYACCEPT; @@ -1487,10 +1473,13 @@ yyreduce: break; case 6: - -/* Line 1806 of yacc.c */ -#line 89 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 94 "slmod_sparql_parser.y" { + if (!ssp_slq->slq_allow_expr) + YYABORT; + if ((yyvsp[(1) - (3)].sval) == NULL || (yyvsp[(3) - (3)].sval) == NULL) + YYABORT; if (strcmp((yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval)) != 0) (yyval.sval) = talloc_asprintf(ssp_slq, "{ %s } UNION { %s }", (yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval)); else @@ -1499,37 +1488,36 @@ yyreduce: break; case 7: - -/* Line 1806 of yacc.c */ -#line 95 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 104 "slmod_sparql_parser.y" {(yyval.sval) = (yyvsp[(1) - (1)].sval); if ((yyval.sval) == NULL) YYABORT;} break; case 8: - -/* Line 1806 of yacc.c */ -#line 96 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 105 "slmod_sparql_parser.y" {(yyval.sval) = (yyvsp[(1) - (1)].sval);} break; case 9: - -/* Line 1806 of yacc.c */ -#line 97 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 106 "slmod_sparql_parser.y" {(yyval.sval) = talloc_asprintf(ssp_slq, "%s", (yyvsp[(2) - (3)].sval));} break; case 10: - -/* Line 1806 of yacc.c */ -#line 98 "slmod_sparql_parser.y" - {(yyval.sval) = talloc_asprintf(ssp_slq, "%s . %s", (yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval));} +/* Line 1792 of yacc.c */ +#line 107 "slmod_sparql_parser.y" + { + if (!ssp_slq->slq_allow_expr) + YYABORT; + (yyval.sval) = talloc_asprintf(ssp_slq, "%s . %s", (yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval)); +} break; case 11: - -/* Line 1806 of yacc.c */ -#line 99 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 112 "slmod_sparql_parser.y" { if (strcmp((yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval)) != 0) (yyval.sval) = talloc_asprintf(ssp_slq, "{ %s } UNION { %s }", (yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval)); @@ -1539,86 +1527,74 @@ yyreduce: break; case 12: - -/* Line 1806 of yacc.c */ -#line 108 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 121 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '=', (yyvsp[(4) - (5)].sval));} break; case 13: - -/* Line 1806 of yacc.c */ -#line 109 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 122 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '!', (yyvsp[(4) - (5)].sval));} break; case 14: - -/* Line 1806 of yacc.c */ -#line 110 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 123 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '<', (yyvsp[(4) - (5)].sval));} break; case 15: - -/* Line 1806 of yacc.c */ -#line 111 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 124 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '>', (yyvsp[(4) - (5)].sval));} break; case 16: - -/* Line 1806 of yacc.c */ -#line 112 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 125 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '=', (yyvsp[(4) - (6)].sval));} break; case 17: - -/* Line 1806 of yacc.c */ -#line 113 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 126 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '!', (yyvsp[(4) - (6)].sval));} break; case 18: - -/* Line 1806 of yacc.c */ -#line 114 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 127 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '<', (yyvsp[(4) - (6)].sval));} break; case 19: - -/* Line 1806 of yacc.c */ -#line 115 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 128 "slmod_sparql_parser.y" {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '>', (yyvsp[(4) - (6)].sval));} break; case 20: - -/* Line 1806 of yacc.c */ -#line 119 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 132 "slmod_sparql_parser.y" {(yyval.sval) = map_daterange((yyvsp[(3) - (8)].sval), (yyvsp[(5) - (8)].tval), (yyvsp[(7) - (8)].tval));} break; case 21: - -/* Line 1806 of yacc.c */ -#line 123 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 136 "slmod_sparql_parser.y" {(yyval.tval) = isodate2unix((yyvsp[(3) - (4)].sval));} break; case 22: - -/* Line 1806 of yacc.c */ -#line 124 "slmod_sparql_parser.y" +/* Line 1792 of yacc.c */ +#line 137 "slmod_sparql_parser.y" {(yyval.tval) = atoi((yyvsp[(1) - (1)].sval)) + SPRAW_TIME_OFFSET;} break; - -/* Line 1806 of yacc.c */ -#line 1622 "slmod_sparql_parser.c" +/* Line 1792 of yacc.c */ +#line 1598 "slmod_sparql_parser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1781,7 +1757,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -1805,7 +1783,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -1847,9 +1825,8 @@ yyreturn: } - -/* Line 2067 of yacc.c */ -#line 127 "slmod_sparql_parser.y" +/* Line 2055 of yacc.c */ +#line 140 "slmod_sparql_parser.y" static time_t isodate2unix(const char *s) @@ -1932,7 +1909,7 @@ static const char *map_expr(const char *attr, char op, const char *val) bstring q = NULL, search = NULL, replace = NULL; for (p = spotlight_sparql_map; p->ssm_spotlight_attr; p++) { - if (strcmp(p->ssm_spotlight_attr, attr) == 0) { + if (p->ssm_enabled && (strcmp(p->ssm_spotlight_attr, attr) == 0)) { if (p->ssm_type != ssmt_type && p->ssm_sparql_attr == NULL) { yyerror("unsupported Spotlight attribute"); EC_FAIL; @@ -2057,6 +2034,7 @@ int main(int argc, char **argv) struct vol *vol = talloc_zero(ssp_slq, struct vol); vol->v_path = "/Volumes/test"; ssp_slq->slq_vol = vol; + ssp_slq->slq_allow_expr = true; sparqlvar = 'a'; s = yy_scan_string(argv[1]); @@ -2071,4 +2049,3 @@ int main(int argc, char **argv) return 0; } #endif -