Simplify constructing asg::BlockExpr

crates/oq3_semantics/src/asg.rs

@@ -489,27 +489,15 @@ pub struct Block {
 }
 
 impl Block {
-    pub fn new() -> Block {
-        Block {
-            statements: Vec::<Stmt>::new(),
-        }
-    }
-
-    pub fn insert_stmt(&mut self, stmt: Stmt) {
-        self.statements.push(stmt);
+    pub fn new(statements: Vec<Stmt>) -> Block {
+        Block { statements }
     }
 
     pub fn statements(&self) -> &[Stmt] {
         &self.statements
     }
 }
 
-impl Default for Block {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct GateDeclaration {
     name: SymbolIdResult,

crates/oq3_semantics/src/syntax_to_semantics.rs

@@ -685,18 +685,12 @@ fn from_literal(literal: &synast::Literal) -> Option<asg::TExpr> {
 }
 
 fn from_block_expr(block_synast: synast::BlockExpr, context: &mut Context) -> asg::Block {
-    let mut block = asg::Block::new();
-
-    for parse_stmt in block_synast.statements() {
-        let stmt = match parse_stmt {
-            synast::Stmt::ExprStmt(expr_stmt) => from_expr_stmt(expr_stmt, context),
-            stmt => from_stmt(stmt, context),
-        };
-        if let Some(stmt) = stmt {
-            block.insert_stmt(stmt)
-        }
-    }
-    block
+    asg::Block::new(
+        block_synast
+            .statements()
+            .map(|syn_stmt| from_stmt(syn_stmt, context).unwrap())
+            .collect::<Vec<_>>(),
+    )
 }
 
 fn from_classical_declaration_statement(