comparison regexParser/subsetConstraction.cc @ 191:02031fb73af8 pairPro

remove somefiles and fix header files
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Fri, 25 Dec 2015 16:08:02 +0900
parents 3e8e5780ad4a
children ecf70fb215a5
comparison
equal deleted inserted replaced
190:3e8e5780ad4a 191:02031fb73af8
1 #include <stdio.h> 1 #include <stdio.h>
2 #include <stdlib.h> 2 #include <stdlib.h>
3 #include <ctype.h> 3 #include <ctype.h>
4
5 #include "regexParser.h"
4 #include "subsetConstraction.h" 6 #include "subsetConstraction.h"
5 #include "node.h" 7 #include "node.h"
8 #include "BitVector.h"
6 9
7 CharClassPtr createCharClassWord(unsigned char *w, CharClassPtr cc1, CharClassPtr cc2) { 10 CharClassPtr createCharClassWord(unsigned char *w, CharClassPtr cc1, CharClassPtr cc2) {
8 CharClassPtr cc = NEW(CharClass); 11 CharClassPtr cc = NEW(CharClass);
9 return cc; 12 return cc;
10 } 13 }
312 } 315 }
313 316
314 TransitionGeneratorPtr generateTransitionList(NodePtr n) { 317 TransitionGeneratorPtr generateTransitionList(NodePtr n) {
315 TransitionGeneratorPtr tg = createTransitionGenerator(); 318 TransitionGeneratorPtr tg = createTransitionGenerator();
316 TGValue tgv; 319 TGValue tgv;
320 // initiarize tgv
317 tgv.asterisk = false; 321 tgv.asterisk = false;
318 tgv.tg = tg; 322 tgv.tg = tg;
319 tgv.tg->startState = createState(tgv,n); 323 tgv.tg->startState = createState(tgv,n);
320 NodePtr eof = createNode(NULL,'e',NULL,NULL,NULL); 324 NodePtr eof = createNode(NULL,'e',NULL,NULL,NULL);
321 tgv.tg->endState = createState(tgv,eof); 325 tgv.tg->endState = createState(tgv,eof);
322 tgv.stateBegin = 0; 326 tgv.stateBegin = 0;
323 tgv.stateEnd = 1; 327 tgv.stateEnd = 1;
328 tgv.tgState = NULL;
324 stateAllocate(n,tgv); 329 stateAllocate(n,tgv);
325 tgv.tg->stateMax = tg->stateMax; 330 tgv.tg->stateMax = tg->stateMax;
326 BitVector bi = createBitVector(tg->stateMax); 331 BitVector bi = createBitVector(tg->stateMax);
327 tgv.tg->stateArray = (StatePtr)calloc(bi.bitContainer*2,sizeof(StatePtr)); 332 tgv.tg->stateArray = (StatePtr)calloc(bi.bitContainer*2,sizeof(StatePtr));
328 generateTransition(n,tgv); 333 generateTransition(n,tgv);