Browse Source

* updated for 1.1 compiler that does not allow calling conventions
for constructor/destructor

peter 22 years ago
parent
commit
cec4ac46aa

+ 7 - 3
tests/test/cg/tcalobj3.pp

@@ -194,7 +194,7 @@ type
    constructor constructor_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_init;
-   destructor destructor_params_done;cdecl;
+   destructor destructor_params_done;
    procedure method_normal_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);cdecl;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
@@ -431,7 +431,7 @@ constructor tvmtobject.constructor_init;
    object_s64bit := 0;
  end;
 
-destructor tvmtobject.destructor_params_done;cdecl;
+destructor tvmtobject.destructor_params_done;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -3294,7 +3294,11 @@ end.
 
 {
   $Log$
-  Revision 1.7  2002-10-29 20:44:30  carl
+  Revision 1.8  2002-12-29 15:30:55  peter
+    * updated for 1.1 compiler that does not allow calling conventions
+      for constructor/destructor
+
+  Revision 1.7  2002/10/29 20:44:30  carl
     * updated with corrects testing (removed cdecl in constructors)
 
   Revision 1.6  2002/10/21 19:21:28  carl

+ 24 - 20
tests/test/cg/tcalobj4.pp

@@ -192,9 +192,9 @@ type
    object_s32bit : longint;
    object_s64bit : int64;
    constructor constructor_params_mixed(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);popstack;
-   constructor constructor_init;popstack;
-   destructor destructor_params_done;popstack;
+      bigstring: shortstring; s32: longint; s64: int64);
+   constructor constructor_init;
+   destructor destructor_params_done;
    procedure method_normal_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);popstack;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
@@ -225,15 +225,15 @@ type
  pheritedvmtobject = ^theritedvmtobject;
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);popstack;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);popstack;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);popstack;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_normal(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);popstack;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);popstack;
+      bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_overriden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;popstack;
 
@@ -260,7 +260,7 @@ type
  pfailvmtobject = ^tfailvmtobject;
  tfailvmtobject = object(tvmtobject)
  public
-    constructor constructor_public_none;popstack;
+    constructor constructor_public_none;
  end;
 
 
@@ -402,7 +402,7 @@ type
 {**************************************************************************}
 {                             FAILED OBJECT                                }
 {**************************************************************************}
-constructor tfailvmtobject.constructor_public_none;popstack;
+constructor tfailvmtobject.constructor_public_none;
  begin
     { this calls the constructor fail special keyword }
     fail;
@@ -412,7 +412,7 @@ constructor tfailvmtobject.constructor_public_none;popstack;
 {                               VMT  OBJECT                                }
 {**************************************************************************}
 constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
-   bigstring: shortstring; s32: longint; s64: int64);popstack;
+   bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
    object_u16bit := u16;
@@ -422,7 +422,7 @@ constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
  end;
 
 
-constructor tvmtobject.constructor_init;popstack;
+constructor tvmtobject.constructor_init;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -431,7 +431,7 @@ constructor tvmtobject.constructor_init;popstack;
    object_s64bit := 0;
  end;
 
-destructor tvmtobject.destructor_params_done;popstack;
+destructor tvmtobject.destructor_params_done;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -516,7 +516,7 @@ procedure tvmtobject.method_virtual_call_normal_params_mixed(
    end;
 
 procedure tvmtobject.method_virtual_call_constructor_params_mixed(
-      u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);popstack;
+      u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
      constructor_params_mixed(u8, u16, bigstring, s32, s64);
    end;
@@ -536,7 +536,7 @@ procedure tvmtobject.method_virtual_call_inherited_params_mixed(
 {                          INHERITED VMT OBJECT                            }
 {**************************************************************************}
 constructor theritedvmtobject.constructor_params_mixed_call_virtual(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);popstack;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -547,7 +547,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_overriden(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);popstack;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -558,7 +558,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);popstack;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -569,7 +569,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_static(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_normal(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);popstack;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -580,7 +580,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_normal(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_inherited
-   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);popstack;
+   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -3294,7 +3294,11 @@ end.
 
 {
   $Log$
-  Revision 1.3  2002-09-07 15:40:53  peter
+  Revision 1.4  2002-12-29 15:30:55  peter
+    * updated for 1.1 compiler that does not allow calling conventions
+      for constructor/destructor
+
+  Revision 1.3  2002/09/07 15:40:53  peter
     * old logs removed and tabs fixed
 
   Revision 1.2  2002/05/05 19:13:19  carl

+ 23 - 19
tests/test/cg/tcalobj5.pp

@@ -192,9 +192,9 @@ type
    object_s32bit : longint;
    object_s64bit : int64;
    constructor constructor_params_mixed(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);safecall;
-   constructor constructor_init;safecall;
-   destructor destructor_params_done;safecall;
+      bigstring: shortstring; s32: longint; s64: int64);
+   constructor constructor_init;
+   destructor destructor_params_done;
    procedure method_normal_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);safecall;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
@@ -225,15 +225,15 @@ type
  pheritedvmtobject = ^theritedvmtobject;
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);safecall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);safecall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);safecall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_normal(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);safecall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);safecall;
+      bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_overriden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;safecall;
 
@@ -260,7 +260,7 @@ type
  pfailvmtobject = ^tfailvmtobject;
  tfailvmtobject = object(tvmtobject)
  public
-    constructor constructor_public_none;safecall;
+    constructor constructor_public_none;
  end;
 
 
@@ -402,7 +402,7 @@ type
 {**************************************************************************}
 {                             FAILED OBJECT                                }
 {**************************************************************************}
-constructor tfailvmtobject.constructor_public_none;safecall;
+constructor tfailvmtobject.constructor_public_none;
  begin
     { this calls the constructor fail special keyword }
     fail;
@@ -412,7 +412,7 @@ constructor tfailvmtobject.constructor_public_none;safecall;
 {                               VMT  OBJECT                                }
 {**************************************************************************}
 constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
-   bigstring: shortstring; s32: longint; s64: int64);safecall;
+   bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
    object_u16bit := u16;
@@ -422,7 +422,7 @@ constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
  end;
 
 
-constructor tvmtobject.constructor_init;safecall;
+constructor tvmtobject.constructor_init;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -431,7 +431,7 @@ constructor tvmtobject.constructor_init;safecall;
    object_s64bit := 0;
  end;
 
-destructor tvmtobject.destructor_params_done;safecall;
+destructor tvmtobject.destructor_params_done;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -536,7 +536,7 @@ procedure tvmtobject.method_virtual_call_inherited_params_mixed(
 {                          INHERITED VMT OBJECT                            }
 {**************************************************************************}
 constructor theritedvmtobject.constructor_params_mixed_call_virtual(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);safecall;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -547,7 +547,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_overriden(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);safecall;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -558,7 +558,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);safecall;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -569,7 +569,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_static(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_normal(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);safecall;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -580,7 +580,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_normal(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_inherited
-   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);safecall;
+   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -3295,7 +3295,11 @@ end.
 
 {
   $Log$
-  Revision 1.3  2002-09-07 15:40:54  peter
+  Revision 1.4  2002-12-29 15:30:55  peter
+    * updated for 1.1 compiler that does not allow calling conventions
+      for constructor/destructor
+
+  Revision 1.3  2002/09/07 15:40:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.2  2002/05/05 19:13:19  carl

+ 23 - 19
tests/test/cg/tcalobj7.pp

@@ -192,9 +192,9 @@ type
    object_s32bit : longint;
    object_s64bit : int64;
    constructor constructor_params_mixed(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);stdcall;
-   constructor constructor_init;stdcall;
-   destructor destructor_params_done;stdcall;
+      bigstring: shortstring; s32: longint; s64: int64);
+   constructor constructor_init;
+   destructor destructor_params_done;
    procedure method_normal_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);stdcall;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
@@ -225,15 +225,15 @@ type
  pheritedvmtobject = ^theritedvmtobject;
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);stdcall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);stdcall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);stdcall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_normal(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);stdcall;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);stdcall;
+      bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_overriden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
 
@@ -260,7 +260,7 @@ type
  pfailvmtobject = ^tfailvmtobject;
  tfailvmtobject = object(tvmtobject)
  public
-    constructor constructor_public_none;stdcall;
+    constructor constructor_public_none;
  end;
 
 
@@ -402,7 +402,7 @@ type
 {**************************************************************************}
 {                             FAILED OBJECT                                }
 {**************************************************************************}
-constructor tfailvmtobject.constructor_public_none;stdcall;
+constructor tfailvmtobject.constructor_public_none;
  begin
     { this calls the constructor fail special keyword }
     fail;
@@ -412,7 +412,7 @@ constructor tfailvmtobject.constructor_public_none;stdcall;
 {                               VMT  OBJECT                                }
 {**************************************************************************}
 constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
-   bigstring: shortstring; s32: longint; s64: int64);stdcall;
+   bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
    object_u16bit := u16;
@@ -422,7 +422,7 @@ constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
  end;
 
 
-constructor tvmtobject.constructor_init;stdcall;
+constructor tvmtobject.constructor_init;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -431,7 +431,7 @@ constructor tvmtobject.constructor_init;stdcall;
    object_s64bit := 0;
  end;
 
-destructor tvmtobject.destructor_params_done;stdcall;
+destructor tvmtobject.destructor_params_done;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -536,7 +536,7 @@ procedure tvmtobject.method_virtual_call_inherited_params_mixed(
 {                          INHERITED VMT OBJECT                            }
 {**************************************************************************}
 constructor theritedvmtobject.constructor_params_mixed_call_virtual(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -547,7 +547,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_overriden(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -558,7 +558,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -569,7 +569,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_static(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_normal(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -580,7 +580,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_normal(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_inherited
-   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
+   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -3295,7 +3295,11 @@ end.
 
 {
   $Log$
-  Revision 1.3  2002-09-07 15:40:54  peter
+  Revision 1.4  2002-12-29 15:30:55  peter
+    * updated for 1.1 compiler that does not allow calling conventions
+      for constructor/destructor
+
+  Revision 1.3  2002/09/07 15:40:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.2  2002/05/05 19:13:19  carl

+ 24 - 20
tests/test/cg/tcalobj8.pp

@@ -192,9 +192,9 @@ type
    object_s32bit : longint;
    object_s64bit : int64;
    constructor constructor_params_mixed(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);saveregisters;
-   constructor constructor_init;saveregisters;
-   destructor destructor_params_done;saveregisters;
+      bigstring: shortstring; s32: longint; s64: int64);
+   constructor constructor_init;
+   destructor destructor_params_done;
    procedure method_normal_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
@@ -225,15 +225,15 @@ type
  pheritedvmtobject = ^theritedvmtobject;
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_normal(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+      bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
-      bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+      bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_overriden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
 
@@ -260,7 +260,7 @@ type
  pfailvmtobject = ^tfailvmtobject;
  tfailvmtobject = object(tvmtobject)
  public
-    constructor constructor_public_none;saveregisters;
+    constructor constructor_public_none;
  end;
 
 
@@ -402,7 +402,7 @@ type
 {**************************************************************************}
 {                             FAILED OBJECT                                }
 {**************************************************************************}
-constructor tfailvmtobject.constructor_public_none;saveregisters;
+constructor tfailvmtobject.constructor_public_none;
  begin
     { this calls the constructor fail special keyword }
     fail;
@@ -412,7 +412,7 @@ constructor tfailvmtobject.constructor_public_none;saveregisters;
 {                               VMT  OBJECT                                }
 {**************************************************************************}
 constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
-   bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+   bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
    object_u16bit := u16;
@@ -422,7 +422,7 @@ constructor tvmtobject.constructor_params_mixed(u8 :byte; u16: word;
  end;
 
 
-constructor tvmtobject.constructor_init;saveregisters;
+constructor tvmtobject.constructor_init;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -431,7 +431,7 @@ constructor tvmtobject.constructor_init;saveregisters;
    object_s64bit := 0;
  end;
 
-destructor tvmtobject.destructor_params_done;saveregisters;
+destructor tvmtobject.destructor_params_done;
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -536,7 +536,7 @@ procedure tvmtobject.method_virtual_call_inherited_params_mixed(
 {                          INHERITED VMT OBJECT                            }
 {**************************************************************************}
 constructor theritedvmtobject.constructor_params_mixed_call_virtual(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -547,7 +547,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_overriden(
-   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+   u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -558,7 +558,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -569,7 +569,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_static(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_normal(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -580,7 +580,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_normal(
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_inherited
-   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+   (u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
    object_u16bit := 0;
@@ -592,7 +592,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
 
 { this one should be overriden }
 procedure theritedvmtobject.method_virtual_overriden_params_mixed(
-    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
+    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
    object_u16bit := u16;
@@ -3295,7 +3295,11 @@ end.
 
 {
   $Log$
-  Revision 1.3  2002-09-07 15:40:54  peter
+  Revision 1.4  2002-12-29 15:30:55  peter
+    * updated for 1.1 compiler that does not allow calling conventions
+      for constructor/destructor
+
+  Revision 1.3  2002/09/07 15:40:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.2  2002/05/05 19:13:19  carl

+ 9 - 5
tests/test/cg/tcalpvr4.pp

@@ -32,14 +32,14 @@ type
   troutineresult = function (x: longint; y: byte): int64;popstack;
 
   tsimpleobject = object
-    constructor init;popstack;
+    constructor init;
     procedure test_normal(x: byte);popstack;
     procedure test_static(x: byte);static;popstack;
     procedure test_virtual(x: byte);virtual;popstack;
   end;
 
   tsimpleclass = class
-    constructor create;popstack;
+    constructor create;
     procedure test_normal(x: byte);popstack;
     class procedure test_static(x: byte);popstack;
     procedure test_virtual(x: byte);virtual;popstack;
@@ -174,7 +174,7 @@ var
 
  {****************************************************************************************************}
 
-  constructor tsimpleobject.init;popstack;
+  constructor tsimpleobject.init;
    begin
    end;
 
@@ -194,7 +194,7 @@ var
    end;
 
  {****************************************************************************************************}
-  constructor tsimpleclass.create;popstack;
+  constructor tsimpleclass.create;
    begin
     inherited create;
    end;
@@ -601,7 +601,11 @@ end.
 
 {
    $Log$
-   Revision 1.2  2002-09-07 15:40:54  peter
+   Revision 1.3  2002-12-29 15:30:55  peter
+     * updated for 1.1 compiler that does not allow calling conventions
+       for constructor/destructor
+
+   Revision 1.2  2002/09/07 15:40:54  peter
      * old logs removed and tabs fixed
 
    Revision 1.1  2002/05/05 13:58:50  carl

+ 9 - 5
tests/test/cg/tcalpvr5.pp

@@ -32,14 +32,14 @@ type
   troutineresult = function (x: longint; y: byte): int64;safecall;
 
   tsimpleobject = object
-    constructor init;safecall;
+    constructor init;
     procedure test_normal(x: byte);safecall;
     procedure test_static(x: byte);static;safecall;
     procedure test_virtual(x: byte);virtual;safecall;
   end;
 
   tsimpleclass = class
-    constructor create;safecall;
+    constructor create;
     procedure test_normal(x: byte);safecall;
     class procedure test_static(x: byte);safecall;
     procedure test_virtual(x: byte);virtual;safecall;
@@ -174,7 +174,7 @@ var
 
  {****************************************************************************************************}
 
-  constructor tsimpleobject.init;safecall;
+  constructor tsimpleobject.init;
    begin
    end;
 
@@ -194,7 +194,7 @@ var
    end;
 
  {****************************************************************************************************}
-  constructor tsimpleclass.create;safecall;
+  constructor tsimpleclass.create;
    begin
     inherited create;
    end;
@@ -601,7 +601,11 @@ end.
 
 {
    $Log$
-   Revision 1.2  2002-09-07 15:40:54  peter
+   Revision 1.3  2002-12-29 15:30:55  peter
+     * updated for 1.1 compiler that does not allow calling conventions
+       for constructor/destructor
+
+   Revision 1.2  2002/09/07 15:40:54  peter
      * old logs removed and tabs fixed
 
    Revision 1.1  2002/05/05 13:58:50  carl

+ 9 - 5
tests/test/cg/tcalpvr7.pp

@@ -32,14 +32,14 @@ type
   troutineresult = function (x: longint; y: byte): int64;stdcall;
 
   tsimpleobject = object
-    constructor init;stdcall;
+    constructor init;
     procedure test_normal(x: byte);stdcall;
     procedure test_static(x: byte);static;stdcall;
     procedure test_virtual(x: byte);virtual;stdcall;
   end;
 
   tsimpleclass = class
-    constructor create;stdcall;
+    constructor create;
     procedure test_normal(x: byte);stdcall;
     class procedure test_static(x: byte);stdcall;
     procedure test_virtual(x: byte);virtual;stdcall;
@@ -174,7 +174,7 @@ var
 
  {****************************************************************************************************}
 
-  constructor tsimpleobject.init;stdcall;
+  constructor tsimpleobject.init;
    begin
    end;
 
@@ -194,7 +194,7 @@ var
    end;
 
  {****************************************************************************************************}
-  constructor tsimpleclass.create;stdcall;
+  constructor tsimpleclass.create;
    begin
     inherited create;
    end;
@@ -601,7 +601,11 @@ end.
 
 {
    $Log$
-   Revision 1.2  2002-09-07 15:40:55  peter
+   Revision 1.3  2002-12-29 15:30:55  peter
+     * updated for 1.1 compiler that does not allow calling conventions
+       for constructor/destructor
+
+   Revision 1.2  2002/09/07 15:40:55  peter
      * old logs removed and tabs fixed
 
    Revision 1.1  2002/05/05 13:58:50  carl

+ 9 - 5
tests/test/cg/tcalpvr8.pp

@@ -32,14 +32,14 @@ type
   troutineresult = function (x: longint; y: byte): int64;saveregisters;
 
   tsimpleobject = object
-    constructor init;saveregisters;
+    constructor init;
     procedure test_normal(x: byte);saveregisters;
     procedure test_static(x: byte);static;saveregisters;
     procedure test_virtual(x: byte);virtual;saveregisters;
   end;
 
   tsimpleclass = class
-    constructor create;saveregisters;
+    constructor create;
     procedure test_normal(x: byte);saveregisters;
     class procedure test_static(x: byte);saveregisters;
     procedure test_virtual(x: byte);virtual;saveregisters;
@@ -174,7 +174,7 @@ var
 
  {****************************************************************************************************}
 
-  constructor tsimpleobject.init;saveregisters;
+  constructor tsimpleobject.init;
    begin
    end;
 
@@ -194,7 +194,7 @@ var
    end;
 
  {****************************************************************************************************}
-  constructor tsimpleclass.create;saveregisters;
+  constructor tsimpleclass.create;
    begin
     inherited create;
    end;
@@ -601,7 +601,11 @@ end.
 
 {
    $Log$
-   Revision 1.2  2002-09-07 15:40:55  peter
+   Revision 1.3  2002-12-29 15:30:55  peter
+     * updated for 1.1 compiler that does not allow calling conventions
+       for constructor/destructor
+
+   Revision 1.2  2002/09/07 15:40:55  peter
      * old logs removed and tabs fixed
 
    Revision 1.1  2002/05/05 13:58:50  carl

+ 7 - 3
tests/test/cg/tcalvar4.pp

@@ -276,7 +276,7 @@ var
 
   procedure proc_var_openstring(var s: OpenString);cdecl;
    begin
-    global_u8bit := high(s);
+    global_u8bit := {high(s) is not available with cdecl}255;
     s:=RESULT_SMALLSTRING;
    end;
 
@@ -379,7 +379,7 @@ procedure proc_var_formaldef_string(var buf);cdecl;
 
   procedure proc_var_openstring_mixed(b1 : byte; var s: OpenString; b2: byte);cdecl;
    begin
-    global_u8bit := high(s);
+    global_u8bit := {high(s) is not available with cdecl}255;
     s:=RESULT_SMALLSTRING;
     value_u8bit := RESULT_U8BIT;
    end;
@@ -715,7 +715,11 @@ end.
 
 {
   $Log$
-  Revision 1.7  2002-12-05 15:54:20  pierre
+  Revision 1.8  2002-12-29 15:30:55  peter
+    * updated for 1.1 compiler that does not allow calling conventions
+      for constructor/destructor
+
+  Revision 1.7  2002/12/05 15:54:20  pierre
    * update as openstrings are transformed into normal string in cdecl'ared functions
 
   Revision 1.6  2002/11/20 19:39:21  carl