summaryrefslogtreecommitdiff
path: root/tools/scaninc/c_file.h
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-01-09 16:48:01 -0500
committergolem galvanize <golemgalvanize@github.com>2018-01-09 16:48:01 -0500
commitc7722a492017dbd8a5fb3bb216062eb62129daf5 (patch)
tree2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /tools/scaninc/c_file.h
parent2d141bc612ffecc984f6b4238c2791ba8419a192 (diff)
parent85174ad6193d3d58b92deaaedf8c510440ed85ee (diff)
fixing merge conflicts
Diffstat (limited to 'tools/scaninc/c_file.h')
-rw-r--r--tools/scaninc/c_file.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h
index 922cb4639..618901b85 100644
--- a/tools/scaninc/c_file.h
+++ b/tools/scaninc/c_file.h
@@ -33,6 +33,7 @@ public:
~CFile();
void FindIncbins();
const std::set<std::string>& GetIncbins() { return m_incbins; }
+ const std::set<std::string>& GetIncludes() { return m_includes; }
private:
char *m_buffer;
@@ -41,13 +42,16 @@ private:
int m_lineNum;
std::string m_path;
std::set<std::string> m_incbins;
+ std::set<std::string> m_includes;
- void RemoveComments();
bool ConsumeHorizontalWhitespace();
bool ConsumeNewline();
+ bool ConsumeComment();
void SkipWhitespace();
bool CheckIdentifier(const std::string& ident);
+ void CheckInclude();
void CheckIncbin();
+ std::string ReadPath();
};
#endif // C_FILE_H