changes for new grammar, fixes

src/build_visitor.cpp

@@ -167,6 +167,14 @@ void BuildVisitor::Visit(VariableDefinitionStatement* node) {
     // error
   }
 
+  size_t child_count = parse_node.NamedChildCount();
+
+  if (child_count > 2) { // name, value [, in_expression]
+    current_node_ = parse_node.ChildByFieldName("in_expression");
+    node->in_expression.emplace();
+    Visit(node->in_expression.value());
+  }
+
   current_node_ = parse_node;
 }
 

src/execute_visitor.cpp

@@ -47,11 +47,22 @@ void ExecuteVisitor::Visit(AliasDefinitionStatement* node) {
 }
 
 void ExecuteVisitor::Visit(VariableDefinitionStatement* node) {
+  // TODO: optional variable definitions
+
+  if (node->in_expression.has_value()) {
+    context_manager_.EnterContext();
+  }
+
   Visitor::Visit(node->value);
 
   is_const_definition_ = node->modifier;
   Visitor::Visit(node->name); // current_type_ passed from value
   is_const_definition_ = std::nullopt;
+
+  if (node->in_expression.has_value()) {
+    Visitor::Visit(node->in_expression.value());
+    context_manager_.ExitContext();
+  }
 }
 
 void ExecuteVisitor::Visit(FunctionDeclaration* node) {

src/print_visitor.cpp

@@ -93,6 +93,12 @@ void PrintVisitor::Visit(VariableDefinitionStatement* node) {
   Visitor::Visit(node->name);
   out_ << "] = (";
   Visitor::Visit(node->value);
+
+  if (node->in_expression.has_value()) {
+    out_ << ") in (";
+    Visitor::Visit(node->in_expression.value());
+  }
+
   out_ << ")\n";
 }
 

src/type_check_visitor.cpp

@@ -101,7 +101,11 @@ void TypeCheckVisitor::Visit(AliasDefinitionStatement* node) {
 
 // TODO: move, etc.
 void TypeCheckVisitor::Visit(VariableDefinitionStatement* node) {
-  is_in_statement_ = true;
+  // TODO: optional variable definitions
+
+  if (node->in_expression.has_value()) {
+    context_manager_.EnterContext();
+  }
 
   Visitor::Visit(node->value);
   // current_type from value automatically passed to name definitions
@@ -110,8 +114,12 @@ void TypeCheckVisitor::Visit(VariableDefinitionStatement* node) {
   Visitor::Visit(node->name);
   is_const_definition_ = std::nullopt;
 
+  if (node->in_expression.has_value()) {
+    Visitor::Visit(node->in_expression.value());
+    context_manager_.ExitContext();
+  }
+
   current_type_ = internal_to_abstract_type_.at(info::type::InternalType::Unit);
-  is_in_statement_ = false;
 
   node->base.type_ = current_type_;
 }

src/typed_print_visitor.cpp

@@ -123,6 +123,12 @@ void TypedPrintVisitor::Visit(VariableDefinitionStatement* node) {
   Visitor::Visit(node->name);
   out_ << "] = (";
   Visitor::Visit(node->value);
+
+  if (node->in_expression.has_value()) {
+    out_ << ") in (";
+    Visitor::Visit(node->in_expression.value());
+  }
+
   out_ << ")\n";
 }
 

src/visitor.cpp

@@ -328,6 +328,9 @@ void Visitor::Visit(AliasDefinitionStatement* node) {
 void Visitor::Visit(VariableDefinitionStatement* node) {
   Visit(node->name);
   Visit(node->value);
+  if (node->in_expression.has_value()) {
+    Visit(node->in_expression.value());
+  }
 }
 
 void Visitor::Visit(FunctionDeclaration* node) {