[glibmm/gmmproc-refactor] Some fixes and adjustments.

[Krzesimir Nowak <krnowak src gnome org>]

commit 2e7020bed049bdec209886867ef9e12b55b79048
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Wed Jun 6 04:13:50 2012 +0200

    Some fixes and adjustments.

 tools/pm/Common/Scanner.pm    |   23 ++++++++++++-----------
 tools/pm/Common/WrapParser.pm |    2 --
 2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/tools/pm/Common/Scanner.pm b/tools/pm/Common/Scanner.pm
index f2c4cf7..d1f4631 100644
--- a/tools/pm/Common/Scanner.pm
+++ b/tools/pm/Common/Scanner.pm
@@ -120,8 +120,7 @@ sub _switch_to_stage ($$)
   else
   {
 # TODO: throw an internal error
-    print STDERR 'Internal error in Scanner - unknown stage: ' . $stage . "\n";
-    exit 1;
+    die 'Internal error in Scanner - unknown stage: ' . $stage . "\n";
   }
 }
 
@@ -173,11 +172,11 @@ sub _make_full_type ($$)
 
   if (defined $cpp_type)
   {
-    return join '::', reverse @{$namespaces}, reverse @{$classes}, $cpp_type;
+    return join '::', reverse (@{$namespaces}), reverse (@{$classes}), $cpp_type;
   }
   else
   {
-    return join '::', reverse @{$namespaces}, reverse @{$classes};
+    return join '::', reverse (@{$namespaces}), (reverse @{$classes});
   }
 }
 
@@ -444,7 +443,7 @@ sub _on_class_opaque_refcounted ($)
   }
 }
 
-sub _on_namespace ($)
+sub _on_namespace_keyword ($)
 {
   my ($self) = @_;
   my $tokens = $self->_get_tokens;
@@ -472,22 +471,24 @@ sub _on_namespace ($)
         $in_m_comment = 0;
       }
     }
-    elsif ($token =~ m'^//[/!]?$')
+    elsif ($token =~ m#^//[/!]?$#)
     {
       $in_s_comment = 1;
     }
-    elsif ($token =~ m'^/*[*!]?$')
+    elsif ($token =~ m#^/\*[*!]?$#)
     {
       $in_m_comment = 1;
     }
     elsif ($token eq '{')
     {
+
       my $namespaces = $self->_get_namespaces;
       my $namespace_levels = $self->_get_namespace_levels;
 
-      $name = Util::string_trim ($name);
+      $name = Common::Util::string_trim ($name);
       push @{$namespaces}, $name;
       push @{$namespace_levels}, $self->_get_level + 1;
+
       return;
     }
     elsif ($token eq ';')
@@ -501,7 +502,7 @@ sub _on_namespace ($)
   }
 }
 
-sub _on_class ($)
+sub _on_class_keyword ($)
 {
   my ($self) = @_;
   my $tokens = $self->_get_tokens;
@@ -617,8 +618,8 @@ sub new ($$$)
     '_CLASS_INTERFACE' => [$self, \&_on_class_interface],
     '_CLASS_OPAQUE_COPYABLE' => [$self, \&_on_class_opaque_copyable],
     '_CLASS_OPAQUE_REFCOUNTED' => [$self, \&_on_class_opaque_refcounted],
-    'namespace' => [$self, \&_on_namespace],
-    'class' => [$self, \&_on_class]
+    'namespace' => [$self, \&_on_namespace_keyword],
+    'class' => [$self, \&_on_class_keyword]
   };
 
   return $self;
diff --git a/tools/pm/Common/WrapParser.pm b/tools/pm/Common/WrapParser.pm
index a90183e..e24fc53 100644
--- a/tools/pm/Common/WrapParser.pm
+++ b/tools/pm/Common/WrapParser.pm
@@ -2867,8 +2867,6 @@ sub parse ($)
 
       if (exists $handlers->{$token})
       {
-        print 'Currently parsing: ' . $token . "\n";
-
         my $pair = $handlers->{$token};
         my $object = $pair->[0];
         my $handler = $pair->[1];