kirigaya/sv-parser
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add empty define support

Browse Source
This commit is contained in:
dalance 2019-11-05 20:40:47 +09:00
parent a733e3b980
commit 07461243a5
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## [Unreleased](https://github.com/dalance/sv-parser/compare/v0.3.4...Unreleased) - ReleaseDate
* [Added] LF/CR+LF support
* [Added] empty define support
## [v0.3.4](https://github.com/dalance/sv-parser/compare/v0.3.3...v0.3.4) - 2019-11-05

2
sv-parser-error/src/lib.rs
View File

@ -20,8 +20,6 @@ pub enum ErrorKind {
Preprocess,
#[fail(display = "Define argument not found: {}", _0)]
DefineArgNotFound(String),
#[fail(display = "Define text not found: {}", _0)]
DefineTextNotFound(String),
#[fail(display = "Define not found: {}", _0)]
DefineNotFound(String),
}

24
sv-parser-pp/src/preprocess.rs
View File

@ -296,10 +296,14 @@ fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>>(
IncludeCompilerDirective::TextMacroUsage(x) => {
let (_, _, ref x) = x.nodes;
skip_nodes.push(x.into());
let (p, _, _, _) =
resolve_text_macro_usage(x, s, path.as_ref(), &defines, include_paths)?;
if let Some((p, _, _, _)) =
resolve_text_macro_usage(x, s, path.as_ref(), &defines, include_paths)?
{
let p = p.trim().trim_matches('"');
PathBuf::from(p)
} else {
PathBuf::from("")
}
}
};
if path.is_relative() {
@ -319,11 +323,13 @@ fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>>(
ret.merge(include);
}
NodeEvent::Enter(RefNode::TextMacroUsage(x)) if !skip => {
let (text, path, range, new_defines) =
resolve_text_macro_usage(x, s, path.as_ref(), &defines, include_paths)?;
if let Some((text, path, range, new_defines)) =
resolve_text_macro_usage(x, s, path.as_ref(), &defines, include_paths)?
{
ret.push(&text, path, range);
defines = new_defines;
}
}
_ => (),
}
}
@ -395,7 +401,7 @@ fn resolve_text_macro_usage<T: AsRef<Path>, U: AsRef<Path>>(
path: T,
defines: &Defines,
include_paths: &[U],
) -> Result<(String, PathBuf, Range, Defines), Error> {
) -> Result<Option<(String, PathBuf, Range, Defines)>, Error> {
let (_, ref name, ref args) = x.nodes;
let id = identifier((&name.nodes.0).into(), &s).unwrap();
@ -448,17 +454,17 @@ fn resolve_text_macro_usage<T: AsRef<Path>, U: AsRef<Path>>(
let (replaced, new_defines) =
preprocess_str(&replaced, path.as_ref(), &defines, include_paths)?;
Ok((
Ok(Some((
String::from(replaced.text()),
define.path.clone(),
*range,
new_defines,
))
)))
} else {
Err(ErrorKind::DefineTextNotFound(String::from(id)).into())
Ok(None)
}
} else if let Some(_) = define {
Err(ErrorKind::DefineTextNotFound(String::from(id)).into())
Ok(None)
} else {
Err(ErrorKind::DefineNotFound(String::from(id)).into())
}