diff options
author | Mike Buland <eichlan@xagasoft.com> | 2006-08-28 18:51:25 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2006-08-28 18:51:25 +0000 |
commit | c41af88a8a3dcd3e9e0ea6dcbe7df9e71eb4eedd (patch) | |
tree | e9b7b5e4f968e3a375f554dba64ff5a46cb4b62b /src/buildparser.h | |
parent | f7809b1a74da9a653b475b6fa499b078cad48c74 (diff) | |
download | build-c41af88a8a3dcd3e9e0ea6dcbe7df9e71eb4eedd.tar.gz build-c41af88a8a3dcd3e9e0ea6dcbe7df9e71eb4eedd.tar.bz2 build-c41af88a8a3dcd3e9e0ea6dcbe7df9e71eb4eedd.tar.xz build-c41af88a8a3dcd3e9e0ea6dcbe7df9e71eb4eedd.zip |
Finished getting everything to build with the new changes. Parser is now the
generic base class for anything that could create a build object.
Diffstat (limited to 'src/buildparser.h')
-rw-r--r-- | src/buildparser.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/buildparser.h b/src/buildparser.h index 642cc73..2e1924c 100644 --- a/src/buildparser.h +++ b/src/buildparser.h | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <list> | 6 | #include <list> |
7 | #include <utility> | 7 | #include <utility> |
8 | #include "build.tab.h" | 8 | #include "build.tab.h" |
9 | #include "parser.h" | ||
9 | 10 | ||
10 | class Build; | 11 | class Build; |
11 | class BuildParser; | 12 | class BuildParser; |
@@ -46,7 +47,7 @@ enum eSetHow | |||
46 | setAdd | 47 | setAdd |
47 | }; | 48 | }; |
48 | 49 | ||
49 | class BuildParser | 50 | class BuildParser : public Parser |
50 | { | 51 | { |
51 | typedef std::pair<std::string, Function *> BuildListItem; | 52 | typedef std::pair<std::string, Function *> BuildListItem; |
52 | typedef std::list<BuildListItem> BuildList; | 53 | typedef std::list<BuildListItem> BuildList; |
@@ -56,13 +57,9 @@ public: | |||
56 | BuildParser(); | 57 | BuildParser(); |
57 | virtual ~BuildParser(); | 58 | virtual ~BuildParser(); |
58 | 59 | ||
59 | void error( YYLTYPE *locp, const char *msg ); | ||
60 | void error( const std::string &msg ); | ||
61 | |||
62 | Build *load( const std::string &sFile ); | 60 | Build *load( const std::string &sFile ); |
63 | 61 | ||
64 | private: | 62 | private: |
65 | std::string file; | ||
66 | void scanBegin(); | 63 | void scanBegin(); |
67 | void scanEnd(); | 64 | void scanEnd(); |
68 | 65 | ||