diff --git a/CHANGELOG.md b/CHANGELOG.md index 304e8c5..3581672 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ ## v0.0.15 - [x] Multiline comments -- [ ] Nested multiline comments +- [x] Nested multiline comments - [ ] Include comments in the AST - [ ] Replace all panics with actual errors - [ ] Remove all old codegen diff --git a/src/codegen/php/mod.rs b/src/codegen/php/mod.rs index 1676356..37d2846 100644 --- a/src/codegen/php/mod.rs +++ b/src/codegen/php/mod.rs @@ -7,7 +7,7 @@ use super::Transpilable; impl Transpilable for PhpAst<'_> { fn transpile(&self) -> String { let mut fragments = vec![String::from(" { fn transpile(&self) -> String { match self { PhpStatement::PhpEchoStatement(expr_list) => { - let expressions_vec = expr_list.expressions + let expressions_vec = expr_list + .expressions .iter() .map(|e| e.transpile()) .collect::>(); @@ -46,5 +47,3 @@ impl Transpilable for PhpExpression<'_> { } } } - - diff --git a/src/lexic/scanner/new_comment.rs b/src/lexic/scanner/new_comment.rs index b680911..4a43b63 100644 --- a/src/lexic/scanner/new_comment.rs +++ b/src/lexic/scanner/new_comment.rs @@ -56,18 +56,17 @@ fn multiline_impl(chars: &Vec, start_pos: usize) -> Option<(Vec, usi loop { match chars.get(current_position) { Some('/') => { - match chars.get(current_position + 1) { Some('*') => { // Scan nested comment - let (mut nested, next_position) = match multiline_impl(chars, current_position + 2) - { - Some(v) => v, - None => { - // The nested comment is not closed. - return None; - } - }; + let (mut nested, next_position) = + match multiline_impl(chars, current_position + 2) { + Some(v) => v, + None => { + // The nested comment is not closed. + return None; + } + }; result.push('/'); result.push('*'); result.append(&mut nested); diff --git a/src/syntax/parsers/module.rs b/src/syntax/parsers/module.rs index 9648713..623e90a 100644 --- a/src/syntax/parsers/module.rs +++ b/src/syntax/parsers/module.rs @@ -110,7 +110,7 @@ mod test { match result { Ok(_) => panic!("Expected an error"), - Err(_) => {}, + Err(_) => {} } } } diff --git a/src/syntax/utils.rs b/src/syntax/utils.rs index 00314bb..bcaadb9 100644 --- a/src/syntax/utils.rs +++ b/src/syntax/utils.rs @@ -80,7 +80,10 @@ pub fn parse_token_type( mod tests { use crate::{ lexic::{get_tokens, token::TokenType}, - syntax::{parseable::ParsingError, utils::{parse_token_type, Tokenizer}}, + syntax::{ + parseable::ParsingError, + utils::{parse_token_type, Tokenizer}, + }, }; use super::try_operator; @@ -133,7 +136,7 @@ mod tests { match tokens.get_significant(10) { Some(_) => panic!("Expected a None"), - None => {}, + None => {} } } }