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/Callbacks.hpp | |
| 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/Callbacks.hpp')
| -rw-r--r-- | src/core/parser/stack/Callbacks.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/parser/stack/Callbacks.hpp b/src/core/parser/stack/Callbacks.hpp index 8acc02d..092664a 100644 --- a/src/core/parser/stack/Callbacks.hpp +++ b/src/core/parser/stack/Callbacks.hpp @@ -34,6 +34,7 @@ #include <core/common/Whitespace.hpp> #include <core/common/Token.hpp> +#include <core/model/Syntax.hpp> namespace ousia { @@ -86,9 +87,7 @@ public: * @param tokens is a list of TokenSyntaxDescriptor instances that should be * stored on the stack. */ - virtual void pushTokens( - const std::vector<TokenSyntaxDescriptor> &tokens) = 0; - + void pushTokens(const std::vector<SyntaxDescriptor> &tokens); /** * Removes the previously pushed list of tokens from the stack. */ |