Browse Source

* splitted default_extended from support_extended

peter 27 years ago
parent
commit
de0a5038f9
5 changed files with 121 additions and 64 deletions
  1. 8 5
      rtl/i386/math.inc
  2. 8 5
      rtl/inc/mathh.inc
  3. 7 4
      rtl/inc/real2str.inc
  4. 64 26
      rtl/inc/sstrings.inc
  5. 34 24
      rtl/inc/systemh.inc

+ 8 - 5
rtl/i386/math.inc

@@ -16,7 +16,7 @@
 
 
 {$ASMMODE DIRECT}
 {$ASMMODE DIRECT}
 
 
-{$ifndef SUPPORT_EXTENDED}
+{$ifndef DEFAULT_EXTENDED}
 
 
 {****************************************************************************
 {****************************************************************************
                        Real/Double data type routines
                        Real/Double data type routines
@@ -258,8 +258,8 @@
      begin
      begin
         power:=exp(ln(bas)*expo);
         power:=exp(ln(bas)*expo);
      end;
      end;
-     
-{$else SUPPORT_EXTENDED}
+
+{$else DEFAULT_EXTENDED}
 
 
 {****************************************************************************
 {****************************************************************************
                        EXTENDED data type routines
                        EXTENDED data type routines
@@ -507,7 +507,7 @@
         power:=exp(ln(bas)*expo);
         power:=exp(ln(bas)*expo);
      end;
      end;
 
 
-{$endif SUPPORT_EXTENDED}
+{$endif DEFAULT_EXTENDED}
 
 
 
 
 {****************************************************************************
 {****************************************************************************
@@ -641,7 +641,10 @@
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.5  1998-08-11 00:04:50  peter
+  Revision 1.6  1998-08-11 21:39:04  peter
+    * splitted default_extended from support_extended
+
+  Revision 1.5  1998/08/11 00:04:50  peter
     * $ifdef ver0_99_5 updates
     * $ifdef ver0_99_5 updates
 
 
   Revision 1.4  1998/08/10 15:54:50  peter
   Revision 1.4  1998/08/10 15:54:50  peter

+ 8 - 5
rtl/inc/mathh.inc

@@ -15,7 +15,7 @@
 
 
    { declarations of the math routines }
    { declarations of the math routines }
 
 
-{$ifdef SUPPORT_EXTENDED}
+{$ifdef DEFAULT_EXTENDED}
     function abs(d : extended) : extended;
     function abs(d : extended) : extended;
     function arctan(d : extended) : extended;
     function arctan(d : extended) : extended;
     function cos(d : extended) : extended;
     function cos(d : extended) : extended;
@@ -30,7 +30,7 @@
     function sqrt(d : extended) : extended;
     function sqrt(d : extended) : extended;
     function trunc(d : extended) : longint;
     function trunc(d : extended) : longint;
     function power(bas,expo : extended) : extended;
     function power(bas,expo : extended) : extended;
-{$else SUPPORT_EXTENDED}
+{$else DEFAULT_EXTENDED}
     function abs(d : real) : real;
     function abs(d : real) : real;
     function arctan(d : real) : real;
     function arctan(d : real) : real;
     function cos(d : real) : real;
     function cos(d : real) : real;
@@ -45,10 +45,10 @@
     function trunc(d : real) : longint;
     function trunc(d : real) : longint;
     function power(bas,expo : real) : real;
     function power(bas,expo : real) : real;
     function pi : real;
     function pi : real;
-{$endif SUPPORT_EXTENDED}
+{$endif DEFAULT_EXTENDED}
 
 
     function power(bas,expo : longint) : longint;
     function power(bas,expo : longint) : longint;
-    
+
 {$ifdef _SUPPORT_FIXED}
 {$ifdef _SUPPORT_FIXED}
     function sqrt(d : fixed) : fixed;
     function sqrt(d : fixed) : fixed;
     function Round(x: fixed): longint;
     function Round(x: fixed): longint;
@@ -61,7 +61,10 @@
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.4  1998-08-11 00:05:24  peter
+  Revision 1.5  1998-08-11 21:39:05  peter
+    * splitted default_extended from support_extended
+
+  Revision 1.4  1998/08/11 00:05:24  peter
     * $ifdef ver0_99_5 updates
     * $ifdef ver0_99_5 updates
 
 
   Revision 1.3  1998/08/08 12:28:11  florian
   Revision 1.3  1998/08/08 12:28:11  florian

+ 7 - 4
rtl/inc/real2str.inc

@@ -19,11 +19,11 @@ type
   { corresponding to real    single     fixed   extended and comp for i386 }
   { corresponding to real    single     fixed   extended and comp for i386 }
 
 
 {$ifdef i386}
 {$ifdef i386}
-  {$ifdef SUPPORT_EXTENDED}
-    bestreal = extended; 
+  {$ifdef DEFAULT_EXTENDED}
+    bestreal = extended;
   {$else}
   {$else}
     bestreal = double;
     bestreal = double;
-  {$endif SUPPORT_EXTENDED}
+  {$endif DEFAULT_EXTENDED}
 {$else i386}
 {$else i386}
   bestreal = single;
   bestreal = single;
 {$endif i386}
 {$endif i386}
@@ -201,7 +201,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.9  1998-08-11 00:05:25  peter
+  Revision 1.10  1998-08-11 21:39:06  peter
+    * splitted default_extended from support_extended
+
+  Revision 1.9  1998/08/11 00:05:25  peter
     * $ifdef ver0_99_5 updates
     * $ifdef ver0_99_5 updates
 
 
   Revision 1.8  1998/08/10 15:56:30  peter
   Revision 1.8  1998/08/10 15:56:30  peter

+ 64 - 26
rtl/inc/sstrings.inc

@@ -609,37 +609,72 @@ begin
 end;
 end;
 {$endif SUPPORT_SINGLE}
 {$endif SUPPORT_SINGLE}
 
 
-{$ifdef SUPPORT_EXTENDED}
+{$ifdef DEFAULT_EXTENDED}
 
 
-{ we have to define val for reals, if extended is supported }
+  { with extended as default the valreal is extended so for real there need
+    to be a new val }
 
 
-procedure val(const s : string;var d : real;var code : word);
-var
-  e : valreal;
-begin
-  val(s,e,code);
-  d:=e;
-end;
+  procedure val(const s : string;var d : real;var code : word);
+  var
+    e : valreal;
+  begin
+    val(s,e,code);
+    d:=e;
+  end;
 
 
 
 
-procedure val(const s : string;var d : real;var code : integer);
-var
-   e : valreal;
-begin
-  val(s,e,word(code));
-  d:=e;
-end;
+  procedure val(const s : string;var d : real;var code : integer);
+  var
+     e : valreal;
+  begin
+    val(s,e,word(code));
+    d:=e;
+  end;
 
 
 
 
-procedure val(const s : string;var d : real);
-var
-  code : word;
-  e    : valreal;
-begin
-  val(s,e,code);
-  d:=e;
-end;
-{$endif SUPPORT_EXTENDED}
+  procedure val(const s : string;var d : real);
+  var
+    code : word;
+    e    : valreal;
+  begin
+    val(s,e,code);
+    d:=e;
+  end;
+
+{$else DEFAULT_EXTENDED}
+
+  { when extended is not the default it could still be supported }
+
+  {$ifdef SUPPORT_EXTENDED}
+
+  procedure val(const s : string;var d : extended;var code : word);
+  var
+    e : valreal;
+  begin
+    val(s,e,code);
+    d:=e;
+  end;
+
+  procedure val(const s : string;var d : extended;var code : integer);
+  var
+     e : valreal;
+  begin
+    val(s,e,word(code));
+    d:=e;
+  end;
+
+  procedure val(const s : string;var d : extended);
+  var
+    code : word;
+    e    : valreal;
+  begin
+    val(s,e,code);
+    d:=e;
+  end;
+
+  {$endif SUPPORT_EXTENDED}
+
+{$endif DEFAULT_EXTENDED}
 
 
 
 
 {$ifdef SUPPORT_COMP}
 {$ifdef SUPPORT_COMP}
@@ -718,7 +753,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.10  1998-08-08 12:28:13  florian
+  Revision 1.11  1998-08-11 21:39:07  peter
+    * splitted default_extended from support_extended
+
+  Revision 1.10  1998/08/08 12:28:13  florian
     * a lot small fixes to the extended data type work
     * a lot small fixes to the extended data type work
 
 
   Revision 1.9  1998/07/18 17:14:23  florian
   Revision 1.9  1998/07/18 17:14:23  florian

+ 34 - 24
rtl/inc/systemh.inc

@@ -18,7 +18,7 @@
    Possible defines:
    Possible defines:
    -----------------
    -----------------
    RTLLITE         Create a somewhat smaller RTL
    RTLLITE         Create a somewhat smaller RTL
-   
+
 *****************************************************************************}
 *****************************************************************************}
 
 
 
 
@@ -42,17 +42,20 @@ Type
 { at least declare Turbo Pascal real types }
 { at least declare Turbo Pascal real types }
 {$ifdef i386}
 {$ifdef i386}
   {$ifndef VER0_99_5}
   {$ifndef VER0_99_5}
-    {$define SUPPORT_EXTENDED}
-  {$endif}  
+    {$ifndef VER0_99_6}
+      {$define DEFAULT_EXTENDED}
+    {$endif}
+  {$endif}
+  {$define SUPPORT_EXTENDED}
   {$define SUPPORT_COMP}
   {$define SUPPORT_COMP}
   {$define SUPPORT_SINGLE}
   {$define SUPPORT_SINGLE}
   {$define SUPPORT_FIXED}
   {$define SUPPORT_FIXED}
   Double = real;
   Double = real;
-  {$ifdef SUPPORT_EXTENDED}
+  {$ifdef DEFAULT_EXTENDED}
     ValReal = Extended;
     ValReal = Extended;
-  {$else}    
+  {$else}
     ValReal = Double;
     ValReal = Double;
-  {$endif}  
+  {$endif}
 {$endif}
 {$endif}
 
 
 {$ifdef m68k}
 {$ifdef m68k}
@@ -120,7 +123,7 @@ var
   LowestStack,
   LowestStack,
   RandSeed    : Longint;
   RandSeed    : Longint;
 
 
-Const 
+Const
   ErrorProc   : Pointer = nil;
   ErrorProc   : Pointer = nil;
 
 
 {****************************************************************************
 {****************************************************************************
@@ -256,29 +259,33 @@ Procedure Val(const s:string;Var b:Word);
 Procedure Val(const s:string;Var b:Integer;Var code:Word);
 Procedure Val(const s:string;Var b:Integer;Var code:Word);
 Procedure Val(const s:string;Var b:Integer;Var code:Integer);
 Procedure Val(const s:string;Var b:Integer;Var code:Integer);
 Procedure Val(const s:string;Var b:Integer);
 Procedure Val(const s:string;Var b:Integer);
+Procedure Val(const s:string;Var v:cardinal;Var code:Word);
+Procedure Val(const s:string;Var v:cardinal;Var code:Integer);
+Procedure Val(const s:string;Var v:cardinal);
 Procedure Val(const s:string;Var d:ValReal;Var code:Word);
 Procedure Val(const s:string;Var d:ValReal;Var code:Word);
 Procedure Val(const s:string;Var d:ValReal;Var code:Integer);
 Procedure Val(const s:string;Var d:ValReal;Var code:Integer);
 Procedure Val(const s:string;Var d:ValReal);
 Procedure Val(const s:string;Var d:ValReal);
 {$ifdef SUPPORT_SINGLE}
 {$ifdef SUPPORT_SINGLE}
-Procedure Val(const s:string;Var d:single;Var code:Word);
-Procedure Val(const s:string;Var d:single;Var code:Integer);
-Procedure Val(const s:string;Var d:single);
+  Procedure Val(const s:string;Var d:single;Var code:Word);
+  Procedure Val(const s:string;Var d:single;Var code:Integer);
+  Procedure Val(const s:string;Var d:single);
 {$endif SUPPORT_SINGLE}
 {$endif SUPPORT_SINGLE}
-{$ifdef SUPPORT_EXTENDED}
-{ if extended is supported, valreal is an extended, so we
-  have to define the real routines }
-Procedure Val(const s:string;Var d:Real;Var code:Word);
-Procedure Val(const s:string;Var d:Real;Var code:Integer);
-Procedure Val(const s:string;Var d:Real);
-{$endif SUPPORT_EXTENDED}
 {$ifdef SUPPORT_COMP}
 {$ifdef SUPPORT_COMP}
-Procedure Val(const s:string;Var d:comp;Var code:Word);
-Procedure Val(const s:string;Var d:comp;Var code:Integer);
-Procedure Val(const s:string;Var d:comp);
+  Procedure Val(const s:string;Var d:comp;Var code:Word);
+  Procedure Val(const s:string;Var d:comp;Var code:Integer);
+  Procedure Val(const s:string;Var d:comp);
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
-Procedure Val(const s:string;Var v:cardinal;Var code:Word);
-Procedure Val(const s:string;Var v:cardinal;Var code:Integer);
-Procedure Val(const s:string;Var v:cardinal);
+{$ifdef DEFAULT_EXTENDED}
+  Procedure Val(const s:string;Var d:Real;Var code:Word);
+  Procedure Val(const s:string;Var d:Real;Var code:Integer);
+  Procedure Val(const s:string;Var d:Real);
+{$else DEFAULT_EXTENDED}
+  {$ifdef SUPPORT_EXTENDED}
+    Procedure Val(const s:string;Var d:Extended;Var code:Word);
+    Procedure Val(const s:string;Var d:Extended;Var code:Integer);
+    Procedure Val(const s:string;Var d:Extended);
+  {$endif}
+{$endif DEFAULT_EXTENDED}
 
 
 {****************************************************************************
 {****************************************************************************
                              AnsiString Handling
                              AnsiString Handling
@@ -426,7 +433,10 @@ Procedure halt;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.23  1998-08-11 00:05:27  peter
+  Revision 1.24  1998-08-11 21:39:08  peter
+    * splitted default_extended from support_extended
+
+  Revision 1.23  1998/08/11 00:05:27  peter
     * $ifdef ver0_99_5 updates
     * $ifdef ver0_99_5 updates
 
 
   Revision 1.22  1998/08/08 12:28:14  florian
   Revision 1.22  1998/08/08 12:28:14  florian