# HG changeset patch
# User Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
# Date 1453281648 -32400
# Node ID 6ed6f385205e0ddad139d770a88d6c955b734768
# Parent  f5931151d70c5c31d031933689dbb68108e7ab90
fix fd

diff -r f5931151d70c -r 6ed6f385205e regexParser/Makefile
--- a/regexParser/Makefile	Wed Jan 20 18:05:19 2016 +0900
+++ b/regexParser/Makefile	Wed Jan 20 18:20:48 2016 +0900
@@ -23,9 +23,10 @@
 test/ccMerge: test/ccMerge.cc
 	$(CC) $(CFLAGS) -I. $< subsetConstruction.cc regexParser.cc node.cc error.cc bitVector.cc -o $@
 
-sequentialSearch: sequentialSearch.cc regexParser
+sequentialSearch: sequentialSearch.cc regexParser fileread.o
 	./regexParser -seq -subset -regex $(REGEX)
-	$(CC) $(CFLAGS) -I. sequentialSearch.cc -o $@
+	$(CC) $(CFLAGS) -I. -c sequentialSearch.cc 
+	$(CC) $(CFLAGS) -I. sequentialSearch.o fileread.o -o $@
 	
 
 gcov:
diff -r f5931151d70c -r 6ed6f385205e regexParser/fileread.cc
--- a/regexParser/fileread.cc	Wed Jan 20 18:05:19 2016 +0900
+++ b/regexParser/fileread.cc	Wed Jan 20 18:20:48 2016 +0900
@@ -7,7 +7,7 @@
 
 #include "fileread.h"
 
-st_mmap_t createSt_mmap(char* filename,int fd) {
+st_mmap_t createSt_mmap(char* filename,int &fd) {
     st_mmap_t st_mmap;
     int map = MAP_PRIVATE;
     struct stat sb;
diff -r f5931151d70c -r 6ed6f385205e regexParser/fileread.h
--- a/regexParser/fileread.h	Wed Jan 20 18:05:19 2016 +0900
+++ b/regexParser/fileread.h	Wed Jan 20 18:20:48 2016 +0900
@@ -1,4 +1,4 @@
 #include "regexParser.h"
 
-extern st_mmap_t createSt_mmap(char* filename, int fd);
+extern st_mmap_t createSt_mmap(char* filename, int &fd);
 extern Buffer createBuffer(st_mmap_t st_mmap);
diff -r f5931151d70c -r 6ed6f385205e regexParser/sequentialSearch.cc
--- a/regexParser/sequentialSearch.cc	Wed Jan 20 18:05:19 2016 +0900
+++ b/regexParser/sequentialSearch.cc	Wed Jan 20 18:20:48 2016 +0900
@@ -29,7 +29,7 @@
         }
     }
 
-    int fd;
+    int fd = 0;
     st_mmap_t st_mmap = createSt_mmap(filename,fd);
     Buffer buff = createBuffer(st_mmap);
     stateSkip(buff);