dranke/curlywas
1
0
Fork 0
mirror of https://github.com/exoticorn/curlywas.git synced 2026-01-20 11:46:43 +01:00
Code Issues Projects Releases Wiki Activity

add include support

Browse Source
This commit is contained in:
Dennis Ranke
2022-02-24 22:30:34 +01:00
parent 71de622634
commit b41b7f250c
4 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/parser.rs
View File

@@ -24,11 +24,11 @@ impl Sources {
Sources(Vec::new())
}
pub fn add(&mut self, path: &Path) -> Result<usize> {
pub fn add(&mut self, path: &Path) -> Result<(usize, bool)> {
let canonical = path.canonicalize()?;
for (index, source) in self.0.iter().enumerate() {
if source.path.canonicalize()? == canonical {
return Ok(index);
return Ok((index, false));
}
}
let mut source = String::new();
@@ -37,7 +37,7 @@ impl Sources {
source: ariadne::Source::from(source),
path: path.to_path_buf(),
});
Ok(self.0.len() - 1)
Ok((self.0.len() - 1, true))
}
}
@@ -970,7 +970,12 @@ fn script_parser() -> impl Parser<Token, ast::Script, Error = ScriptError> + Clo
})
.boxed();
import.or(function).or(global).or(data).boxed()
let include =
just(Token::Ident("include".to_string())).ignore_then(string.clone().map_with_span(
|path, span| ast::TopLevelItem::Include(ast::Include { span, path }),
));
import.or(function).or(global).or(data).or(include).boxed()
};
top_level_item.repeated().then_ignore(end()).map(|items| {
@@ -979,6 +984,7 @@ fn script_parser() -> impl Parser<Token, ast::Script, Error = ScriptError> + Clo
global_vars: Vec::new(),
functions: Vec::new(),
data: Vec::new(),
includes: Vec::new(),
};
for item in items {
match item {
@@ -986,6 +992,7 @@ fn script_parser() -> impl Parser<Token, ast::Script, Error = ScriptError> + Clo
ast::TopLevelItem::GlobalVar(v) => script.global_vars.push(v),
ast::TopLevelItem::Function(f) => script.functions.push(f),
ast::TopLevelItem::Data(d) => script.data.push(d),
ast::TopLevelItem::Include(i) => script.includes.push(i),
}
}
script