"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/config/configcompiler.hpp" between
icinga2-2.11.5.tar.gz and icinga2-2.12.0.tar.gz

About: Icinga 2 is an enterprise grade monitoring system which keeps watch over networks and any conceivable network resource.

configcompiler.hpp  (icinga2-2.11.5):configcompiler.hpp  (icinga2-2.12.0)
skipping to change at line 12 skipping to change at line 12
#ifndef CONFIGCOMPILER_H #ifndef CONFIGCOMPILER_H
#define CONFIGCOMPILER_H #define CONFIGCOMPILER_H
#include "config/i2-config.hpp" #include "config/i2-config.hpp"
#include "config/expression.hpp" #include "config/expression.hpp"
#include "base/debuginfo.hpp" #include "base/debuginfo.hpp"
#include "base/registry.hpp" #include "base/registry.hpp"
#include "base/initialize.hpp" #include "base/initialize.hpp"
#include "base/singleton.hpp" #include "base/singleton.hpp"
#include "base/string.hpp"
#include <future> #include <future>
#include <iostream> #include <iostream>
#include <stack> #include <stack>
typedef union YYSTYPE YYSTYPE; typedef union YYSTYPE YYSTYPE;
typedef void *yyscan_t; typedef void *yyscan_t;
namespace icinga namespace icinga
{ {
skipping to change at line 95 skipping to change at line 96
static void AddIncludeSearchDir(const String& dir); static void AddIncludeSearchDir(const String& dir);
const char *GetPath() const; const char *GetPath() const;
void SetZone(const String& zone); void SetZone(const String& zone);
String GetZone() const; String GetZone() const;
void SetPackage(const String& package); void SetPackage(const String& package);
String GetPackage() const; String GetPackage() const;
void AddImport(const std::shared_ptr<Expression>& import); void AddImport(const Expression::Ptr& import);
std::vector<std::shared_ptr<Expression> > GetImports() const; std::vector<Expression::Ptr> GetImports() const;
static void CollectIncludes(std::vector<std::unique_ptr<Expression> >& ex pressions, static void CollectIncludes(std::vector<std::unique_ptr<Expression> >& ex pressions,
const String& file, const String& zone, const String& package); const String& file, const String& zone, const String& package);
static std::unique_ptr<Expression> HandleInclude(const String& relativeBa se, const String& path, bool search, static std::unique_ptr<Expression> HandleInclude(const String& relativeBa se, const String& path, bool search,
const String& zone, const String& package, const DebugInfo& debug info = DebugInfo()); const String& zone, const String& package, const DebugInfo& debug info = DebugInfo());
static std::unique_ptr<Expression> HandleIncludeRecursive(const String& r elativeBase, const String& path, static std::unique_ptr<Expression> HandleIncludeRecursive(const String& r elativeBase, const String& path,
const String& pattern, const String& zone, const String& package, const DebugInfo& debuginfo = DebugInfo()); const String& pattern, const String& zone, const String& package, const DebugInfo& debuginfo = DebugInfo());
static std::unique_ptr<Expression> HandleIncludeZones(const String& relat iveBase, const String& tag, static std::unique_ptr<Expression> HandleIncludeZones(const String& relat iveBase, const String& tag,
const String& path, const String& pattern, const String& package, const DebugInfo& debuginfo = DebugInfo()); const String& path, const String& pattern, const String& package, const DebugInfo& debuginfo = DebugInfo());
size_t ReadInput(char *buffer, size_t max_bytes); size_t ReadInput(char *buffer, size_t max_bytes);
void *GetScanner() const; void *GetScanner() const;
static std::vector<ZoneFragment> GetZoneDirs(const String& zone); static std::vector<ZoneFragment> GetZoneDirs(const String& zone);
static void RegisterZoneDir(const String& tag, const String& ppath, const String& zoneName); static void RegisterZoneDir(const String& tag, const String& ppath, const String& zoneName);
static bool HasZoneConfigAuthority(const String& zoneName); static bool HasZoneConfigAuthority(const String& zoneName);
private: private:
std::promise<std::shared_ptr<Expression> > m_Promise; std::promise<Expression::Ptr> m_Promise;
String m_Path; String m_Path;
std::istream *m_Input; std::istream *m_Input;
String m_Zone; String m_Zone;
String m_Package; String m_Package;
std::vector<std::shared_ptr<Expression> > m_Imports; std::vector<Expression::Ptr> m_Imports;
void *m_Scanner; void *m_Scanner;
static std::vector<String> m_IncludeSearchDirs; static std::vector<String> m_IncludeSearchDirs;
static boost::mutex m_ZoneDirsMutex; static boost::mutex m_ZoneDirsMutex;
static std::map<String, std::vector<ZoneFragment> > m_ZoneDirs; static std::map<String, std::vector<ZoneFragment> > m_ZoneDirs;
void InitializeScanner(); void InitializeScanner();
void DestroyScanner(); void DestroyScanner();
static void HandleIncludeZone(const String& relativeBase, const String& t ag, const String& path, const String& pattern, const String& package, std::vecto r<std::unique_ptr<Expression> >& expressions); static void HandleIncludeZone(const String& relativeBase, const String& t ag, const String& path, const String& pattern, const String& package, std::vecto r<std::unique_ptr<Expression> >& expressions);
static bool IsAbsolutePath(const String& path); static bool IsAbsolutePath(const String& path);
public: public:
bool m_Eof; bool m_Eof;
int m_OpenBraces; int m_OpenBraces;
std::ostringstream m_LexBuffer; String m_LexBuffer;
CompilerDebugInfo m_LocationBegin; CompilerDebugInfo m_LocationBegin;
std::stack<bool> m_IgnoreNewlines; std::stack<bool> m_IgnoreNewlines;
std::stack<bool> m_Apply; std::stack<bool> m_Apply;
std::stack<bool> m_ObjectAssign; std::stack<bool> m_ObjectAssign;
std::stack<bool> m_SeenAssign; std::stack<bool> m_SeenAssign;
std::stack<bool> m_SeenIgnore; std::stack<bool> m_SeenIgnore;
std::stack<Expression *> m_Assign; std::stack<Expression *> m_Assign;
std::stack<Expression *> m_Ignore; std::stack<Expression *> m_Ignore;
std::stack<String> m_FKVar; std::stack<String> m_FKVar;
 End of changes. 5 change blocks. 
5 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)