Reverse: fix SubString, ncodeunits, regex_string, revert(::MappingPar…

…ser)
gkappler · Aug 4, 2020 · 366d42b · 366d42b
1 parent 4bd7a5d
commit 366d42b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/caseless.jl b/src/caseless.jl
@@ -16,6 +16,8 @@ end
     _iterate(parser.parser, MappedChars(parser.f,sequence), till,posi,after,state)
 end
 
+revert(x::MappingParser) = MappingParser(x.f,x.parser)
+
 deepmap_parser(f::Function,mem::AbstractDict,x::MappingParser,a...;kw...) =
     get!(mem,x) do
         ## construct replacement, e.g. if P <: WrappedParser

diff --git a/src/reverse.jl b/src/reverse.jl
@@ -20,14 +20,16 @@ reverse_index(x::Reverse,i) =
 reverse_index(x::AbstractString,i) =
     i
 
-Base.SubString(x::Reverse,start,stop) =
-    SubString(x.x, reverse_index(x,stop), reverse_index(x,start))
+Base.SubString(x::Reverse,start::Int,stop::Int) =
+    SubString(x.x, reverse_index(x, stop), reverse_index(x, start))
 
 function set_capture(sequence::Reverse, index::Int, x)
     @warn "check"
     set_capture(sequence.x,index,x)
 end
 
+regex_string(x::Reverse) = regex_escape(x.x)
+Base.ncodeunits(x::Reverse) = ncodeunits(x.x)
 Base.firstindex(x::Reverse) = 1
 Base.lastindex(x::Reverse) = x.lastindex
 Base.getindex(x::Reverse,is::UnitRange) = getindex(x.x,reverse_index(x,is.stop):reverse_index(x,is.start))