~ubuntu-branches/debian/sid/gource/sid

« back to all changes in this revision

Viewing changes to src/core/regex.cpp

Committer: Package Import Robot
Author(s): Andrew Caudwell
Date: 2014-04-15 16:30:17 UTC
mfrom: (1.2.15)
Revision ID: package-import@ubuntu.com-20140415163017-ucdr2josj1spzrga

Tags: 0.41-1

* New upstream release
* Made VCS URIs canonical
* Changed watch file to look at Github for releases

files added:
build-aux

build-aux/compile

build-aux/config.guess

build-aux/config.sub

build-aux/depcomp

build-aux/install-sh

build-aux/missing

src/core/png_writer.cpp

src/core/png_writer.h

src/core/timezone.cpp

src/core/timezone.h

files removed:
config.guess

config.sub

depcomp

install-sh

missing

files modified:
ChangeLog

INSTALL

Makefile.am

Makefile.in

README

aclocal.m4

configure

configure.ac

data/gource.1

debian/changelog

debian/control

debian/watch

gource.win32.cbp

src/core/conffile.cpp

src/core/conffile.h

src/core/display.cpp

src/core/display.h

src/core/fxfont.cpp

src/core/fxfont.h

src/core/logger.cpp

src/core/mousecursor.cpp

src/core/ppm.cpp

src/core/ppm.h

src/core/regex.cpp

src/core/regex.h

src/core/resource.cpp

src/core/resource.h

src/core/sdlapp.cpp

src/core/sdlapp.h

src/core/settings.cpp

src/core/settings.h

src/core/shader_common.h

src/core/stringhash.cpp

src/core/stringhash.h

src/core/texture.h

src/core/tga.cpp

src/core/tga.h

src/core/vectors.h

src/dirnode.cpp

src/dirnode.h

src/file.cpp

src/file.h

src/formats/apache.cpp

src/formats/apache.h

src/formats/bzr.cpp

src/formats/bzr.h

src/formats/commitlog.cpp

src/formats/commitlog.h

src/formats/cvs-exp.cpp

src/formats/cvs-exp.h

src/formats/cvs2cl.cpp

src/formats/cvs2cl.h

src/formats/git.cpp

src/formats/git.h

src/formats/hg.cpp

src/formats/hg.h

src/formats/svn.cpp

src/formats/svn.h

src/gource.cpp

src/gource.h

src/gource_settings.cpp

src/gource_settings.h

src/gource_shell.cpp

src/gource_shell.h

src/logmill.cpp

src/main.cpp

src/tinyxml/tinystr.cpp

src/tinyxml/tinystr.h

src/tinyxml/tinyxml.cpp

src/tinyxml/tinyxml.h

src/tinyxml/tinyxmlerror.cpp

src/tinyxml/tinyxmlparser.cpp

Show diffs side-by-side

added added

removed removed

src/core/regex.cpp

138

139

bool Regex::matchAll(const std::string& str, std::vector<std::string>* results) {

140

141

int offset = -1;

141

int offset = 0;

142

int match_count = 0;

142

143

if(results != 0) results->clear();

143

while((offset = matchOffset(str, results, offset+1)) != -1 && offset < str.size());

144

145

return (offset != -1);

144

145

int str_size = str.size();

146

147

while((offset = matchOffset(str, results, offset)) != -1) {

148

match_count++;

149

if(offset >= str_size) break;

150

}

151

152

return match_count>0;

146

153

}

147

154

148

155

int Regex::matchOffset(const std::string& str, std::vector<std::string>* results, int offset) {

149

156

150

157

int ovector[REGEX_MAX_MATCHES];

151

158

159

if(offset >= str.size()) return -1;

160

161

// To allow ^ to match the start of the remaining string

162

// we offset the string before passing it to pcre_exec

163

152

164

int rc = pcre_exec(

153

165

re,

154

166

155

str.c_str(),

156

str.size(),

157

offset,

167

str.c_str() + offset,

168

str.size()-offset,

169

158

170

159

171

ovector,

160

172

REGEX_MAX_MATCHES

174

186

if(match_start == -1) {

175

187

results->push_back(std::string(""));

176

188

} else {

177

std::string match(str, match_start, match_end-match_start);

189

std::string match(str, match_start+offset, match_end-match_start);

178

190

results->push_back(match);

179

191

}

180

192

}

181

193

}

182

194

183

return ovector[1];

195

return ovector[1]+offset;

184

196

}

185

186

Older »