From 0faa6c9c93804c4ce0e6fc8e5a6d5cfbc85f01da Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 22 Jul 2017 18:49:38 -0400
Subject: scaninc: read c includes

Now editing .h files triggers a rebuild.
Also allow .h and .inc files to be passed as a main argument.
src/ and include/ are temporarily hardcoded.
---
 tools/scaninc/c_file.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools/scaninc/c_file.h')

diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h
index 922cb4639..38b10f04e 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();
     void SkipWhitespace();
     bool CheckIdentifier(const std::string& ident);
+    void CheckInclude();
     void CheckIncbin();
+    std::string ReadPath();
 };
 
 #endif // C_FILE_H
-- 
cgit v1.2.3


From e73ec108adb15cda40c17ebe891d25460c3c42b3 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sun, 23 Jul 2017 22:34:49 -0400
Subject: scaninc: skipping comments seems to be faster than removing them

---
 tools/scaninc/c_file.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/scaninc/c_file.h')

diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h
index 38b10f04e..618901b85 100644
--- a/tools/scaninc/c_file.h
+++ b/tools/scaninc/c_file.h
@@ -44,9 +44,9 @@ private:
     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();
-- 
cgit v1.2.3