[pdf-devel] Patch for FS#66 consistency 'hell' script

[gerel]

Hey everyone,

Here is a patch for the API consistency script. The thing was about white space
characters. Stupid enough I didn't use '\s' in regexs and as we all know, some
editors use spaces and other tabs (duh!).

Also see there are some tests failing due to variable type inconsitencies.

Hope all is fine.

##
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/
# testament_sha1: 157d7edda3c443dcd41bc69a8cc0c8e0ad13c630
# timestamp: 2008-09-13 15:26:32 -0300
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog   2008-09-13 18:30:12 +0000
+++ ChangeLog   2008-09-13 18:26:22 +0000
@@ -1,3 +1,8 @@
+2008-09-13  Gerardo E. Gidoni  <address@hidden>
+
+       * prmgt/check-api-doc-consistency.pl: using '\s' class character
+       in regexs.
+
 2008-09-13  Jose E. Marchesi  <address@hidden>
 
        * src/base/pdf-list.h (pdf_list_get_at): third argument should be

=== modified file 'prmgt/check-api-doc-consistency.pl'
--- prmgt/check-api-doc-consistency.pl  2008-07-11 17:52:59 +0000
+++ prmgt/check-api-doc-consistency.pl  2008-09-13 18:26:22 +0000
@@ -45,15 +45,15 @@
     # remove info syntax
     $str =~ s/(address@hidden |address@hidden)//g;
     # remove curly brackets
-    $str =~ s/ *(\{|\}) */ /g;
+    $str =~ s/\s*(\{|\})\s*/ /g;
     # remove comma spaces
-    $str =~ s/ *, */,/g;
+    $str =~ s/\s*,\s*/,/g;
     # remove pointer spaces
-    $str =~ s/ *\* */\*/g;
+    $str =~ s/\s*\*\s*/\*/g;
     # remove bracket spaces
-    $str =~ s/ *(\(|\)) */$1/g;
+    $str =~ s/\s*(\(|\))\s*/$1/g;
     # remove word spaces
-    $str =~ s/ *(\w+) +/$1 /g;
+    $str =~ s/\s*(\w+)\s+/$1 /g;
 
     if ($novars == 1){
         # remove variable names
@@ -101,19 +101,20 @@
     # remove newlines
     $lines =~ tr/\n/ /;
     # remove comma spaces
-    $lines =~ s/ *, */,/g;
+    $lines =~ s/\s*,\s*/,/g;
     # remove pointer spaces
-    $lines =~ s/ *\* */\*/g;
+    $lines =~ s/\s*\*\s*/\*/g;
     # remove bracket spaces
-    $lines =~ s/ *(\(|\)) */$1/g;
+    $lines =~ s/\s*(\(|\))\s*/$1/g;
     # remove word spaces
-    $lines =~ s/ *(\w+) +/$1 /g;
+    $lines =~ s/\s*(\w+)\s+/$1 /g;
 
     if ($novars == 1){
         # remove variable names
         $lines =~ s/(\w+)(,|\))/$2/g;
     }
-
+#    print "\n\n\n";
+#    print $lines . "\n\n\n";
     return ($lines);
 }
 
@@ -244,6 +245,7 @@
 {
     $matched=0;
     $reg = quotemeta($docsig);
+#    print " >>>> $reg" . "\n";
     foreach my $implsig (@IMPLSIGS){
         if ($implsig =~ m/$reg/){
             $matched = 1;

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU47gb0AAuDfgEAwXf///1qE
AAS/////UAU70w1DQSAZAISSJoKYQ9J6nlNPRDBG0Q0BppoAaHMJgEwAmEwmmAAATJpoGEpqaJpq
mnqeiDIepiAAaABoAAcwmATACYTCaYAABMmmgYSSCNAJkxTI0aZMhpTYptGUMIbRGWINFs74MRF8
jCQkHjiuSx7TjF1TzaLJq1M1sb4IRNMoMmY2HTGLMVaAQPQYr0m+uAxj7fIs1fVNDdXXgTAkkxns
YbDp7OwoTtVIwqUkEMOF3ooKU5PGKkooKKtVLDbckJJX7o60spg7ifkvnwm46vLLKODXuQOFprpo
2z3MtV85mm64r47Y61qAnT66orqZCzLGD8gMyLjuEYqQ2soY3WHaaZRKAwx9ji2bxNitjfOGqWBZ
SVvBQLGpNBoKxe7AWqjY/B9CWcovjBImJUHPebyiyRj3vfRNUa0d00azMiVkMw5gubZekHnIHHkO
kdP7RJzYRKj4vHjCcMVqEQ5mSUDAa4ApFGrRXOaj7OQmLyFIwHmMPTigeZDBDH0HmAxMYIy0+eJf
VL6QBZuP8TVRTKBrwBZahqaFUGYU2mNeoYLAKqV+7JKcqI5FAEssiuZiJJ1QGio0lKKQOQFfvREo
CiwehQaosNQ8rH9AF0qTCo4FhlZNO5mpoK088Ha7SgnvlCbQdWEmkVGoRNW8X64qyEGuESKGRyBT
RKRGMScrKIkgkN+QMygvo0GoskUOcabyiRAUIFswE5TyGmJyYyLw0lQPGOT7CUJEAGB7wKR0SvaX
D1UKcuJycm6AJBVZXUzDpPSCDgVKyzwMIYMMMaJ5FxSfkCvJ9pRAg0AWRgUjFZG8Yv0neEjXz1VM
X0PlimTBHQsETfALBkNwNLbLE2NB6IwW4qx3TLXgt7jIA9GCllnQ3Ja84FFMrlK1g3AV90gRmlU6
I+x/FhmLK0yPSLN3t1Ew8eSUqChZuQ6/RAwYcLebTabqBiBtOUunZPuJiwgjl8NCohcuB6Fr/oEb
Uto9eFwd4Yk3EO0q8d3YAfYpNQ5ecfLPAObfHtZw1kKQicgboOcmjVUOV2JoIA8PAdWLMo6zmWFh
Msec3DEDo1lJv8TziQInkaOJFU85zU9jD4DIcb9YwdeyBxzAJz9BSD/imE7Zc73nBd+wNKNWwyVS
DfIpRDPI6jbrDMzWkeWL1NxaXsus5+yeJdvxwHDgXFAzg3EzIY40feceDF1Jo/AlWfjuDPpZHUL3
crWC7mSUx0+wFBD+FAxRlay4RPMPw2pFiLs5dXffikggzoGCpiXBxrppFQjJhpaYHdDxEZjDMxtR
DVskMXBM8KU5TrjzVEQx7psVF7H9qkeDgYNSmgRRBgHp3HqBwQUQZhahJy27lexb+nkgwnQeU7w+
YSRWj7iVS6Hqm4DHAzzzDoipwlmFZVz/hddllg3sg9QO3A2Wot+Y9O0Iwe9HDfaQBQSt7YFzJ9Al
NLSnr2HFkHBEiwy8QHI7RuH2YQcvlYg8wdNWM0jqCxbDigkDyYMSSiE6MkNOo95qG7nkLArscwcb
LgljwHmATopWxyHKLBfaDx4lYds89HhbeG4KFkgheHMa/QrmeyV0045zevBwGrFSWuw3O/UH+LuS
KcKEgnHcDeg=
###


cheers

-gerel