join_adjacent now takes more than one type

Author: stasm

syntax/abstract.mjs

@@ -56,10 +56,11 @@ export function list_into(Type) {
             return entries =>
                 always(new FTL.Resource(
                     entries
-                        .reduce(join_adjacent(FTL.Junk), [])
-                        .reduce(join_adjacent(FTL.Comment), [])
-                        .reduce(join_adjacent(FTL.GroupComment), [])
-                        .reduce(join_adjacent(FTL.ResourceComment), [])
+                        .reduce(join_adjacent(
+                            FTL.Junk,
+                            FTL.Comment,
+                            FTL.GroupComment,
+                            FTL.ResourceComment), [])
                         .reduce(attach_comments, [])
                         .filter(remove_blank_lines)));
         case FTL.SelectExpression:
@@ -117,15 +118,16 @@ export function into(Type) {
     }
 }
 
-function join_adjacent(Type) {
+function join_adjacent(...types) {
     return function(acc, cur) {
         let prev = acc[acc.length - 1];
-        if (prev instanceof Type && cur instanceof Type) {
-            join_of_type(Type, prev, cur);
-            return acc;
-        } else {
-            return acc.concat(cur);
+        for (let Type of types) {
+            if (prev instanceof Type && cur instanceof Type) {
+                join_of_type(Type, prev, cur);
+                return acc;
+            }
         }
+        return acc.concat(cur);
     };
 }