--- nfo/perl/libs/DesignPattern/Object.pm	2003/02/09 16:24:46	1.5
+++ nfo/perl/libs/DesignPattern/Object.pm	2003/02/11 11:04:27	1.6
@@ -1,7 +1,10 @@
 ## ---------------------------------------------------------------------------
-##  $Id: Object.pm,v 1.5 2003/02/09 16:24:46 joko Exp $
+##  $Id: Object.pm,v 1.6 2003/02/11 11:04:27 joko Exp $
 ## ---------------------------------------------------------------------------
 ##  $Log: Object.pm,v $
+##  Revision 1.6  2003/02/11 11:04:27  joko
+##  + metadata (args, caller, etc.) are now stored inside {__bridge}
+##
 ##  Revision 1.5  2003/02/09 16:24:46  joko
 ##  + pseudo constructor mechanism by calling method 'constructor' on object instantiation
 ##
@@ -86,22 +89,39 @@
   # mixin arguments
   $self = { @args };
   
-  # mixin seperate
-  $self->{'__arg'} = $seperate if $seperate;
+  # scan for arguments prefixed by a double underscore '__'
+  foreach (keys %$self) {
+    if (/^__(.+?)$/) {
+      $self->{__bridge}->{$1} = $self->{$_};
+      delete $self->{$_};
+    }
+  }
+  
+  # mixin seperate - FIXME: should this not be done after blessing?
+  $self->{__bridge}->{'arg'} = $seperate if $seperate;
 
   # ... bless hash into object using classname
   bless $self, $class;
 
   # remember the caller
-    $self->{'__caller'} = caller;
+    $self->{__bridge}->{caller_module}  = caller;
     #print Dumper(caller(2));
     #exit;
 
-  $self->{__classname} = $classname;
+  $self->{__bridge}->{class_name} = $classname;
+
+  # patches for backward compatibility
+    $self->{'__arg'} = $self->{__bridge}->{'arg'} if $self->{__bridge}->{'arg'};
+    $self->{'__caller'} = $self->{__bridge}->{caller_module} if $self->{__bridge}->{caller_module};
+    $self->{'__classname'} = $self->{__bridge}->{class_name} if $self->{__bridge}->{class_name};
 
   $self->_init() if $self->can('_init');
   $self->constructor() if $self->can('constructor');
 
+  # trace
+    #print Dumper($self);
+    #exit;
+
   return $self;
 }