Merge branch 'menus'

[l2e.git] / src / loader / Parser.h

diff --git a/src/loader/Parser.h b/src/loader/Parser.h
index ebfeafaacf0f9c081a0c60512818647ff0311350..963c37710a5fad58e3bd4bf2fb085888b745317a 100644 (file)
--- a/src/loader/Parser.h
+++ b/src/loader/Parser.h
@@ -8,6 +8,7 @@
 #ifndef LOADER_PARSER_H_
 #define LOADER_PARSER_H_
 
+#include "fwd.h"
 #include "ParsedSource.h"
 #include "Tokenizer.h"
 
@@ -18,11 +19,6 @@
 
 namespace loader {
 
-class Declaration;
-class Definition;
-class Literal;
-class PropertyList;
-
 class Parser {
 
 public:
@@ -66,12 +62,15 @@ private:
        Literal *ParseArray();
        Literal *ParseColor();
        Literal *ParseVector();
+       Literal *ParseScript();
 
 private:
        void AssertTokenType(Tokenizer::Token::Type actual, Tokenizer::Token::Type expected);
        void AssertTokenType(Tokenizer::Token::Type actual, Tokenizer::Token::Type expected, const std::string &msg);
        bool BeginningOfLiteral(const Tokenizer::Token &) const;
+       bool BeginningOfPrimitiveLiteral(const Tokenizer::Token &) const;
        bool BeginOfPropertyList(const Tokenizer::Token &) const;
+       bool BeginningOfScriptLiteral(const Tokenizer::Token &) const;
 
 private:
        std::string file;