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.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/TokenStack.hpp')
| -rw-r--r-- | src/core/parser/stack/TokenStack.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/parser/stack/TokenStack.hpp b/src/core/parser/stack/TokenStack.hpp index 9669f50..af734bb 100644 --- a/src/core/parser/stack/TokenStack.hpp +++ b/src/core/parser/stack/TokenStack.hpp @@ -32,6 +32,7 @@ #include <vector> #include <core/common/Token.hpp> +#include <core/model/Syntax.hpp> namespace ousia { namespace parser_stack { @@ -52,7 +53,7 @@ private: * Stack containing vectors of TokenSyntaxDescriptor instances as given by * the user. */ - std::vector<std::vector<TokenSyntaxDescriptor>> stack; + std::vector<std::vector<SyntaxDescriptor>> stack; /** * Constructor of the TokenStack class. @@ -86,7 +87,7 @@ public: * @param tokens is a list of TokenSyntaxDescriptor instances that should be * stored on the stack. */ - void pushTokens(const std::vector<TokenSyntaxDescriptor> &tokens); + void pushTokens(const std::vector<SyntaxDescriptor> &tokens); /** * Removes the previously pushed list of tokens from the stack. |