From 472c1ef081339a071c9e6b4e98804544ee0e32db Mon Sep 17 00:00:00 2001
From: Mattias Wadman <mattias.wadman@gmail.com>
Date: Mon, 1 Nov 2021 11:40:24 +0100
Subject: [PATCH] interp: Refactor out string_input to own function

---
 pkg/interp/interp.jq | 83 ++++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/pkg/interp/interp.jq b/pkg/interp/interp.jq
index 6983f5b1..3dc67a11 100644
--- a/pkg/interp/interp.jq
+++ b/pkg/interp/interp.jq
@@ -54,52 +54,53 @@ def input:
         , _input($opts; f)
         )
     );
+  def _input_string($opts):
+    ( _input_strings_lines
+    | if . then
+        # we're already iterating lines
+        if length == 0 then error("break")
+        else
+          ( [.[0], .[1:]] as [$h, $t]
+          | _input_strings_lines($t)
+          | $h
+          )
+        end
+      else
+        ( [_repeat_break(_input($opts; tobytes | tostring))]
+        | . as $chunks
+        | if $opts.slurp then
+            # jq --raw-input combined with --slurp reads all inputs into a string
+            # make next input break
+            ( _input_strings_lines([]) as $_
+            | $chunks
+            | join("")
+            )
+          else
+            # TODO: different line endings?
+            # jq strips last newline, "a\nb" and "a\nb\n" behaves the same
+            # also jq -R . <(echo -ne 'a\nb') <(echo c) produces "a" and "bc"
+            if ($chunks | length) > 0 then
+              ( _input_strings_lines(
+                  ( $chunks
+                  | join("")
+                  | rtrimstr("\n")
+                  | split("\n")
+                  )
+                ) as $_
+              | input
+              )
+            else error("break")
+            end
+          end
+        )
+      end
+    );
   # TODO: don't rebuild options each time
   ( options as $opts
   # TODO: refactor into def
   # this is a bit strange as jq for --raw-string can return string instead
   # with data from multiple inputs
-  | if $opts.string_input then
-      ( _input_strings_lines
-      | if . then
-          # we're already iterating lines
-          if length == 0 then error("break")
-          else
-            ( [.[0], .[1:]] as [$h, $t]
-            | _input_strings_lines($t)
-            | $h
-            )
-          end
-        else
-          ( [_repeat_break(_input($opts; tobytes | tostring))]
-          | . as $chunks
-          | if $opts.slurp then
-              # jq --raw-input combined with --slurp reads all inputs into a string
-              # make next input break
-              ( _input_strings_lines([]) as $_
-              | $chunks
-              | join("")
-              )
-            else
-              # TODO: different line endings?
-              # jq strips last newline, "a\nb" and "a\nb\n" behaves the same
-              # also jq -R . <(echo -ne 'a\nb') <(echo c) produces "a" and "bc"
-              if ($chunks | length) > 0 then
-                ( _input_strings_lines(
-                    ( $chunks
-                    | join("")
-                    | rtrimstr("\n")
-                    | split("\n")
-                    )
-                  ) as $_
-                | input
-                )
-              else error("break")
-              end
-            end
-          )
-        end
-      )
+  | if $opts.string_input then _input_string($opts)
     else _input($opts; decode)
     end
   );