replacing string_matches with one-liner

src/PEGParser.jl

@@ -48,24 +48,6 @@ function make_node(rule, value, first, last, children::Array)
   return result
 end
 
-
-# TODO: there should be string functions that already do this
-function string_matches(expected::Char, actual::AbstractString, first::Int, last::Int)
-  if first > length(actual)
-    return false
-  end
-
-  return char(actual[first]) == expected;
-end
-
-function string_matches(expected::AbstractString, actual::AbstractString, first::Int, last::Int)
-  if last - 1 > length(actual)
-    return false;
-  end
-
-  return expected == actual[first:last-1];
-end
-
 include("parse.jl")
 
 end

src/parse.jl

@@ -128,13 +128,12 @@ end
 function parse_newcachekey(grammar::Grammar, rule::Terminal, text::AbstractString, pos::Int, cache)
   local size::Int = length(rule.value)
 
-  if string_matches(rule.value, text, pos, pos+size)
-    size = length(rule.value)
+  if ismatch(Regex("\^$(rule.value)"),text[pos:end])
     node = make_node(rule, text[pos:pos+size-1], pos, pos+size, [])
     return (node, pos+size, nothing)
   end
 
-  len = min(pos+length(rule.value)-1, length(text))
+  len = min(pos+size-1, length(text))
   return (nothing, pos, ParseError("'$(text[pos:len])' does not match '$(rule.value)'. At pos: $pos"))
 end