Separate indicator logic from macro

Author: omus

src/BlockScalars.jl

@@ -10,6 +10,49 @@ function block(str::AbstractString; style=DEFAULT_STYLE, chomp=DEFAULT_CHOMP)
     block(str, style, chomp)
 end
 
+function block(str::AbstractString, indicators::AbstractString)
+    indicators_len = length(indicators)
+    indicators_len > 2 && throw(ArgumentError("Too many indicators provided"))
+
+    # Note: Using '\0` to indicate undefined
+    style_char, chomp_char = if indicators_len == 2
+        indicators
+    elseif indicators_len == 1
+        ind = indicators[1]
+        if ind in "fl"
+            ind, '\0'
+        else
+            '\0', ind
+        end
+    else
+        '\0', '\0'
+    end
+
+    style = if style_char == 'f'
+        :folded
+    elseif style_char == 'l'
+        :literal
+    elseif style_char == '\0'
+        DEFAULT_STYLE
+    else
+        throw(ArgumentError("Unknown block style indicator: $(repr(style_char))"))
+    end
+
+    chomp = if chomp_char == 'c'
+        :clip
+    elseif chomp_char == 's'
+        :strip
+    elseif chomp_char == 'k'
+        :keep
+    elseif chomp_char == '\0'
+        DEFAULT_CHOMP
+    else
+        throw(ArgumentError("Unknown block chomping indicator: $(repr(chomp_char))"))
+    end
+
+    return block(str, style, chomp)
+end
+
 function block(str::AbstractString, style::Symbol, chomp::Symbol=DEFAULT_CHOMP)
     # Append an additional, non-space, character to force one more iteration of the style
     # loop
@@ -95,46 +138,7 @@ function block(str::AbstractString, style::Symbol, chomp::Symbol=DEFAULT_CHOMP)
 end
 
 macro blk_str(str::AbstractString, indicators::AbstractString="")
-    indicators_len = length(indicators)
-    indicators_len > 2 && throw(ArgumentError("Too many indicators provided"))
-
-    # Note: Using '\0` to indicate undefined
-    style_char, chomp_char = if indicators_len == 2
-        indicators
-    elseif indicators_len == 1
-        ind = indicators[1]
-        if ind in "fl"
-            ind, '\0'
-        else
-            '\0', ind
-        end
-    else
-        '\0', '\0'
-    end
-
-    style = if style_char == 'f'
-        :folded
-    elseif style_char == 'l'
-        :literal
-    elseif style_char == '\0'
-        DEFAULT_STYLE
-    else
-        throw(ArgumentError("Unknown block style indicator: $(repr(style_char))"))
-    end
-
-    chomp = if chomp_char == 'c'
-        :clip
-    elseif chomp_char == 's'
-        :strip
-    elseif chomp_char == 'k'
-        :keep
-    elseif chomp_char == '\0'
-        DEFAULT_CHOMP
-    else
-        throw(ArgumentError("Unknown block chomping indicator: $(repr(chomp_char))"))
-    end
-
-    return block(str, style, chomp)
+    return block(str, indicators)
 end
 
 end

test/runtests.jl

@@ -48,6 +48,10 @@ end
             @test block(str, style=:literal, chomp=:keep) == expected_lk
             @test block(str, style=:literal, chomp=:clip) == expected_lc
             @test block(str, style=:literal, chomp=:strip) == expected_ls
+
+            @test block(str, "lk") == expected_lk
+            @test block(str, "lc") == expected_lc
+            @test block(str, "ls") == expected_ls
         end
 
         @testset "folding" begin
@@ -58,6 +62,10 @@ end
             @test block(str, style=:folded, chomp=:keep) == expected_fk
             @test block(str, style=:folded, chomp=:clip) == expected_fc
             @test block(str, style=:folded, chomp=:strip) == expected_fs
+
+            @test block(str, "fk") == expected_fk
+            @test block(str, "fc") == expected_fc
+            @test block(str, "fs") == expected_fs
         end
 
         @testset "default chomp" begin
@@ -66,16 +74,24 @@ end
 
             @test block(str, style=:literal) == expected_ls
             @test block(str, style=:folded) == expected_fs
+
+            @test block(str, "l") == expected_ls
+            @test block(str, "f") == expected_fs
         end
 
         @testset "default style" begin
             @test block(str, chomp=:keep) == expected_fk
             @test block(str, chomp=:clip) == expected_fc
             @test block(str, chomp=:strip) == expected_fs
+
+            @test block(str, "k") == expected_fk
+            @test block(str, "c") == expected_fc
+            @test block(str, "s") == expected_fs
         end
 
         @testset "default style/chomp" begin
             @test block(str) == expected_fs
+            @test block(str, "") == expected_fs
         end
     end