GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 19:22:40 +01:00
Code Issues Projects Releases Wiki Activity

Improve text search in c99std/c11std modules

Browse Source 
Regular expression special characters are now escaped.
A trailing word-boundary is added to limit results to exact matches.
This commit is contained in:
Pragmatic Software 2014-12-29 23:24:54 -08:00
parent f9e2c3fb49
commit 4116afb86d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/c11std.pl
View File

@ -86,7 +86,9 @@ if($list_only) {
$result = "Sections containing '$search':\n "; $result = "Sections containing '$search':\n ";
} }
$search =~ s/\s/\\s+/g; my $qsearch = quotemeta $search;
$qsearch =~ s/\\ / /g;
$qsearch =~ s/\s+/\\s+/g;
while($text =~ m/^\s{0,4}([0-9A-Z]+\.[0-9\.]*)/msg) { while($text =~ m/^\s{0,4}([0-9A-Z]+\.[0-9\.]*)/msg) {
$this_section = $1; $this_section = $1;
@ -138,7 +140,7 @@ while($text =~ m/^\s{0,4}([0-9A-Z]+\.[0-9\.]*)/msg) {
if(length $search) { if(length $search) {
eval { eval {
if($t =~ m/\b$search/mis or $section_title =~ m/\b$search/mis) { if($t =~ m/\b$qsearch\b/mis or $section_title =~ m/\b$qsearch\b/mis) {
$matches++; $matches++;
if($matches >= $match) { if($matches >= $match) {
if($list_only) { if($list_only) {

6
modules/c99std.pl
View File

@ -86,7 +86,9 @@ if($list_only) {
$result = "Sections containing '$search':\n "; $result = "Sections containing '$search':\n ";
} }
$search =~ s/\s/\\s+/g; my $qsearch = quotemeta $search;
$qsearch =~ s/\\ / /g;
$qsearch =~ s/\s+/\\s+/g;
while($text =~ m/^\s{0,4}([0-9A-Z]+\.[0-9\.]*)/msg) { while($text =~ m/^\s{0,4}([0-9A-Z]+\.[0-9\.]*)/msg) {
$this_section = $1; $this_section = $1;
@ -137,7 +139,7 @@ while($text =~ m/^\s{0,4}([0-9A-Z]+\.[0-9\.]*)/msg) {
if(length $search) { if(length $search) {
eval { eval {
if($t =~ m/\b$search/mis or $section_title =~ m/\b$search/mis) { if($t =~ m/\b$qsearch\b/mis or $section_title =~ m/\b$qsearch\b/mis) {
$matches++; $matches++;
if($matches >= $match) { if($matches >= $match) {
if($list_only) { if($list_only) {