add a BlockNode variant to the ClauseGuard enum

allowing us to keep track of the blocks one has explicitly used when writing
a clause guard

Author: giacomocavalieri

compiler-core/src/ast.rs

@@ -1901,6 +1901,11 @@ pub type TypedClauseGuard = ClauseGuard<Arc<Type>, EcoString>;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ClauseGuard<Type, RecordTag> {
+    Block {
+        location: SrcSpan,
+        value: Box<ClauseGuard<Type, RecordTag>>,
+    },
+
     Equals {
         location: SrcSpan,
         left: Box<Self>,
@@ -2094,7 +2099,8 @@ impl<A, B> ClauseGuard<A, B> {
             | ClauseGuard::DivFloat { location, .. }
             | ClauseGuard::RemainderInt { location, .. }
             | ClauseGuard::LtEqFloat { location, .. }
-            | ClauseGuard::ModuleSelect { location, .. } => *location,
+            | ClauseGuard::ModuleSelect { location, .. }
+            | ClauseGuard::Block { location, .. } => *location,
             ClauseGuard::FieldAccess {
                 label_location,
                 container,
@@ -2140,7 +2146,8 @@ impl<A, B> ClauseGuard<A, B> {
             | ClauseGuard::Not { .. }
             | ClauseGuard::TupleIndex { .. }
             | ClauseGuard::FieldAccess { .. }
-            | ClauseGuard::ModuleSelect { .. } => None,
+            | ClauseGuard::ModuleSelect { .. }
+            | ClauseGuard::Block { .. } => None,
         }
     }
 }
@@ -2153,6 +2160,7 @@ impl TypedClauseGuard {
             ClauseGuard::FieldAccess { type_, .. } => type_.clone(),
             ClauseGuard::ModuleSelect { type_, .. } => type_.clone(),
             ClauseGuard::Constant(constant) => constant.type_(),
+            ClauseGuard::Block { value, .. } => value.type_(),
 
             ClauseGuard::AddInt { .. }
             | ClauseGuard::SubInt { .. }
@@ -2185,6 +2193,7 @@ impl TypedClauseGuard {
         match self {
             ClauseGuard::Var { name, .. } => im::hashset![name],
 
+            ClauseGuard::Block { value, .. } => value.referenced_variables(),
             ClauseGuard::Not { expression, .. } => expression.referenced_variables(),
             ClauseGuard::TupleIndex { tuple, .. } => tuple.referenced_variables(),
             ClauseGuard::FieldAccess { container, .. } => container.referenced_variables(),

compiler-core/src/ast/visit.rs

@@ -1367,6 +1367,7 @@ where
             v.visit_typed_clause_guard(left);
             v.visit_typed_clause_guard(right);
         }
+        super::ClauseGuard::Block { location: _, value } => v.visit_typed_clause_guard(value),
         super::ClauseGuard::Not {
             location: _,
             expression,

compiler-core/src/call_graph.rs

@@ -457,6 +457,8 @@ impl<'a> CallGraphBuilder<'a> {
                 self.guard(right);
             }
 
+            ClauseGuard::Block { value, .. } => self.guard(value),
+
             ClauseGuard::Not { expression, .. } => self.guard(expression),
 
             ClauseGuard::Var { name, .. } => self.referenced(name),

compiler-core/src/erlang.rs

@@ -1614,6 +1614,8 @@ fn optional_clause_guard<'a>(
 
 fn bare_clause_guard<'a>(guard: &'a TypedClauseGuard, env: &mut Env<'a>) -> Document<'a> {
     match guard {
+        ClauseGuard::Block { value, .. } => bare_clause_guard(value, env).surround("(", ")"),
+
         ClauseGuard::Not { expression, .. } => docvec!["not ", bare_clause_guard(expression, env)],
 
         ClauseGuard::Or { left, right, .. } => clause_guard(left, env)
@@ -1762,7 +1764,8 @@ fn clause_guard<'a>(guard: &'a TypedClauseGuard, env: &mut Env<'a>) -> Document<
         | ClauseGuard::Var { .. }
         | ClauseGuard::TupleIndex { .. }
         | ClauseGuard::FieldAccess { .. }
-        | ClauseGuard::ModuleSelect { .. } => bare_clause_guard(guard, env),
+        | ClauseGuard::ModuleSelect { .. }
+        | ClauseGuard::Block { .. } => bare_clause_guard(guard, env),
     }
 }
 

compiler-core/src/format.rs

@@ -2514,6 +2514,8 @@ impl<'comments> Formatter<'comments> {
             ClauseGuard::Constant(constant) => self.const_expr(constant),
 
             ClauseGuard::Not { expression, .. } => docvec!["!", self.clause_guard(expression)],
+
+            ClauseGuard::Block { value, .. } => wrap_block(self.clause_guard(value)).group(),
         }
     }
 

compiler-core/src/javascript/expression.rs

@@ -1936,6 +1936,8 @@ impl<'module, 'a> Generator<'module, 'a> {
 
     pub(crate) fn guard(&mut self, guard: &'a TypedClauseGuard) -> Document<'a> {
         match guard {
+            ClauseGuard::Block { value, .. } => self.guard(value).surround("(", ")"),
+
             ClauseGuard::Equals { left, right, .. } if is_js_scalar(left.type_()) => {
                 let left = self.wrapped_guard(left);
                 let right = self.wrapped_guard(right);
@@ -2066,7 +2068,8 @@ impl<'module, 'a> Generator<'module, 'a> {
             | ClauseGuard::TupleIndex { .. }
             | ClauseGuard::Constant(_)
             | ClauseGuard::Not { .. }
-            | ClauseGuard::FieldAccess { .. } => self.guard(guard),
+            | ClauseGuard::FieldAccess { .. }
+            | ClauseGuard::Block { .. } => self.guard(guard),
 
             ClauseGuard::Equals { .. }
             | ClauseGuard::NotEquals { .. }
@@ -2089,7 +2092,7 @@ impl<'module, 'a> Generator<'module, 'a> {
             | ClauseGuard::RemainderInt { .. }
             | ClauseGuard::Or { .. }
             | ClauseGuard::And { .. }
-            | ClauseGuard::ModuleSelect { .. } => docvec!["(", self.guard(guard,), ")"],
+            | ClauseGuard::ModuleSelect { .. } => docvec!["(", self.guard(guard), ")"],
         }
     }
 

compiler-core/src/type_/expression.rs

@@ -2800,6 +2800,14 @@ impl<'a, 'b> ExprTyper<'a, 'b> {
             ClauseGuard::Constant(constant) => {
                 Ok(ClauseGuard::Constant(self.infer_const(&None, constant)))
             }
+
+            ClauseGuard::Block { value, location } => {
+                let value = self.infer_clause_guard(*value)?;
+                Ok(ClauseGuard::Block {
+                    location,
+                    value: Box::new(value),
+                })
+            }
         }
     }