From f7b75bcbe993d4ddbc92da85c7148bf7fee143ee Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= Date: Mon, 17 Apr 2017 13:26:35 +0100 Subject: [PATCH 1/4] Avoid unnecessary regex captures in Catalog.pm --- src/backend/catalog/Catalog.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm index fa8de04..e7b647a 100644 --- a/src/backend/catalog/Catalog.pm +++ b/src/backend/catalog/Catalog.pm @@ -54,7 +54,7 @@ sub Catalogs { # Strip C-style comments. - s;/\*(.|\n)*\*/;;g; + s;/\*(?:.|\n)*\*/;;g; if (m;/\*;) { @@ -80,12 +80,12 @@ sub Catalogs { $catalog{natts} = $1; } - elsif (/^DATA\(insert(\s+OID\s+=\s+(\d+))?\s+\(\s*(.*)\s*\)\s*\)$/) + elsif (/^DATA\(insert(?:\s+OID\s+=\s+(\d+))?\s+\(\s*(.*)\s*\)\s*\)$/) { - check_natts($filename, $catalog{natts}, $3, + check_natts($filename, $catalog{natts}, $2, $input_file, $input_line_number); - push @{ $catalog{data} }, { oid => $2, bki_values => $3 }; + push @{ $catalog{data} }, { oid => $1, bki_values => $2 }; } elsif (/^DESCR\(\"(.*)\"\)$/) { -- 2.7.4