diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-03-02 18:09:11 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2015-03-02 18:09:11 +0100 |
| commit | 6f85642ed2a76701dc1811aaa0616180ac01a9fa (patch) | |
| tree | 958a792585829c0caefd0522eb34e95da8c74ff2 /src/core/parser/stack/TokenStack.cpp | |
| parent | 3cc6ebf406c53b0c82a52f0daf1ce14c62f7b521 (diff) | |
| parent | 24c7a8d1e62dc52298ea1abdc8b44d70fff94b54 (diff) | |
Merge branch 'astoecke_tokens' of ssh://somweyr.de/var/local/git/ousia into astoecke_tokens
Conflicts:
application/src/core/parser/stack/Handler.hpp
Diffstat (limited to 'src/core/parser/stack/TokenStack.cpp')
| -rw-r--r-- | src/core/parser/stack/TokenStack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/parser/stack/TokenStack.cpp b/src/core/parser/stack/TokenStack.cpp index 6afeaed..ac1d94e 100644 --- a/src/core/parser/stack/TokenStack.cpp +++ b/src/core/parser/stack/TokenStack.cpp @@ -21,7 +21,7 @@ namespace ousia { namespace parser_stack { -void TokenStack::pushTokens(const std::vector<TokenSyntaxDescriptor> &tokens) +void TokenStack::pushTokens(const std::vector<SyntaxDescriptor> &tokens) { stack.push_back(tokens); } @@ -35,7 +35,7 @@ TokenSet TokenStack::tokens() const } TokenSet res; - for (const TokenSyntaxDescriptor &descr : stack.back()) { + for (const SyntaxDescriptor &descr : stack.back()) { descr.insertIntoTokenSet(res); } return res; |