diff options
author | Mike Buland <eichlan@xagasoft.com> | 2006-09-10 22:27:37 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2006-09-10 22:27:37 +0000 |
commit | 97d529fac68105f0d3d34c699a4ac10489c705e8 (patch) | |
tree | 409473d54238525c7b41347458448a19c909ad8a /src/build.h | |
parent | 47cda1de3cfde56d8a8a69d535d38309bc2b7981 (diff) | |
download | build-97d529fac68105f0d3d34c699a4ac10489c705e8.tar.gz build-97d529fac68105f0d3d34c699a4ac10489c705e8.tar.bz2 build-97d529fac68105f0d3d34c699a4ac10489c705e8.tar.xz build-97d529fac68105f0d3d34c699a4ac10489c705e8.zip |
Almost done tweaking the variable system, it needed support for local, or
"extra" variables.
Diffstat (limited to 'src/build.h')
-rw-r--r-- | src/build.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/build.h b/src/build.h index d5e6604..080304b 100644 --- a/src/build.h +++ b/src/build.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #include "stringproc.h" | 13 | #include "stringproc.h" |
14 | 14 | ||
15 | subExceptionDecl( BuildException ); | 15 | subExceptionDecl( BuildException ); |
16 | typedef std::map<std::string, std::string> VarMap; | ||
16 | 17 | ||
17 | class Build | 18 | class Build |
18 | { | 19 | { |
@@ -35,20 +36,19 @@ public: | |||
35 | 36 | ||
36 | void set( const std::string &cont, const std::string &var, const std::string &val ); | 37 | void set( const std::string &cont, const std::string &var, const std::string &val ); |
37 | void setAdd( const std::string &cont, const std::string &var, const std::string &val ); | 38 | void setAdd( const std::string &cont, const std::string &var, const std::string &val ); |
38 | std::string getVar( const std::string &cont, const std::string &var ); | 39 | std::string getVar( const std::string &cont, const std::string &var, VarMap *mExtra ); |
39 | 40 | ||
40 | Rule *getRule( const std::string &name ); | 41 | Rule *getRule( const std::string &name ); |
41 | 42 | ||
42 | void debugDump(); | 43 | void debugDump(); |
43 | 44 | ||
44 | void setStringProc( StringProc *pStrProc ); | 45 | void setStringProc( StringProc *pStrProc ); |
45 | std::string replVars( const std::string &sSrc, const std::string &sCont ); | 46 | std::string replVars( const std::string &sSrc, const std::string &sCont, VarMap *mExtra ); |
46 | 47 | ||
47 | private: | 48 | private: |
48 | typedef std::map<std::string, Target *> TargetMap; | 49 | typedef std::map<std::string, Target *> TargetMap; |
49 | typedef std::list<std::string> StringList; | 50 | typedef std::list<std::string> StringList; |
50 | typedef std::map<std::string, StringList> ReqMap; | 51 | typedef std::map<std::string, StringList> ReqMap; |
51 | typedef std::map<std::string, std::string> VarMap; | ||
52 | typedef std::map<std::string, VarMap> ContextMap; | 52 | typedef std::map<std::string, VarMap> ContextMap; |
53 | typedef std::map<std::string, Rule *> RuleMap; | 53 | typedef std::map<std::string, Rule *> RuleMap; |
54 | typedef std::map<std::string, Action *> ActionMap; | 54 | typedef std::map<std::string, Action *> ActionMap; |