Skip to content

fix: deal with comments in the preprocessor directives #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aspizu wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −14
Draft

fix: deal with comments in the preprocessor directives #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 43 additions & 14 deletions src/translation_unit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ impl TranslationUnit {
}
}

fn blank_directive_line(text: &mut Vec<u8>, start: usize) {
let end = text[start..]
.iter()
.position(|&c| c == b'\n')
.map_or(text.len(), |j| start + j);
text[start..end].fill(b' ');
}

pub fn parse_translation_unit(
unit: &mut TranslationUnit,
fs: Rc<RefCell<dyn VFS>>,
Expand All @@ -102,20 +110,24 @@ pub fn parse_translation_unit(
while i < unit.text.len() {
if skip_depth > 0 {
if i == 0 || unit.text[i - 1] == b'\n' {
let line_end = unit.text[i..]
.iter()
.position(|&c| c == b'\n')
.map_or(unit.text.len(), |j| i + j + 1);
if unit.text[i..].starts_with(b"%if") {
unit.text[i] = b'#';
i += b"%if".len();
skip_depth += 1;
blank_directive_line(&mut unit.text, i);
i = line_end;
} else if unit.text[i..].starts_with(b"%else") {
unit.text[i] = b'#';
i += b"%else".len();
if skip_depth == 1 {
skip_depth = 0;
}
blank_directive_line(&mut unit.text, i);
i = line_end;
} else if unit.text[i..].starts_with(b"%endif") {
unit.text[i] = b'#';
i += b"%endif".len();
skip_depth -= 1;
blank_directive_line(&mut unit.text, i);
i = line_end;
} else {
unit.text[i] = b'#';
i += 1;
Expand All @@ -125,7 +137,7 @@ pub fn parse_translation_unit(
}
} else if (i == 0 || unit.text[i - 1] == b'\n') && unit.text[i] == b'%' {
if unit.text[i..].starts_with(b"%include") {
unit.text[i] = b'#';
let directive_start = i;
i += b"%include".len();
while i < unit.text.len() && unit.text[i] == b' ' {
i += 1;
Expand All @@ -151,6 +163,7 @@ pub fn parse_translation_unit(
} else {
None
};
blank_directive_line(&mut unit.text, directive_start);
i = j;
add_include_to_translation_unit(
unit,
Expand All @@ -163,6 +176,7 @@ pub fn parse_translation_unit(
help,
);
} else if unit.text[i..].starts_with(b"%define") {
let directive_start = i;
i += b"%define".len();
while i < unit.text.len() && unit.text[i] == b' ' {
i += 1;
Expand All @@ -185,8 +199,10 @@ pub fn parse_translation_unit(
.trim()
.to_owned();
unit.defines.insert(name);
blank_directive_line(&mut unit.text, directive_start);
i = j;
} else if unit.text[i..].starts_with(b"%undef") {
let directive_start = i;
i += b"%undef".len();
while i < unit.text.len() && unit.text[i] == b' ' {
i += 1;
Expand All @@ -201,12 +217,12 @@ pub fn parse_translation_unit(
.unwrap_or(unit.text.len());
let name = std::str::from_utf8(&unit.text[i..j]).unwrap().trim();
unit.defines.remove(name);
blank_directive_line(&mut unit.text, directive_start);
i = j;
} else if unit.text[i..].starts_with(b"%ifdef")
|| unit.text[i..].starts_with(b"%ifndef")
{
let start = i;
unit.text[i] = b'#';
let j = unit.text[i..]
.iter()
.position(|c| *c == b'\n')
Expand All @@ -216,13 +232,14 @@ pub fn parse_translation_unit(
.unwrap_or("")
.trim()
.to_owned();
blank_directive_line(&mut unit.text, i);
diagnostics.push(Diagnostic {
kind: DiagnosticKind::UnknownDirective(name.into()),
span: start..j,
});
i = j;
} else if unit.text[i..].starts_with(b"%if") {
unit.text[i] = b'#';
let directive_start = i;
i += b"%if".len();
while i < unit.text.len() && unit.text[i] == b' ' {
i += 1;
Expand All @@ -248,16 +265,27 @@ pub fn parse_translation_unit(
if inverted == unit.defines.contains(name) {
skip_depth = 1;
}
blank_directive_line(&mut unit.text, directive_start);
i = j;
} else if unit.text[i..].starts_with(b"%else") {
unit.text[i] = b'#';
i += b"%else".len();
let directive_start = i;
let j = unit.text[i..]
.iter()
.position(|c| *c == b'\n')
.map_or(unit.text.len(), |j| i + j + 1);
blank_directive_line(&mut unit.text, directive_start);
skip_depth = 1;
i = j;
} else if unit.text[i..].starts_with(b"%endif") {
unit.text[i] = b'#';
i += b"%endif".len();
let directive_start = i;
let j = unit.text[i..]
.iter()
.position(|c| *c == b'\n')
.map_or(unit.text.len(), |j| i + j + 1);
blank_directive_line(&mut unit.text, directive_start);
i = j;
} else {
let start = i;
unit.text[i] = b'#'; // replace % with # so parser treats it as a comment
i += 1; // skip '%'
let j = unit.text[i..]
.iter()
Expand All @@ -268,6 +296,7 @@ pub fn parse_translation_unit(
.unwrap_or("")
.trim()
.to_owned();
blank_directive_line(&mut unit.text, start);
diagnostics.push(Diagnostic {
kind: DiagnosticKind::UnknownDirective(name.into()),
span: start..j,
Expand Down
Loading