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/preproc/asm_file.cpp | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

(limited to 'tools/preproc/asm_file.cpp')

diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp
index 7deaccc8a..49c9e3c66 100644
--- a/tools/preproc/asm_file.cpp
+++ b/tools/preproc/asm_file.cpp
@@ -111,45 +111,22 @@ void AsmFile::RemoveComments()
             m_buffer[pos++] = ' ';
             m_buffer[pos++] = ' ';
 
-            char commentStringChar = 0;
-
             for (;;)
             {
                 if (m_buffer[pos] == 0)
                     return;
 
-                if (commentStringChar != 0)
+                if (m_buffer[pos] == '*' && m_buffer[pos + 1] == '/')
                 {
-                    if (m_buffer[pos] == '\\' && m_buffer[pos + 1] == commentStringChar)
-                    {
-                        m_buffer[pos++] = ' ';
-                        m_buffer[pos++] = ' ';
-                    }
-                    else
-                    {
-                        if (m_buffer[pos] == commentStringChar)
-                            commentStringChar = 0;
-                        if (m_buffer[pos] != '\n')
-                            m_buffer[pos] = ' ';
-                        pos++;
-                    }
+                    m_buffer[pos++] = ' ';
+                    m_buffer[pos++] = ' ';
+                    break;
                 }
                 else
                 {
-                    if (m_buffer[pos] == '*' && m_buffer[pos + 1] == '/')
-                    {
-                        m_buffer[pos++] = ' ';
-                        m_buffer[pos++] = ' ';
-                        break;
-                    }
-                    else
-                    {
-                        if (m_buffer[pos] == '"' || m_buffer[pos] == '\'')
-                            commentStringChar = m_buffer[pos];
-                        if (m_buffer[pos] != '\n')
-                            m_buffer[pos] = ' ';
-                        pos++;
-                    }
+                    if (m_buffer[pos] != '\n')
+                        m_buffer[pos] = ' ';
+                    pos++;
                 }
             }
         }
-- 
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/preproc/asm_file.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/preproc/asm_file.cpp')

diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp
index 49c9e3c66..bb296b78b 100644
--- a/tools/preproc/asm_file.cpp
+++ b/tools/preproc/asm_file.cpp
@@ -494,7 +494,7 @@ bool AsmFile::IsAtEnd()
 // Output the current location to set gas's logical file and line numbers.
 void AsmFile::OutputLocation()
 {
-    printf("# %ld \"%s\"\n", m_lineNum, m_filename.c_str());
+    std::printf("# %ld \"%s\"\n", m_lineNum, m_filename.c_str());
 }
 
 // Reports a diagnostic message.
-- 
cgit v1.2.3