diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /tools/preproc/asm_file.cpp | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'tools/preproc/asm_file.cpp')
| -rw-r--r-- | tools/preproc/asm_file.cpp | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp index 7deaccc8a..bb296b78b 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++; } } } @@ -517,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. |