From c8542506580c0fa247bbb44c169a2cb1244577e4 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Mon, 23 Jan 2017 16:34:20 -0800
Subject: preproc incbins

---
 tools/scaninc/c_file.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 tools/scaninc/c_file.h

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

diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h
new file mode 100644
index 000000000..fcd327d28
--- /dev/null
+++ b/tools/scaninc/c_file.h
@@ -0,0 +1,54 @@
+// Copyright(c) 2017 YamaArashi
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#ifndef C_FILE_H
+#define C_FILE_H
+
+#include <string>
+#include <set>
+#include <memory>
+#include "scaninc.h"
+
+class CFile
+{
+public:
+    CFile(std::string path);
+    ~CFile();
+    void FindIncbins();
+    const std::set<std::string>& GetIncbins() { return m_incbins; }
+
+private:
+    char *m_buffer;
+    int m_pos;
+    int m_size;
+    int m_lineNum;
+    std::string m_path;
+    std::set<std::string> m_incbins;
+
+    void CFile::RemoveComments();
+    bool ConsumeHorizontalWhitespace();
+    bool ConsumeNewline();
+    void SkipWhitespace();
+    std::unique_ptr<unsigned char[]> CFile::ReadWholeFile(const std::string& path, int& size);
+    bool CheckIdentifier(const std::string& ident);
+    void CheckIncbin();
+};
+
+#endif // C_FILE_H
-- 
cgit v1.2.3


From 72bc8f23d37c6efd68ad4a0f86ba87b6cd3db4d2 Mon Sep 17 00:00:00 2001
From: Cameron Hall <camthesaxman@users.noreply.github.com>
Date: Thu, 26 Jan 2017 01:15:49 -0500
Subject: make scaninc build under GCC (#218)

---
 tools/scaninc/c_file.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h
index fcd327d28..2503acac1 100644
--- a/tools/scaninc/c_file.h
+++ b/tools/scaninc/c_file.h
@@ -42,11 +42,11 @@ private:
     std::string m_path;
     std::set<std::string> m_incbins;
 
-    void CFile::RemoveComments();
+    void RemoveComments();
     bool ConsumeHorizontalWhitespace();
     bool ConsumeNewline();
     void SkipWhitespace();
-    std::unique_ptr<unsigned char[]> CFile::ReadWholeFile(const std::string& path, int& size);
+    std::unique_ptr<unsigned char[]> ReadWholeFile(const std::string& path, int& size);
     bool CheckIdentifier(const std::string& ident);
     void CheckIncbin();
 };
-- 
cgit v1.2.3


From 7c96b16179792a044ded6ade1b74cdb1c0b870a5 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 3 Feb 2017 23:16:28 -0600
Subject: use std:: prefix and remove some unused functions

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

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

diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h
index 2503acac1..922cb4639 100644
--- a/tools/scaninc/c_file.h
+++ b/tools/scaninc/c_file.h
@@ -46,7 +46,6 @@ private:
     bool ConsumeHorizontalWhitespace();
     bool ConsumeNewline();
     void SkipWhitespace();
-    std::unique_ptr<unsigned char[]> ReadWholeFile(const std::string& path, int& size);
     bool CheckIdentifier(const std::string& ident);
     void CheckIncbin();
 };
-- 
cgit v1.2.3