diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-04-17 01:20:27 +0200 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2016-04-25 22:26:13 +0200 |
| commit | 93e69ca433401c0224edc1d23462c3ff2051a82b (patch) | |
| tree | 53a0a54c9fc2db86c18fac2291f6ca9bc98918bd | |
| parent | 0516c20666567049f81d45890e6f25ae0170c84c (diff) | |
Do not handle tokens if the current handler is not valid.
Fixes crash bug in added integration test.
| -rw-r--r-- | src/core/parser/stack/Stack.cpp | 8 | ||||
| -rw-r--r-- | testdata/integration/user_defined_syntax/token_in_invalid_command.fail.osml | 15 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/core/parser/stack/Stack.cpp b/src/core/parser/stack/Stack.cpp index 2ad5c8b..2acea32 100644 --- a/src/core/parser/stack/Stack.cpp +++ b/src/core/parser/stack/Stack.cpp @@ -692,7 +692,7 @@ ssize_t StackImpl::pendingCloseTokenHandlerIdx(TokenId token) const TokenSet StackImpl::currentTokens() const { TokenSet res; - if (currentInfo().state().supportsTokens) { + if (currentInfo().valid && currentInfo().state().supportsTokens) { res = tokenStack.tokens(); ssize_t idx = pendingCloseTokenHandlerIdx(); if (idx >= 0) { @@ -1111,6 +1111,12 @@ bool StackImpl::handleOpenTokens(Logger &logger, const Token &token, void StackImpl::handleToken(const Token &token) { + // If the current handler is not valid, just ignore the token + // TODO: Unify the handling of invalid elements across this class + if (!handlersValid()) { + return; + } + // If the token matches one from the "pendingCloseTokens" list, then just // end the corresponding handler const ssize_t pendingCloseIndex = pendingCloseTokenHandlerIdx(token.id); diff --git a/testdata/integration/user_defined_syntax/token_in_invalid_command.fail.osml b/testdata/integration/user_defined_syntax/token_in_invalid_command.fail.osml new file mode 100644 index 0000000..b424c6b --- /dev/null +++ b/testdata/integration/user_defined_syntax/token_in_invalid_command.fail.osml @@ -0,0 +1,15 @@ +\document + +\ontology#test + \struct#test[root=true] + \field + \childRef[ref=a] + \struct#a + \syntax + \short{-} + +\begin{test} + \b{a-} + \b{a-} +\end{test} + |