Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Added more fine print towards being able to calculate the set of possible (expected) events in case of validation error. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | wip |
| Files: | files | file ages | folders |
| SHA3-256: |
6a02d5bab558c9ff1965a9ff1ab0cd5a |
| User & Date: | rolf 2019-11-01 15:42:21 |
Context
|
2019-11-02
| ||
| 01:29 | The SchemaValidationStack struct element activeChild (which turned into a misnomer by the last moves) - together with the hasMatched element - now gives the position of the last matched content particle (was the child to start look at for the next event). check-in: e795f2b9f0 user: rolf tags: wip | |
|
2019-11-01
| ||
| 15:42 | Added more fine print towards being able to calculate the set of possible (expected) events in case of validation error. check-in: 6a02d5bab5 user: rolf tags: wip | |
|
2019-10-31
| ||
| 14:12 | Work on validation error recovery continues. Since there seems to be no silver bullet, this throws code sprinkled all over the code to make some progress. check-in: 70f5d362f7 user: rolf tags: wip | |
Changes
Changes to generic/schema.c.
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
...
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
|
stackElm = TMALLOC (SchemaValidationStack);
}
memset (stackElm, 0, sizeof (SchemaValidationStack));
stackElm->pattern = pattern;
return stackElm;
}
static void
pushToStack (
SchemaData *sdata,
SchemaCP *pattern,
int ac
)
{
SchemaValidationStack *se;
DBG(fprintf(stderr, "push to Stack:\n");serializeCP(pattern));
se = getStackElement (sdata, pattern);
/* if (sdata->stack) sdata->stack->activeChild = ac; */
se->down = sdata->stack;
if (pattern->type == SCHEMA_CTYPE_INTERLEAVE) {
se->interleaveState = MALLOC (sizeof (int) * pattern->nc);
memset (se->interleaveState, 0, sizeof (int) * pattern->nc);
}
sdata->stack = se;
}
static void
repoolStackElement (
SchemaData *sdata,
SchemaValidationStack *se
)
{
if (se->interleaveState) {
FREE (se->interleaveState);
se->interleaveState = NULL;
}
se->down = sdata->stackPool;
sdata->stackPool = se;
}
static void
savelastMatchse (
SchemaData *sdata,
int add
)
{
................................................................................
static void
popFromStack (
SchemaData *sdata,
SchemaValidationStack **stack
)
{
SchemaValidationStack *se;
DBG(fprintf(stderr, "pop from Stack:\n");serializeCP(sdata->stack->pattern));
se = (*stack)->down;
repoolStackElement (sdata, *stack);
*stack = se;
}
#define popStack(sdata) popFromStack (sdata, &sdata->stack)
static void
finalizeElement (
SchemaData *sdata,
int ac
)
{
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
...
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
|
stackElm = TMALLOC (SchemaValidationStack);
}
memset (stackElm, 0, sizeof (SchemaValidationStack));
stackElm->pattern = pattern;
return stackElm;
}
static void
repoolStackElement (
SchemaData *sdata,
SchemaValidationStack *se
)
{
if (se->interleaveState) {
FREE (se->interleaveState);
se->interleaveState = NULL;
}
se->down = sdata->stackPool;
sdata->stackPool = se;
}
static void
pushToStack (
SchemaData *sdata,
SchemaCP *pattern,
int ac
)
{
SchemaValidationStack *se, *nextse;
DBG(fprintf(stderr, "push to Stack:\n");serializeCP(pattern));
if (pattern->type == SCHEMA_CTYPE_NAME && sdata->lastMatchse) {
se = sdata->lastMatchse;
while (se) {
nextse = se->down;
repoolStackElement (sdata, se);
se = nextse;
}
sdata->lastMatchse = NULL;
}
se = getStackElement (sdata, pattern);
/* if (sdata->stack) sdata->stack->activeChild = ac; */
se->down = sdata->stack;
if (pattern->type == SCHEMA_CTYPE_INTERLEAVE) {
se->interleaveState = MALLOC (sizeof (int) * pattern->nc);
memset (se->interleaveState, 0, sizeof (int) * pattern->nc);
}
sdata->stack = se;
}
static void
savelastMatchse (
SchemaData *sdata,
int add
)
{
................................................................................
static void
popFromStack (
SchemaData *sdata,
SchemaValidationStack **stack
)
{
SchemaValidationStack *se;
DBG(fprintf(stderr, "popFromStack:\n"); serializeCP((*stack)->pattern));
se = (*stack)->down;
repoolStackElement (sdata, *stack);
*stack = se;
}
static void
popStack (
SchemaData *sdata
)
{
SchemaValidationStack *se, *nextse;
DBG(fprintf(stderr, "popStack:\n"); serializeCP(sdata->stack->pattern));
if (sdata->stack->pattern->type == SCHEMA_CTYPE_NAME) {
se = sdata->lastMatchse;
while (se) {
nextse = se->down;
repoolStackElement (sdata, se);
se = nextse;
}
sdata->lastMatchse = NULL;
se = sdata->stack->down;
repoolStackElement (sdata, sdata->stack);
sdata->stack = se;
} else {
if (sdata->stack->activeChild > 0 || sdata->stack->hasMatched) {
se = sdata->stack->down;
sdata->stack->down = sdata->lastMatchse;
sdata->lastMatchse = sdata->stack;
sdata->stack = se;
} else {
se = sdata->stack->down;
repoolStackElement (sdata, sdata->stack);
sdata->stack = se;
}
}
}
static void
finalizeElement (
SchemaData *sdata,
int ac
)
{
|