#ifndef IN_LEX
-#include "gedcom.tab.h"
-#include "gedcom.h"
+#include "gedcom_internal.h"
#include "multilex.h"
#include "encoding.h"
+#include "gedcom.h"
+#include "gedcom.tab.h"
#define YY_NO_UNPUT
return CLOSE; \
} \
else { \
+ /* Reset our state */ \
+ current_level = -1; \
+ level_diff = MAXGEDCLEVEL; \
+ /* ... then terminate lex */ \
yyterminate(); \
} \
}