X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=etc%2Fspotlight%2Fspotlight_rawquery_lexer.c;h=38b7a73f09dfffdce2b82d2b08481b938475839e;hb=8ccdf12308235e51f06d033b209b3ad32e8a7bd8;hp=350df439369003486eb71dfb542fe94648cb1684;hpb=1f756c9c1e9133e520e3cb7b0149e2c8445da791;p=netatalk.git

diff --git a/etc/spotlight/spotlight_rawquery_lexer.c b/etc/spotlight/spotlight_rawquery_lexer.c
index 350df439..38b7a73f 100644
--- a/etc/spotlight/spotlight_rawquery_lexer.c
+++ b/etc/spotlight/spotlight_rawquery_lexer.c
@@ -501,8 +501,11 @@ char *yytext;
 #include <gio/gio.h>
 #include <atalk/talloc.h>
 #include <atalk/spotlight.h>
+#ifdef HAVE_TRACKER_SPARQL
 #include "slmod_sparql_parser.h"
-#line 506 "spotlight_rawquery_lexer.c"
+#define SLQ_VAR ssp_slq
+#endif
+#line 509 "spotlight_rawquery_lexer.c"
 
 #define INITIAL 0
 
@@ -591,7 +594,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -602,7 +605,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		unsigned n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -684,9 +687,9 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 24 "spotlight_rawquery_lexer.l"
+#line 27 "spotlight_rawquery_lexer.l"
 
-#line 690 "spotlight_rawquery_lexer.c"
+#line 693 "spotlight_rawquery_lexer.c"
 
 	if ( !(yy_init) )
 		{
@@ -771,91 +774,91 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 25 "spotlight_rawquery_lexer.l"
-return FUNC_INRANGE;                                       
+#line 28 "spotlight_rawquery_lexer.l"
+return FUNC_INRANGE;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 26 "spotlight_rawquery_lexer.l"
+#line 29 "spotlight_rawquery_lexer.l"
 return DATE_ISO;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 27 "spotlight_rawquery_lexer.l"
+#line 30 "spotlight_rawquery_lexer.l"
 {yylval.bval = false; return BOOL;}
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 28 "spotlight_rawquery_lexer.l"
+#line 31 "spotlight_rawquery_lexer.l"
 {yylval.bval = true; return BOOL;}
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 29 "spotlight_rawquery_lexer.l"
+#line 32 "spotlight_rawquery_lexer.l"
 return QUOTE;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 30 "spotlight_rawquery_lexer.l"
+#line 33 "spotlight_rawquery_lexer.l"
 return OBRACE;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 31 "spotlight_rawquery_lexer.l"
+#line 34 "spotlight_rawquery_lexer.l"
 return CBRACE;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 32 "spotlight_rawquery_lexer.l"
+#line 35 "spotlight_rawquery_lexer.l"
 return AND;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 33 "spotlight_rawquery_lexer.l"
+#line 36 "spotlight_rawquery_lexer.l"
 return OR;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 34 "spotlight_rawquery_lexer.l"
+#line 37 "spotlight_rawquery_lexer.l"
 return EQUAL;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 35 "spotlight_rawquery_lexer.l"
+#line 38 "spotlight_rawquery_lexer.l"
 return UNEQUAL;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 36 "spotlight_rawquery_lexer.l"
+#line 39 "spotlight_rawquery_lexer.l"
 return LT;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 37 "spotlight_rawquery_lexer.l"
+#line 40 "spotlight_rawquery_lexer.l"
 return GT;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 38 "spotlight_rawquery_lexer.l"
+#line 41 "spotlight_rawquery_lexer.l"
 return COMMA;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 39 "spotlight_rawquery_lexer.l"
-{yylval.sval = talloc_strdup(ssp_slq, yytext); return WORD;}
+#line 42 "spotlight_rawquery_lexer.l"
+{yylval.sval = talloc_strdup(SLQ_VAR, yytext); return WORD;}
 	YY_BREAK
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 40 "spotlight_rawquery_lexer.l"
+#line 43 "spotlight_rawquery_lexer.l"
 /* ignore */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 41 "spotlight_rawquery_lexer.l"
+#line 44 "spotlight_rawquery_lexer.l"
 ECHO;
 	YY_BREAK
-#line 859 "spotlight_rawquery_lexer.c"
+#line 862 "spotlight_rawquery_lexer.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1853,7 +1856,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 41 "spotlight_rawquery_lexer.l"
+#line 44 "spotlight_rawquery_lexer.l"