xdrm-brackets
/
php-linter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fix[ automate browse now rewinds each state looking for new available path

This commit is contained in:
xdrm-brackets 2017-05-15 12:38:35 +02:00
parent 1a010ce854
commit a206cf57b0
2 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/automate/automate.c
View File

@ -25,6 +25,7 @@ unsigned int browse(struct Automate* pAutomate, const char* pString){
char* pathmem = malloc( strlen(pString) ); // will contain edge number for each dot char* pathmem = malloc( strlen(pString) ); // will contain edge number for each dot
unsigned int* indexmem = malloc( sizeof(unsigned int) * strlen(pString) ); // will contain offset of @pString for each dot unsigned int* indexmem = malloc( sizeof(unsigned int) * strlen(pString) ); // will contain offset of @pString for each dot
char* dotmem = malloc( strlen(pString) );
/* [1] For each char /* [1] For each char
=========================================================*/ =========================================================*/
@ -52,14 +53,16 @@ unsigned int browse(struct Automate* pAutomate, const char* pString){
/* (1) Check if the current char can lead to a state /* (1) Check if the current char can lead to a state
---------------------------------------------------------*/ ---------------------------------------------------------*/
/* (1) Check current state choices */ /* (1) Check current state choices */
dotPtr = pAutomate->dot[pAutomate->dCurrent]; dotmem[c] = pAutomate->dCurrent;
i = pathmem[c]; dotPtr = pAutomate->dot[dotmem[c]];
l = dotPtr.n;
indexmem[c] = strIndex; indexmem[c] = strIndex;
l = dotPtr.n;
i = pathmem[c];
// printf("* state %d\n", pAutomate->dCurrent);
/* (2) If no more path for this branch -> exit */ /* (2) If no more path for this branch -> exit */
if( i >= l ) if( c == 0 && i >= l )
break; break;
@ -76,23 +79,25 @@ unsigned int browse(struct Automate* pAutomate, const char* pString){
if( strcmp(buffer, ptr) == 0 ){ if( strcmp(buffer, ptr) == 0 ){
pAutomate->dCurrent = dotPtr.dot[i]; pAutomate->dCurrent = dotPtr.dot[i];
strIndex += strlen(ptr); strIndex += strlen(ptr);
pathmem[c] = i;
break;
} }
/* (4) If AUTOMATE match */ /* (4) If AUTOMATE match */
}else{ }else{
recursive = browse(&pAutomate->aedge[dotPtr.edge[i]], pString+strIndex); recursive = browse(&pAutomate->aedge[dotPtr.edge[i]], pString+strIndex);
if( pAutomate->aedge[dotPtr.edge[i]].dCurrent == pAutomate->aedge[dotPtr.edge[i]].dFinal ){ if( pAutomate->aedge[dotPtr.edge[i]].dCurrent == pAutomate->aedge[dotPtr.edge[i]].dFinal ){
pAutomate->dCurrent = dotPtr.dot[i]; pAutomate->dCurrent = dotPtr.dot[i];
strIndex += recursive; strIndex += recursive;
pathmem[c] = i;
break;
} }
} }
} }
/* (5) If no more path */ /* (5) If no more path */
if( strIndex == indexmem[c] ){ if( strIndex == indexmem[c] ){
@ -103,9 +108,18 @@ unsigned int browse(struct Automate* pAutomate, const char* pString){
// else next path of previous branch // else next path of previous branch
strIndex = indexmem[c]; strIndex = indexmem[c];
pathmem[c]++; pathmem[c]++;
// printf("* back\n"); pAutomate->dCurrent = dotmem[c];
}else // printf("* back to q%d:%d\n", dotmem[c], pathmem[c]);
/* (6) Next branch + reset data (if already browsed in other path) */
}else{
// printf("q%d -%.1s-> q%d\n", c, pString+indexmem[c], pAutomate->dCurrent);
c++; c++;
pathmem[c] = 0;
}
} }
@ -258,7 +272,7 @@ char addStringTransition(struct Automate* pAutomate, const char* pSedge){
/* [1] Reallocate memory for sedge /* [1] Reallocate memory for sedge
=========================================================*/ =========================================================*/
pAutomate->sedge = realloc(pAutomate->sedge, sizeof(char) * pAutomate->sedges ); pAutomate->sedge = realloc(pAutomate->sedge, sizeof(char*) * pAutomate->sedges);
pAutomate->sedge[index] = malloc( strlen(pSedge)+1 ); pAutomate->sedge[index] = malloc( strlen(pSedge)+1 );

51
src/linter.c
View File

@ -22,37 +22,42 @@ int main(int argc, char* argv[]){
/** TEST **/ /** TEST **/
/** BUILD AUTOMATE **/ /** BUILD AUTOMATE **/
// B = c*d
struct Automate b = createAutomate();
addDot(&b);
addDot(&b);
addStringTransition(&b, "c\0");
addStringTransition(&b, "d\0");
linkSEdge(&b, 0, 0, 0); // 0-0
linkSEdge(&b, 0, 1, 1); // 0-1
// A = a+B = a+c*d // A = a+(bcx+bcd)
struct Automate a = createAutomate(); struct Automate a = createAutomate();
addDot(&a); addDot(&a); // q0
addDot(&a); addDot(&a); // q1
addDot(&a); addDot(&a); // q2
addStringTransition(&a, "a\0"); addDot(&a); // q3
addAutomateTransition(&a, &b); addDot(&a); // q4
linkSEdge(&a, 0, 1, 0); // 0-0 addDot(&a); // q5
linkSEdge(&a, 1, 1, 0); // 1-0
linkAEdge(&a, 1, 2, 0); // 1-1
printf("browse 'acd' : %d\n", browse(&a, "acd")); addStringTransition(&a, "a\0"); // t0
addStringTransition(&a, "b\0"); // t1
addStringTransition(&a, "c\0"); // t2
addStringTransition(&a, "d\0"); // t3
addStringTransition(&a, "x\0"); // t4
linkSEdge(&a, 0, 1, 0); // q0 -t0-> q1 || branch-0 path-0
linkSEdge(&a, 1, 1, 0); // q1 -t0-> q1 || branch-1 path-0
linkSEdge(&a, 1, 2, 1); // q1 -t1-> q2 || branch-1 path-1
linkSEdge(&a, 2, 3, 2); // q2 -t2-> q3 || branch-2 path-0
linkSEdge(&a, 3, 5, 4); // q2 -t4-> q5 || branch-3 path-0
linkSEdge(&a, 1, 4, 1); // q1 -t1-> q4 || branch-1 path-2
linkSEdge(&a, 4, 4, 2); // q4 -t2-> q4 || branch-4 path-0
linkSEdge(&a, 4, 5, 3); // q4 -t3-> q5 || branch-4 path-1
printf("browse 'abcx' : %d\n", browse(&a, "abcx"));
printf("* final_state: %d\n", a.dCurrent); printf("* final_state: %d\n", a.dCurrent);
printf("browse 'ad' : %d\n", browse(&a, "ad")); printf("browse 'abcd' : %d\n", browse(&a, "abcd"));
printf("* final_state: %d\n", a.dCurrent); printf("* final_state: %d\n", a.dCurrent);
printf("browse 'aad' : %d\n", browse(&a, "aad")); printf("browse 'aaaaaaabcx' : %d\n", browse(&a, "aaaaaaabcx"));
printf("* final_state: %d\n", a.dCurrent); printf("* final_state: %d\n", a.dCurrent);
printf("browse 'acccd' : %d\n", browse(&a, "acccd")); printf("browse 'aaabc' : %d\n", browse(&a, "aaabc"));
printf("* final_state: %d\n", a.dCurrent); printf("* final_state: %d\n", a.dCurrent);
printf("browse 'aaaacccd' : %d\n", browse(&a, "aaaacccd")); printf("browse 'aaabd' : %d\n", browse(&a, "aaabd"));
printf("* final_state: %d\n", a.dCurrent); printf("* final_state: %d\n", a.dCurrent);
printf("browse 'aaaaccc' : %d\n", browse(&a, "aaaaccc")); printf("browse 'bc' : %d\n", browse(&a, "bc"));
printf("* final_state: %d\n", a.dCurrent); printf("* final_state: %d\n", a.dCurrent);
/* Build RegExp */ /* Build RegExp */