diff c/regexParser/bitVector.cc @ 115:ca30f8334741 pairPro

rename createRegexParser.cc to regexParser.cc
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Tue, 24 Nov 2015 14:38:26 +0900
parents a3adc5c24e19
children 66c633575b53
line wrap: on
line diff
--- a/c/regexParser/bitVector.cc	Mon Nov 23 19:19:43 2015 +0900
+++ b/c/regexParser/bitVector.cc	Tue Nov 24 14:38:26 2015 +0900
@@ -2,19 +2,23 @@
 #include <stdlib.h>
 #include <string.h>
 #include "bitVector.h"
+#include "regexParser.h"
 
-void bitPrint(BitVectorPtr bi);
+extern BitVectorListPtr allocateBitVectorList();
+BitVectorListPtr createBitVector(NodePtr,BitVectorListPtr);
+const BitVectorPtr allocateBitVector();
+BitVectorPtr bitSet(int);
+void bitPrint(BitVectorPtr);
 
 int bitBlock = sizeof(unsigned long) * 8;
 
 BitVectorListPtr createBitVector(NodePtr n,BitVectorListPtr bvl) {
     BitVectorListPtr nextBvl = allocateBitVectorList();
     nextBvl->bi = bitSet(n->nodeNumber);
-    nextBvl->initBvl = initBvl;
     return nextBvl;
 }
 
-BitVectorPtr createBitVector(int bitSetPosition) {
+const BitVectorPtr allocateBitVector() {
 
     BitVectorPtr bi = (BitVectorPtr)malloc(sizeof(BitVector));
     if (bi == NULL) {
@@ -35,7 +39,9 @@
     return bi;
 }
 
-BitVectorPtr bitSet(BitVectorPtr bi, int bitSetPosition) {
+BitVectorPtr bitSet(int bitSetPosition) {
+
+    BitVectorPtr bi = allocateBitVector();
 
     bi->arrayNum = (bitSetPosition + bitBlock - 1) / bitBlock;