fmt

jazz-lang · May 24, 2019 · 24d61a7 · 24d61a7
1 parent ebe67c8
commit 24d61a7
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 41 deletions.
diff --git a/src/eval.rs b/src/eval.rs
@@ -877,21 +877,30 @@ impl<'a> EvalCtx<'a>
         }
         else
         {
-            match &stmt.kind {
-                StmtKind::CompTime(s) => return self.eval_stmt(s,true),
-                StmtKind::Block(b) => {
-                    for s in b.iter() {self.eval_stmt(s,false);}
-                    return Some(rc(Const::Void))
+            match &stmt.kind
+            {
+                StmtKind::CompTime(s) => return self.eval_stmt(s, true),
+                StmtKind::Block(b) =>
+                {
+                    for s in b.iter()
+                    {
+                        self.eval_stmt(s, false);
+                    }
+                    return Some(rc(Const::Void));
                 }
-                StmtKind::Expr(e) => {
-                    if let ExprKind::CompTime(s) = &e.kind { return Some(self.expr(s,true))}
-                    else {
+                StmtKind::Expr(e) =>
+                {
+                    if let ExprKind::CompTime(s) = &e.kind
+                    {
+                        return Some(self.expr(s, true));
+                    }
+                    else
+                    {
                         return None;
                     }
                 }
-                _ => None
+                _ => None,
             }
-
         }
     }
 

diff --git a/src/gccjit.rs b/src/gccjit.rs
@@ -276,7 +276,6 @@ impl<'a> Codegen<'a>
                     }
                     let ty = if struct_.union
                     {
-
                         self.ctx
                             .new_union_type(None, &str(struct_.name).to_string(), &fields)
                     }
@@ -1376,7 +1375,6 @@ impl<'a> Codegen<'a>
 
                     if this.is_some()
                     {
-
                         let expr = this.clone().unwrap().clone();
                         let ty = self.get_id_type(expr.id);
                         let val = if !ty.is_ptr()
@@ -1387,7 +1385,7 @@ impl<'a> Codegen<'a>
                                 id: expr.id,
                                 kind: ExprKind::AddressOf(expr),
                             });
-                            let val = self.ctx.new_cast(None,val,cty);
+                            let val = self.ctx.new_cast(None, val, cty);
                             val
                         }
                         else
@@ -1461,12 +1459,10 @@ impl<'a> Codegen<'a>
                         &params,
                     );
                 }
-
                 else if let Some(var) = self.variables.get(&name.name())
                 {
                     var.lval
                 }
-
                 else
                 {
                     panic!();

diff --git a/src/semantic.rs b/src/semantic.rs
@@ -682,7 +682,6 @@ impl<'a> SemCheck<'a>
     {
         let _id = stmt.id;
         match &stmt.kind
-
         {
             StmtKind::CFor(var, cond, then, body) =>
             {
@@ -838,13 +837,13 @@ impl<'a> SemCheck<'a>
     {
         match &expr.kind
         {
-            ExprKind::CompTime(e) => {
+            ExprKind::CompTime(e) =>
+            {
                 let ty = self.tc_expr(e);
                 let ty = self.infer_type(&ty);
-                self.types.insert(expr.id,ty.clone());
+                self.types.insert(expr.id, ty.clone());
 
                 return ty;
-
             }
             ExprKind::New(ty) =>
             {

diff --git a/src/syntax/ast/display.rs b/src/syntax/ast/display.rs
@@ -16,7 +16,7 @@ impl Display for ExprKind
     {
         match self
         {
-            ExprKind::MacroCall(name,_) => write!(f,"{}!()",name),
+            ExprKind::MacroCall(name, _) => write!(f, "{}!()", name),
             ExprKind::CompTime(e) => write!(f, "constexpr {}", e),
             ExprKind::New(val) => write!(f, "new {}", val),
             ExprKind::Int(i, base, _) => match base
@@ -216,25 +216,31 @@ impl Display for Global
     }
 }
 
-impl Display for Macro {
-    fn fmt(&self,f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f,"macro {}!(",self.name)?;
-        for (i,var) in self.args.iter().enumerate() {
-            write!(f,"{}",var)?;
-            if i != self.args.len() - 1 {
-                write!(f,",")?;
+impl Display for Macro
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result
+    {
+        write!(f, "macro {}!(", self.name)?;
+        for (i, var) in self.args.iter().enumerate()
+        {
+            write!(f, "{}", var)?;
+            if i != self.args.len() - 1
+            {
+                write!(f, ",")?;
             }
         }
-        write!(f,") ")?;
-        write!(f,"{{\n")?;
-        for tok in self.body.iter() {
-            match tok {
-                MacroToken::Token(tok) => write!(f,"   {}",tok.name())?,
-                MacroToken::Var(var) => write!(f,"   ${}",var)?,
-                MacroToken::VarArgs => write!(f,"...")?,
+        write!(f, ") ")?;
+        write!(f, "{{\n")?;
+        for tok in self.body.iter()
+        {
+            match tok
+            {
+                MacroToken::Token(tok) => write!(f, "   {}", tok.name())?,
+                MacroToken::Var(var) => write!(f, "   ${}", var)?,
+                MacroToken::VarArgs => write!(f, "...")?,
             }
         }
-        write!(f,"\n}}")
+        write!(f, "\n}}")
     }
 }
 
@@ -251,7 +257,7 @@ impl Display for Elem
             Elem::ConstExpr { name, expr, .. } => write!(f, "constexpr {} = {}", name, expr),
             Elem::Global(g) => write!(f, "{}", g),
             Elem::Link(l) => write!(f, "link \"{}\" ", l),
-            Elem::Macro(m) => write!(f,"{}",m),
+            Elem::Macro(m) => write!(f, "{}", m),
             _ => write!(f, ""),
         }
     }

diff --git a/src/syntax/ast/mod.rs b/src/syntax/ast/mod.rs
@@ -843,7 +843,7 @@ impl Expr
 #[derive(Clone, Debug)]
 pub enum ExprKind
 {
-    MacroCall(Name,Vec<Vec<Token>>),
+    MacroCall(Name, Vec<Vec<Token>>),
     CompTime(Box<Expr>),
     Unary(String, Box<Expr>),
     Binary(String, Box<Expr>, Box<Expr>),

diff --git a/src/syntax/lexer/mod.rs b/src/syntax/lexer/mod.rs
@@ -65,7 +65,8 @@ impl Lexer
             {
                 return self.read_identifier();
             }
-            else if ch == Some('$') {
+            else if ch == Some('$')
+            {
                 self.read_char();
                 return Ok(self.build_token(TokenKind::Dollar));
             }

diff --git a/src/syntax/parser.rs b/src/syntax/parser.rs
@@ -945,7 +945,6 @@ impl<'a> Parser<'a>
             TokenKind::LBracket => gen_t_tree!(TokenKind::LBracket, TokenKind::RBracket, t),
             TokenKind::Dollar =>
             {
-
                 let name = self.expect_identifier()?;
                 if args.contains(&name)
                 {
@@ -990,8 +989,8 @@ impl<'a> Parser<'a>
         let mut body: Vec<MacroToken> = vec![];
         loop
         {
-
-            if self.token.is(TokenKind::RBrace) {
+            if self.token.is(TokenKind::RBrace)
+            {
                 self.advance_token()?;
                 break;
             }