diff --git a/bindings/pascocoa/parser/ObjCParserTypes.pas b/bindings/pascocoa/parser/ObjCParserTypes.pas
index 400223434..0d0078e62 100755
--- a/bindings/pascocoa/parser/ObjCParserTypes.pas
+++ b/bindings/pascocoa/parser/ObjCParserTypes.pas
@@ -135,14 +135,19 @@ type
   TEntity = class(TObject)
   protected
     function DoParse(AParser: TTextParser): Boolean; virtual; abstract;
+
   public
-    owner : TEntity;
-    Items : TList;
+    Owner       : TEntity;
+    Items       : TList;
+
     TagComment  : AnsiString;
-    constructor Create(AOwner: TEntity);
+    
+    constructor Create(AOwner: TEntity); virtual;
     destructor Destroy; override;
     function Parse(AParser: TTextParser): Boolean; virtual;
+    procedure Assign(AEntity: TEntity); virtual;
   end;
+  TEntityClass = class of TEntity;
 
   TCPrepocessor = class(TEntity);
 
@@ -426,7 +431,7 @@ type
   public
     _Classes    : TStringList;
     _isClasses  : Boolean; // classes or protocols
-    constructor Create(AOwner: TEntity);
+    constructor Create(AOwner: TEntity); override;
     destructor Destroy; override;
   end;
 
@@ -450,7 +455,7 @@ type
     _SuperClass   : AnsiString;
     _Category     : AnsiString;
     _Protocols    : TStringList;
-    constructor Create(AOwner : TEntity);
+    constructor Create(AOwner : TEntity); override;
     destructor Destroy; override;
   end;
 
@@ -465,7 +470,7 @@ type
     function DoParse(AParser: TTextParser): Boolean; override;
   public
     _FileName     : AnsiString;
-    constructor Create(AOwner: TEntity = nil);
+    constructor Create(AOwner: TEntity = nil); override;
   end;
 
 const
@@ -1305,6 +1310,11 @@ end;
 
 { TEntity }
 
+procedure TEntity.Assign(AEntity: TEntity);
+begin
+  TagComment := AEntity.TagComment;
+end;
+
 constructor TEntity.Create(AOwner: TEntity);
 begin
   inherited Create;
diff --git a/bindings/pascocoa/parser/objcparser.pas b/bindings/pascocoa/parser/objcparser.pas
index 6015a19a8..7544f58b8 100755
--- a/bindings/pascocoa/parser/objcparser.pas
+++ b/bindings/pascocoa/parser/objcparser.pas
@@ -1,7 +1,7 @@
-{ * This file is part of ObjCParser tool 
+{ * This file is part of ObjCParser tool
   * Copyright (C) 2008-2009 by Dmitry Boyarintsev under the GNU LGPL
   * license version 2.0 or 2.1.  You should have received a copy of the
-  * LGPL license along with at http://www.gnu.org/                                              
+  * LGPL license along with at http://www.gnu.org/
 }
 
 program objcparser;
@@ -21,7 +21,7 @@ uses
   SysUtils,
   ObjCParserUtils,
   ObjCParserTypes,
-  CToPasWriter, gnuccFeatures;
+  gnuccFeatures;
 
 type
   // this object is used only for precomile directives handling
@@ -470,7 +470,7 @@ begin
   end;
 end; 
 
-procedure DoTest(const InputFile: AnsiString);
+{procedure DoTest(const InputFile: AnsiString);
 var
   hdr   : TObjCHeader;
 
@@ -501,7 +501,7 @@ begin
     wrt.Free;
     hdr.Free;
   end;
-end;
+end;}
 
 begin
   doOutput := true;
@@ -515,9 +515,6 @@ begin
       Exit;
     end;
    
-    DoTest(inpf); 
-    Exit; 
-
     st := TStringList.Create;
     try
       if not ReadAndParseFile(inpf, st, err) then