added linkage type and some getters to Interpreter

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 1005c64db76e5bbbbe7f3aa800e9868e646a30cd..97ed93981e405fc1fa3a56e450ce0c51ee8ddf66 100644 (file)
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -311,7 +311,7 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
                                }
                        }
                } else {
-                       Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId());
+                       Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
                }
        }
 }
@@ -333,11 +333,11 @@ bool Interpreter::CanLink(const Value &v) const {
        return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
 }
 
-void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType) {
+void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined) {
        char *str(new char[identifier.size() + 1]);
        std::memcpy(str, identifier.c_str(), identifier.size());
        str[identifier.size()] = '\0';
-       postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType));
+       postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType, inlined));
 }
 
 

diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h
index 3202482d3d9a1e28e2a8c67ddb9a3ea181938356..b12efaedebb35fe3fac09057ffb13600aa3348ff 100644 (file)
--- a/src/loader/Interpreter.h
+++ b/src/loader/Interpreter.h
@@ -8,12 +8,14 @@
 #ifndef LOADER_INTERPRETER_H_
 #define LOADER_INTERPRETER_H_
 
+#include "ParsedSource.h"
 #include "TypeDescription.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Color.h"
 #include "../graphics/ComplexAnimation.h"
 
 #include <map>
+#include <set>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -48,7 +50,6 @@ namespace loader {
 
 class Definition;
 class Literal;
-class ParsedSource;
 class PropertyList;
 class Value;
 
@@ -72,17 +73,29 @@ public:
        void *GetObject(int typeId, const std::string &name);
 
        static void CreateTypeDescriptions();
+       struct ParsedDefinition {
+               ParsedDefinition(const Definition *dfn, int type, int id)
+               : dfn(dfn), type(type), id(id) { }
+               const Definition *dfn;
+               int type;
+               int id;
+       };
        struct PostponedDefinition {
-               PostponedDefinition(int type, int id, std::ptrdiff_t offset, const char *identifier, int linkedType)
-               : type(type), id(id), offset(offset), identifier(identifier), linkedType(linkedType) { }
+               PostponedDefinition(int type, int id, std::ptrdiff_t offset, const char *identifier, int linkedType, bool inlined)
+               : type(type), id(id), offset(offset), identifier(identifier), linkedType(linkedType), inlined(inlined) { }
                int type;
                int id;
                std::ptrdiff_t offset;
                const char *identifier;
                int linkedType;
+               bool inlined;
        };
 
-       const std::vector<PostponedDefinition> &PostponedDefinitions() { return postponedDefinitions; }
+       const std::set<std::string> &ExportedIdentifiers() const { return source.Exports(); }
+       const ParsedDefinition &GetDefinition(const std::string &identifier) const { return parsedDefinitions.at(identifier); }
+       const std::map<std::string, SDL_Surface *> &Images() const { return imageCache; }
+       const std::vector<PostponedDefinition> &PostponedDefinitions() const { return postponedDefinitions; }
+       const std::map<int, std::vector<void *> > &Values() const { return values; }
 
 private:
        void ReadDefinition(const Definition &);
@@ -95,23 +108,15 @@ private:
 
        SDL_Surface *GetImage(const std::string &);
 
+       bool CanLink(const Value &) const;
+       void Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined);
+
 private:
        const ParsedSource &source;
-       struct ParsedDefinition {
-               ParsedDefinition(const Definition *dfn, int type, int id)
-               : dfn(dfn), type(type), id(id) { }
-               const Definition *dfn;
-               int type;
-               int id;
-       };
-       std::map<std::string, ParsedDefinition> parsedDefinitions;
 
-       bool CanLink(const Value &) const;
-       void Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType);
+       std::map<std::string, ParsedDefinition> parsedDefinitions;
        std::vector<PostponedDefinition> postponedDefinitions;
-
        std::map<std::string, SDL_Surface *> imageCache;
-
        std::map<int, std::vector<void *> > values;
 
 };