From 55b1e1494a6aec08c4ee39c16e22d5eb3ddbb68e Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 19 May 2010 14:30:15 -0400 Subject: [PATCH] renamed MatchSet to Matches --- tmpl/parser.cc | 6 +++--- tmpl/parser.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tmpl/parser.cc b/tmpl/parser.cc index 3d23e47..dbdab6d 100644 --- a/tmpl/parser.cc +++ b/tmpl/parser.cc @@ -140,12 +140,12 @@ void Token::process() { } -MatchSet::MatchSet(pcre * re, const char * data, int * ovector, int ovec_size) +Matches::Matches(pcre * re, const char * data, int * ovector, int ovec_size) : m_re(re), m_data(data), m_ovector(ovector), m_ovec_size(ovec_size) { } -std::string MatchSet::operator[](int index) +std::string Matches::operator[](int index) { if (0 <= index && index < (m_ovec_size / 3)) { @@ -159,7 +159,7 @@ std::string MatchSet::operator[](int index) return ""; } -std::string MatchSet::operator[](const std::string & index) +std::string Matches::operator[](const std::string & index) { int idx = pcre_get_stringnumber(m_re, index.c_str()); if (idx > 0 && idx < (m_ovec_size / 3)) diff --git a/tmpl/parser.h b/tmpl/parser.h index 0cec6f6..844a4a5 100644 --- a/tmpl/parser.h +++ b/tmpl/parser.h @@ -123,10 +123,10 @@ class I_CLASSNAME const char * m_errstr; }; -class MatchSet +class Matches { public: - MatchSet(pcre * re, const char * data, int * ovector, int ovec_size); + Matches(pcre * re, const char * data, int * ovector, int ovec_size); std::string operator[](int index); std::string operator[](const std::string & index); @@ -136,7 +136,7 @@ class MatchSet int * m_ovector; int m_ovec_size; }; -typedef refptr MatchSetRef; +typedef refptr MatchesRef; class Node {