Fix `label unused` warning

4 files changed, 6 insertions, 27 deletions

diff --git a/tests/bison_nr_parser.y b/tests/bison_nr_parser.y
index 57e5c6c..3021048 100644
--- a/tests/bison_nr_parser.y
+++ b/tests/bison_nr_parser.y
@@ -30,8 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
-#include "parser.h"
-#include "scanner.h"
+#include "bison_nr_parser.h"
+#include "bison_nr_scanner.h"
 
 #define YYERROR_VERBOSE 1
 /* #define YYPARSE_PARAM scanner */
diff --git a/tests/bison_yylloc_parser.y b/tests/bison_yylloc_parser.y
index 6cff424..8737291 100644
--- a/tests/bison_yylloc_parser.y
+++ b/tests/bison_yylloc_parser.y
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
-#include "parser.h"
-#include "scanner.h"
+#include "bison_yylloc_parser.h"
+#include "bison_yylloc_scanner.h"
 
 int yyerror(YYLTYPE *location, void* scanner, const char* msg);
 
diff --git a/tests/bison_yylval_parser.y b/tests/bison_yylval_parser.y
index ca8c8da..4159d7b 100644
--- a/tests/bison_yylval_parser.y
+++ b/tests/bison_yylval_parser.y
@@ -32,8 +32,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
-#include "parser.h"
-#include "scanner.h"
+#include "bison_yylval_parser.h"
+#include "bison_yylval_scanner.h"
 
 #define YYERROR_VERBOSE 1
 
diff --git a/tests/multiple_scanners_nr_main.c b/tests/multiple_scanners_nr_main.c
index bfdd12a..497bd9f 100644
--- a/tests/multiple_scanners_nr_main.c
+++ b/tests/multiple_scanners_nr_main.c
@@ -21,8 +21,6 @@
  * PURPOSE.
  */
 
-#include <assert.h>
-
 #include "multiple_scanners_nr_1.h"
 #include "multiple_scanners_nr_2.h"
 
@@ -32,27 +30,11 @@ main ( int argc, char** argv )
     (void)argc;
     (void)argv;
 
-<<<<<<< HEAD:tests/multiple_scanners_nr_main.c
     int S1_ok=1, S2_ok=1;
     YY_BUFFER_STATE buff1, buff2;
     S1_out = S2_out = stdout;
     buff1 = S1__scan_string("foo on bar off");
     buff2 = S2__scan_string("on blah blah off foo on bar off");
-=======
-    yyscan_t  scanner;
-    FILE *fp;
-    char * extra = "EXTRA";
-    
-    testlex_init(&scanner);
-    testset_in(stdin,scanner);
-    testset_out(stdout,scanner);    
-    testset_extra(extra,scanner);
-    
-    fp = testget_in(scanner);
-    assert(fp == stdin);
-    fp = testget_out(scanner);
-    assert(fp == stdout);
->>>>>>> Remove a few `unused variable` warnings:tests/test-linedir-r/main.c
 
     /* scan simultaneously. */
     while(S1_ok || S2_ok)
@@ -67,6 +49,3 @@ main ( int argc, char** argv )
     printf("TEST RETURNING OK.\n");
     return 0;
 }
-
-
-/* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */