Some macro tests weren't valid Crystal either

Author: nobodywasishere

test/corpus/macros.txt

@@ -1147,3 +1147,109 @@ end
                 (string
                   (literal_content)))))))
       (macro_content))))
+
+========================
+macro var as block param
+:language(crystal)
+========================
+
+{% begin %}
+  method do |%buffer|
+    puts %buffer
+  end
+{% end %}
+
+---
+
+(expressions
+  (macro_begin
+    body: (expressions
+      (macro_content)
+      (macro_var
+        name: (identifier))
+      (macro_content)
+      (macro_var
+        name: (identifier))
+      (macro_content))))
+
+=============================
+def identifier with macro exp
+:language(crystal)
+=============================
+
+{% begin %}
+  def hello_{{ "world" }}(a, b)
+  end
+{% end %}
+
+---
+
+(expressions
+  (macro_begin
+    body: (expressions
+      (macro_content)
+      (macro_expression
+        (string
+          (literal_content)))
+      (macro_content))))
+
+=====================
+ivar macro expression
+:language(crystal)
+=====================
+
+{% begin %}
+  @{{ name }} = %bar{name}
+{% end %}
+
+---
+
+(expressions
+  (macro_begin
+    body: (expressions
+      (macro_content)
+      (macro_expression
+        (identifier))
+      (macro_content)
+      (macro_var
+        name: (identifier)
+        (identifier))
+      (macro_content))))
+
+===============================
+pseudo-methods with macro nodes
+:language(crystal)
+===============================
+
+{% begin %}
+  a.is_a?({{type}})
+{% end %}
+
+---
+
+(expressions
+  (macro_begin
+    body: (expressions
+      (macro_content)
+      (macro_expression
+        (identifier))
+      (macro_content))))
+
+======================
+macro var in call args
+:language(crystal)
+======================
+
+{% begin %}
+  method.call %mvar
+{% end %}
+
+---
+
+(expressions
+  (macro_begin
+    body: (expressions
+      (macro_content)
+      (macro_var
+        name: (identifier))
+      (macro_content))))

test/corpus/todo.txt

@@ -60,15 +60,6 @@ end
 
 (expressions)
 
-===============================
-pseudo-methods with macro nodes
-:error
-===============================
-a.is_a?({{type}})
----
-
-(expressions)
-
 ============================================
 macro variables in escaped macro expressions
 :error
@@ -128,23 +119,6 @@ MyConst2 = {
               (symbol)
               (symbol))))))))
 
-======================
-macro var in call args
-======================
-
-method.call %mvar
-
----
-
-(expressions
-  (call
-    (call
-      (identifier)
-      (identifier))
-    (operator)
-    (argument_list
-      (identifier))))
-
 =======================
 nillable implicit index
 =======================
@@ -177,73 +151,6 @@ filters1.try(&.pos[name]?)
               (identifier)))))
       (ERROR))))
 
-========================
-macro var as block param
-:error
-========================
-
-method do |%buffer|
-  puts %buffer
-end
-
----
-
-(expressions
-  (call
-    method: (identifier)
-    block: (block
-      (ERROR)
-      body: (expressions
-        (call
-          receiver: (macro_var
-            name: (identifier))
-          method: (operator)
-          arguments: (argument_list
-            (call
-              receiver: (identifier)
-              method: (operator)
-              arguments: (argument_list
-                (identifier)))))))))
-
-=============================
-def identifier with macro exp
-:error
-=============================
-
-def hello_{{ "world" }}(a, b)
-end
-
----
-
-(expressions
-  (method_def
-    (identifier)
-    (ERROR
-      (macro_expression
-        (string))
-      (ERROR
-        (identifier))
-      (identifier))))
-
-=====================
-ivar macro expression
-:error
-=====================
-
-@{{ name }} = %bar{name}
-
----
-
-(expressions
-  (ERROR
-    (UNEXPECTED '{'))
-  (assign
-    (macro_expression
-      (identifier))
-    (macro_var
-      (identifier)
-      (identifier)))
-
 =================================
 percent literals in macro content
 =================================