Skip to content

Commit 24d61a7

Browse files
author
playXE
committed
fmt
1 parent ebe67c8 commit 24d61a7

File tree

7 files changed

+51
-41
lines changed

7 files changed

+51
-41
lines changed

‎src/eval.rs

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -877,21 +877,30 @@ impl<'a> EvalCtx<'a>
877877
}
878878
else
879879
{
880-
match &stmt.kind {
881-
StmtKind::CompTime(s) => return self.eval_stmt(s,true),
882-
StmtKind::Block(b) => {
883-
for s in b.iter() {self.eval_stmt(s,false);}
884-
return Some(rc(Const::Void))
880+
match &stmt.kind
881+
{
882+
StmtKind::CompTime(s) => return self.eval_stmt(s, true),
883+
StmtKind::Block(b) =>
884+
{
885+
for s in b.iter()
886+
{
887+
self.eval_stmt(s, false);
888+
}
889+
return Some(rc(Const::Void));
885890
}
886-
StmtKind::Expr(e) => {
887-
if let ExprKind::CompTime(s) = &e.kind { return Some(self.expr(s,true))}
888-
else {
891+
StmtKind::Expr(e) =>
892+
{
893+
if let ExprKind::CompTime(s) = &e.kind
894+
{
895+
return Some(self.expr(s, true));
896+
}
897+
else
898+
{
889899
return None;
890900
}
891901
}
892-
_ => None
902+
_ => None,
893903
}
894-
895904
}
896905
}
897906

‎src/gccjit.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ impl<'a> Codegen<'a>
276276
}
277277
let ty = if struct_.union
278278
{
279-
280279
self.ctx
281280
.new_union_type(None, &str(struct_.name).to_string(), &fields)
282281
}
@@ -1376,7 +1375,6 @@ impl<'a> Codegen<'a>
13761375

13771376
if this.is_some()
13781377
{
1379-
13801378
let expr = this.clone().unwrap().clone();
13811379
let ty = self.get_id_type(expr.id);
13821380
let val = if !ty.is_ptr()
@@ -1387,7 +1385,7 @@ impl<'a> Codegen<'a>
13871385
id: expr.id,
13881386
kind: ExprKind::AddressOf(expr),
13891387
});
1390-
let val = self.ctx.new_cast(None,val,cty);
1388+
let val = self.ctx.new_cast(None, val, cty);
13911389
val
13921390
}
13931391
else
@@ -1461,12 +1459,10 @@ impl<'a> Codegen<'a>
14611459
&params,
14621460
);
14631461
}
1464-
14651462
else if let Some(var) = self.variables.get(&name.name())
14661463
{
14671464
var.lval
14681465
}
1469-
14701466
else
14711467
{
14721468
panic!();

‎src/semantic.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,6 @@ impl<'a> SemCheck<'a>
682682
{
683683
let _id = stmt.id;
684684
match &stmt.kind
685-
686685
{
687686
StmtKind::CFor(var, cond, then, body) =>
688687
{
@@ -838,13 +837,13 @@ impl<'a> SemCheck<'a>
838837
{
839838
match &expr.kind
840839
{
841-
ExprKind::CompTime(e) => {
840+
ExprKind::CompTime(e) =>
841+
{
842842
let ty = self.tc_expr(e);
843843
let ty = self.infer_type(&ty);
844-
self.types.insert(expr.id,ty.clone());
844+
self.types.insert(expr.id, ty.clone());
845845

846846
return ty;
847-
848847
}
849848
ExprKind::New(ty) =>
850849
{

‎src/syntax/ast/display.rs

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl Display for ExprKind
1616
{
1717
match self
1818
{
19-
ExprKind::MacroCall(name,_) => write!(f,"{}!()",name),
19+
ExprKind::MacroCall(name, _) => write!(f, "{}!()", name),
2020
ExprKind::CompTime(e) => write!(f, "constexpr {}", e),
2121
ExprKind::New(val) => write!(f, "new {}", val),
2222
ExprKind::Int(i, base, _) => match base
@@ -216,25 +216,31 @@ impl Display for Global
216216
}
217217
}
218218

219-
impl Display for Macro {
220-
fn fmt(&self,f: &mut fmt::Formatter<'_>) -> fmt::Result {
221-
write!(f,"macro {}!(",self.name)?;
222-
for (i,var) in self.args.iter().enumerate() {
223-
write!(f,"{}",var)?;
224-
if i != self.args.len() - 1 {
225-
write!(f,",")?;
219+
impl Display for Macro
220+
{
221+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result
222+
{
223+
write!(f, "macro {}!(", self.name)?;
224+
for (i, var) in self.args.iter().enumerate()
225+
{
226+
write!(f, "{}", var)?;
227+
if i != self.args.len() - 1
228+
{
229+
write!(f, ",")?;
226230
}
227231
}
228-
write!(f,") ")?;
229-
write!(f,"{{\n")?;
230-
for tok in self.body.iter() {
231-
match tok {
232-
MacroToken::Token(tok) => write!(f," {}",tok.name())?,
233-
MacroToken::Var(var) => write!(f," ${}",var)?,
234-
MacroToken::VarArgs => write!(f,"...")?,
232+
write!(f, ") ")?;
233+
write!(f, "{{\n")?;
234+
for tok in self.body.iter()
235+
{
236+
match tok
237+
{
238+
MacroToken::Token(tok) => write!(f, " {}", tok.name())?,
239+
MacroToken::Var(var) => write!(f, " ${}", var)?,
240+
MacroToken::VarArgs => write!(f, "...")?,
235241
}
236242
}
237-
write!(f,"\n}}")
243+
write!(f, "\n}}")
238244
}
239245
}
240246

@@ -251,7 +257,7 @@ impl Display for Elem
251257
Elem::ConstExpr { name, expr, .. } => write!(f, "constexpr {} = {}", name, expr),
252258
Elem::Global(g) => write!(f, "{}", g),
253259
Elem::Link(l) => write!(f, "link \"{}\" ", l),
254-
Elem::Macro(m) => write!(f,"{}",m),
260+
Elem::Macro(m) => write!(f, "{}", m),
255261
_ => write!(f, ""),
256262
}
257263
}

‎src/syntax/ast/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ impl Expr
843843
#[derive(Clone, Debug)]
844844
pub enum ExprKind
845845
{
846-
MacroCall(Name,Vec<Vec<Token>>),
846+
MacroCall(Name, Vec<Vec<Token>>),
847847
CompTime(Box<Expr>),
848848
Unary(String, Box<Expr>),
849849
Binary(String, Box<Expr>, Box<Expr>),

‎src/syntax/lexer/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ impl Lexer
6565
{
6666
return self.read_identifier();
6767
}
68-
else if ch == Some('$') {
68+
else if ch == Some('$')
69+
{
6970
self.read_char();
7071
return Ok(self.build_token(TokenKind::Dollar));
7172
}

‎src/syntax/parser.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,6 @@ impl<'a> Parser<'a>
945945
TokenKind::LBracket => gen_t_tree!(TokenKind::LBracket, TokenKind::RBracket, t),
946946
TokenKind::Dollar =>
947947
{
948-
949948
let name = self.expect_identifier()?;
950949
if args.contains(&name)
951950
{
@@ -990,8 +989,8 @@ impl<'a> Parser<'a>
990989
let mut body: Vec<MacroToken> = vec![];
991990
loop
992991
{
993-
994-
if self.token.is(TokenKind::RBrace) {
992+
if self.token.is(TokenKind::RBrace)
993+
{
995994
self.advance_token()?;
996995
break;
997996
}

0 commit comments

Comments
 (0)