Imported Upstream version 1.4.24upstream/1.4.24

1 files changed, 40 insertions, 42 deletions

diff --git a/src/mod_ssi_exprparser.c b/src/mod_ssi_exprparser.c
index 676c274..6a0373d 100644
--- a/src/mod_ssi_exprparser.c
+++ b/src/mod_ssi_exprparser.c
@@ -6,15 +6,13 @@
 #include <stdio.h>
 #line 6 "../../src/mod_ssi_exprparser.y"
 
-#include <assert.h>
-#include <string.h>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "mod_ssi_expr.h"
 #include "buffer.h"
 
-#line 18 "mod_ssi_exprparser.c"
+#include <assert.h>
+#include <string.h>
+
+#line 16 "mod_ssi_exprparser.c"
 /* Next is all token values, in a form suitable for use by makeheaders.
 ** This section will be null unless lemon is run with the -m switch.
 */
@@ -349,9 +347,9 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){
     case 10:
     case 11:
     case 12:
-#line 24 "../../src/mod_ssi_exprparser.y"
+#line 22 "../../src/mod_ssi_exprparser.y"
 { buffer_free((yypminor->yy0)); }
-#line 354 "mod_ssi_exprparser.c"
+#line 352 "mod_ssi_exprparser.c"
       break;
     default:  break;   /* If no destructor action specified: do nothing */
   }
@@ -580,17 +578,17 @@ static void yy_reduce(
   **     break;
   */
       case 0:
-#line 31 "../../src/mod_ssi_exprparser.y"
+#line 29 "../../src/mod_ssi_exprparser.y"
 {
   ctx->val.bo = ssi_val_tobool(yymsp[0].minor.yy29);
   ctx->val.type = SSI_TYPE_BOOL;
 
   ssi_val_free(yymsp[0].minor.yy29);
 }
-#line 590 "mod_ssi_exprparser.c"
+#line 588 "mod_ssi_exprparser.c"
         break;
       case 1:
-#line 38 "../../src/mod_ssi_exprparser.y"
+#line 36 "../../src/mod_ssi_exprparser.y"
 {
   int cmp;
 
@@ -616,17 +614,17 @@ static void yy_reduce(
 
   ssi_val_free(yymsp[0].minor.yy29);
 }
-#line 619 "mod_ssi_exprparser.c"
+#line 617 "mod_ssi_exprparser.c"
         break;
       case 2:
-#line 63 "../../src/mod_ssi_exprparser.y"
+#line 61 "../../src/mod_ssi_exprparser.y"
 {
   yygotominor.yy29 = yymsp[0].minor.yy29;
 }
-#line 626 "mod_ssi_exprparser.c"
+#line 624 "mod_ssi_exprparser.c"
         break;
       case 3:
-#line 66 "../../src/mod_ssi_exprparser.y"
+#line 64 "../../src/mod_ssi_exprparser.y"
 {
   int e;
 
@@ -637,11 +635,11 @@ static void yy_reduce(
   yygotominor.yy29->type = SSI_TYPE_BOOL;
   ssi_val_free(yymsp[0].minor.yy29);
 }
-#line 640 "mod_ssi_exprparser.c"
+#line 638 "mod_ssi_exprparser.c"
   yy_destructor(1,&yymsp[-1].minor);
         break;
       case 4:
-#line 77 "../../src/mod_ssi_exprparser.y"
+#line 75 "../../src/mod_ssi_exprparser.y"
 {
   int e;
 
@@ -652,11 +650,11 @@ static void yy_reduce(
   yygotominor.yy29->type = SSI_TYPE_BOOL;
   ssi_val_free(yymsp[0].minor.yy29);
 }
-#line 655 "mod_ssi_exprparser.c"
+#line 653 "mod_ssi_exprparser.c"
   yy_destructor(2,&yymsp[-1].minor);
         break;
       case 5:
-#line 88 "../../src/mod_ssi_exprparser.y"
+#line 86 "../../src/mod_ssi_exprparser.y"
 {
   int e;
 
@@ -666,77 +664,77 @@ static void yy_reduce(
   yygotominor.yy29->bo = e;
   yygotominor.yy29->type = SSI_TYPE_BOOL;
 }
-#line 669 "mod_ssi_exprparser.c"
+#line 667 "mod_ssi_exprparser.c"
   yy_destructor(9,&yymsp[-1].minor);
         break;
       case 6:
-#line 97 "../../src/mod_ssi_exprparser.y"
+#line 95 "../../src/mod_ssi_exprparser.y"
 {
   yygotominor.yy29 = yymsp[-1].minor.yy29;
 }
-#line 677 "mod_ssi_exprparser.c"
+#line 675 "mod_ssi_exprparser.c"
   yy_destructor(10,&yymsp[-2].minor);
   yy_destructor(11,&yymsp[0].minor);
         break;
       case 7:
-#line 101 "../../src/mod_ssi_exprparser.y"
+#line 99 "../../src/mod_ssi_exprparser.y"
 {
   yygotominor.yy29 = ssi_val_init();
   yygotominor.yy29->str = yymsp[0].minor.yy19;
   yygotominor.yy29->type = SSI_TYPE_STRING;
 }
-#line 688 "mod_ssi_exprparser.c"
+#line 686 "mod_ssi_exprparser.c"
         break;
       case 8:
-#line 107 "../../src/mod_ssi_exprparser.y"
+#line 105 "../../src/mod_ssi_exprparser.y"
 {
   yygotominor.yy19 = yymsp[0].minor.yy0;
 }
-#line 695 "mod_ssi_exprparser.c"
+#line 693 "mod_ssi_exprparser.c"
         break;
       case 9:
-#line 111 "../../src/mod_ssi_exprparser.y"
+#line 109 "../../src/mod_ssi_exprparser.y"
 {
   yygotominor.yy19 = yymsp[-1].minor.yy19;
   buffer_append_string_buffer(yygotominor.yy19, yymsp[0].minor.yy0);
   buffer_free(yymsp[0].minor.yy0);
 }
-#line 704 "mod_ssi_exprparser.c"
+#line 702 "mod_ssi_exprparser.c"
         break;
       case 10:
-#line 117 "../../src/mod_ssi_exprparser.y"
+#line 115 "../../src/mod_ssi_exprparser.y"
 { yygotominor.yy8 = SSI_COND_EQ; }
-#line 709 "mod_ssi_exprparser.c"
+#line 707 "mod_ssi_exprparser.c"
   yy_destructor(3,&yymsp[0].minor);
         break;
       case 11:
-#line 118 "../../src/mod_ssi_exprparser.y"
+#line 116 "../../src/mod_ssi_exprparser.y"
 { yygotominor.yy8 = SSI_COND_NE; }
-#line 715 "mod_ssi_exprparser.c"
+#line 713 "mod_ssi_exprparser.c"
   yy_destructor(4,&yymsp[0].minor);
         break;
       case 12:
-#line 119 "../../src/mod_ssi_exprparser.y"
+#line 117 "../../src/mod_ssi_exprparser.y"
 { yygotominor.yy8 = SSI_COND_LE; }
-#line 721 "mod_ssi_exprparser.c"
+#line 719 "mod_ssi_exprparser.c"
   yy_destructor(8,&yymsp[0].minor);
         break;
       case 13:
-#line 120 "../../src/mod_ssi_exprparser.y"
+#line 118 "../../src/mod_ssi_exprparser.y"
 { yygotominor.yy8 = SSI_COND_GE; }
-#line 727 "mod_ssi_exprparser.c"
+#line 725 "mod_ssi_exprparser.c"
   yy_destructor(6,&yymsp[0].minor);
         break;
       case 14:
-#line 121 "../../src/mod_ssi_exprparser.y"
+#line 119 "../../src/mod_ssi_exprparser.y"
 { yygotominor.yy8 = SSI_COND_LT; }
-#line 733 "mod_ssi_exprparser.c"
+#line 731 "mod_ssi_exprparser.c"
   yy_destructor(7,&yymsp[0].minor);
         break;
       case 15:
-#line 122 "../../src/mod_ssi_exprparser.y"
+#line 120 "../../src/mod_ssi_exprparser.y"
 { yygotominor.yy8 = SSI_COND_GT; }
-#line 739 "mod_ssi_exprparser.c"
+#line 737 "mod_ssi_exprparser.c"
   yy_destructor(5,&yymsp[0].minor);
         break;
   };
@@ -766,11 +764,11 @@ static void yy_parse_failed(
   while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
   /* Here code is inserted which will be executed whenever the
   ** parser fails */
-#line 16 "../../src/mod_ssi_exprparser.y"
+#line 14 "../../src/mod_ssi_exprparser.y"
 
   ctx->ok = 0;
 
-#line 773 "mod_ssi_exprparser.c"
+#line 771 "mod_ssi_exprparser.c"
   ssiexprparserARG_STORE; /* Suppress warning about unused %extra_argument variable */
 }