language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Result from around Preprocessor's output type

Browse source
This commit is contained in:
Tad Hardesty 2018-03-10 21:28:57 -08:00
parent d6597f7101
commit ec1be52fcd
3 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/dreammaker/indents.rs
View file

@ -21,14 +21,14 @@ pub struct IndentProcessor<I> {
eof_yielded: bool,
}
impl<I: HasLocation> HasLocation for IndentProcessor<I> {
impl<I> HasLocation for IndentProcessor<I> {
fn location(&self) -> Location {
self.inner.location()
self.last_input_loc
}
}
impl<I> IndentProcessor<I> where
I: Iterator<Item=Result<LocatedToken, DMError>> + HasLocation
I: Iterator<Item=Result<LocatedToken, DMError>>
{
pub fn new<J: IntoIterator<Item=Result<LocatedToken, DMError>, IntoIter=I>>(inner: J) -> Self {
IndentProcessor {
@ -162,7 +162,7 @@ impl<I> IndentProcessor<I> where
}
impl<I> Iterator for IndentProcessor<I> where
I: Iterator<Item=Result<LocatedToken, DMError>> + HasLocation
I: Iterator<Item=Result<LocatedToken, DMError>>
{
type Item = Result<LocatedToken, DMError>;

2
src/dreammaker/lib.rs
View file

@ -37,7 +37,7 @@ impl Context {
let result = parser::parse(
self,
indents::IndentProcessor::new(
preprocessor::Preprocessor::new(self, dme.to_owned())?
preprocessor::Preprocessor::new(self, dme.to_owned())?.map(Ok)
)
);

28
src/dreammaker/preprocessor.rs
View file

@ -319,24 +319,24 @@ impl<'ctx> Preprocessor<'ctx> {
"ifdef" => {
expect_token!((define_name) = Token::Ident(define_name, _));
expect_token!(() = Token::Punct(Punctuation::Newline));
let z = self.defines.contains_key(&define_name);
self.ifdef_stack.push(Ifdef::new(self.last_input_loc, z));
let enabled = self.defines.contains_key(&define_name);
self.ifdef_stack.push(Ifdef::new(self.last_input_loc, enabled));
}
"ifndef" => {
expect_token!((define_name) = Token::Ident(define_name, _));
expect_token!(() = Token::Punct(Punctuation::Newline));
let z = !self.defines.contains_key(&define_name);
self.ifdef_stack.push(Ifdef::new(self.last_input_loc, z));
let enabled = !self.defines.contains_key(&define_name);
self.ifdef_stack.push(Ifdef::new(self.last_input_loc, enabled));
}
"if" => {
let z = self.evaluate()?;
self.ifdef_stack.push(Ifdef::new(self.last_input_loc, z));
let enabled = self.evaluate()?;
self.ifdef_stack.push(Ifdef::new(self.last_input_loc, enabled));
}
"elseif" => {
let last = self.ifdef_stack.pop().ok_or_else(||
DMError::new(self.last_input_loc, "unmatched #elseif"))?;
let z = self.evaluate()?;
self.ifdef_stack.push(last.else_if(z));
let enabled = self.evaluate()?;
self.ifdef_stack.push(last.else_if(enabled));
}
// anything other than ifdefs may be ifdef'd out
_ if self.is_disabled() => {}
@ -599,20 +599,22 @@ impl<'ctx> Preprocessor<'ctx> {
}
impl<'ctx> Iterator for Preprocessor<'ctx> {
type Item = Result<LocatedToken, DMError>;
type Item = LocatedToken;
fn next(&mut self) -> Option<Result<LocatedToken, DMError>> {
fn next(&mut self) -> Option<LocatedToken> {
loop {
if let Some(token) = self.output.pop_front() {
return Some(Ok(LocatedToken {
return Some(LocatedToken {
location: self.last_input_loc,
token: token,
}));
});
}
if let Some(tok) = self.inner_next() {
self.last_input_loc = tok.location;
try_iter!(self.real_next(tok.token));
if let Err(e) = self.real_next(tok.token) {
self.context.register_error(e);
}
} else {
while let Some(ifdef) = self.ifdef_stack.pop() {
self.context.register_error(DMError::new(ifdef.location, "unterminated #if/#ifdef")