Merge commit 'refs/pullreqs/8' into master

gkappler · Aug 19, 2020 · 6fb562a · 6fb562a
2 parents 1ba207c + 43beb4a
commit 6fb562a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/CombinedParsers.jl b/src/CombinedParsers.jl
@@ -1368,9 +1368,10 @@ end
 export Repeat_stop, Repeat_until
 """
     Repeat_stop(p,stop)
+    Repeat_stop(p,stop; min=0, max=Repeat_max)
 
 Repeat `p` until `stop` (`NegativeLookahead`), not matching `stop`.
-Sets cursor **before** `stop`.
+Sets cursor **before** `stop`. Tries `min:max` times
 Returns results of `p`.
 
 ```jldoctest
@@ -1389,13 +1390,13 @@ julia> parse(p,"acbX")
 
 See also [`NegativeLookahead`](@ref)
 """
-Repeat_stop(p,stop) =
-    Repeat(map(IndexAt(2),Sequence(NegativeLookahead(parser(stop)),parser(p))))
+Repeat_stop(p,stop; min=0, max=Repeat_max) =
+    Repeat(map(IndexAt(2),Sequence(NegativeLookahead(parser(stop)),parser(p)));min=min,max=max)
 
 @deprecate rep_stop(a...;kw...) Repeat_stop(a...;kw...)
 
 """
-    Repeat_until(p,until, with_until=false;wrap=identity)
+    Repeat_until(p,until, with_until=false; wrap=identity, min=0, max=Repeat_max)
 
 Repeat `p` until `stop` (with [`Repeat_stop`](@ref)).
 and set point **after** `stop`.
@@ -1424,11 +1425,11 @@ julia> parse(Repeat_until(AnyChar(),'b';wrap=JoinSubstring),"acbX")
 
 See also [`NegativeLookahead`](@ref)
 """
-Repeat_until(p,until, with_until=false;wrap=identity) =
+Repeat_until(p,until, with_until=false;wrap=identity,min=0,max=Repeat_max) =
     if with_until
-        Sequence(map(wrap,Atomic(Repeat_stop(p,until))), until)
+        Sequence(map(wrap,Atomic(Repeat_stop(p,until;min=min,max=max))), until)
     else
-        map(IndexAt(1),Sequence(map(wrap,Atomic(Repeat_stop(p,until))), until))
+        map(IndexAt(1),Sequence(map(wrap,Atomic(Repeat_stop(p,until;min=min,max=max))), until))
     end
 
 @deprecate rep_until(p,until) Repeat_until(p,until)

diff --git a/test/test-parser.jl b/test/test-parser.jl
@@ -1,6 +1,7 @@
 using CombinedParsers.Regexp
 import CombinedParsers.Regexp: word, non_word
 import CombinedParsers.Regexp: newline, inline, whitespace_maybe, whitespace_horizontal
+import CombinedParsers.Regexp: Repeat_max
 
 @testset "CombinedParsers" begin
 @testset "CharIn" begin
@@ -42,6 +43,16 @@ end
     @test parse(Sequence("(", Repeat_until(!!Either(word,non_word), ")")),
                 "(balanced parenthesis)") ==
         ("(",["balanced", " ", "parenthesis"])
+    # Test if strings bigger than Repeat_max can be parsed using max optional ArgumentError
+    new_Repeat_max = Repeat_max+10;
+    dat = 'a'^(new_Repeat_max)*'b';
+    @test String(parse(Repeat_until('a','b';max=new_Repeat_max), dat))==dat[1:end-1]
+end
+
+@testset "Repeat_stop" begin
+    new_Repeat_max = Repeat_max+10;
+    dat = 'a'^(new_Repeat_max)*'b';
+    @test String(parse(Repeat_stop('a','b';max=new_Repeat_max), dat))==dat[1:end-1]
 end
 end