Browse Source

+ variant wrappers for cmp operators added

florian 23 years ago
parent
commit
45091120fd
3 changed files with 44 additions and 3 deletions
  1. 6 1
      rtl/inc/genmath.inc
  2. 29 1
      rtl/inc/variant.inc
  3. 9 1
      rtl/inc/varianth.inc

+ 6 - 1
rtl/inc/genmath.inc

@@ -284,6 +284,7 @@ Function float32_to_int32_round_to_zero( a: Float32 ): longint;
     {*  to y.  Thus  x = y * 2**expn.                                    *}
     {*  to y.  Thus  x = y * 2**expn.                                    *}
     begin
     begin
       e :=0;
       e :=0;
+      {!!!!!! fix me
       if (abs(x)<0.5) then
       if (abs(x)<0.5) then
        While (abs(x)<0.5) do
        While (abs(x)<0.5) do
        begin
        begin
@@ -296,6 +297,7 @@ Function float32_to_int32_round_to_zero( a: Float32 ): longint;
          x := x/2;
          x := x/2;
          Inc(e);
          Inc(e);
        end;
        end;
+      }
       frexp := x;
       frexp := x;
     end;
     end;
 
 
@@ -1020,7 +1022,10 @@ Function float32_to_int32_round_to_zero( a: Float32 ): longint;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.6  2002-09-07 15:07:45  peter
+  Revision 1.7  2002-10-07 15:10:45  florian
+    + variant wrappers for cmp operators added
+
+  Revision 1.6  2002/09/07 15:07:45  peter
     * old logs removed and tabs fixed
     * old logs removed and tabs fixed
 
 
   Revision 1.5  2002/07/28 21:39:29  florian
   Revision 1.5  2002/07/28 21:39:29  florian

+ 29 - 1
rtl/inc/variant.inc

@@ -491,6 +491,31 @@ operator -(const op : variant) dest : variant;
      variantmanager.varneg(dest);
      variantmanager.varneg(dest);
   end;
   end;
 
 
+operator =(const op1,op2 : variant) dest : boolean;
+  begin
+     dest:=variantmanager.cmpop(op1,op2,opcmpeq);
+  end;
+
+operator <(const op1,op2 : variant) dest : boolean;
+  begin
+     dest:=variantmanager.cmpop(op1,op2,opcmplt);
+  end;
+
+operator >(const op1,op2 : variant) dest : boolean;
+  begin
+     dest:=variantmanager.cmpop(op1,op2,opcmpgt);
+  end;
+
+operator >=(const op1,op2 : variant) dest : boolean;
+  begin
+     dest:=variantmanager.cmpop(op1,op2,opcmpge);
+  end;
+
+operator <=(const op1,op2 : variant) dest : boolean;
+  begin
+     dest:=variantmanager.cmpop(op1,op2,opcmplt);
+  end;
+
 
 
 {**********************************************************************
 {**********************************************************************
                       Variant manager functions
                       Variant manager functions
@@ -537,7 +562,10 @@ procedure initvariantmanager;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.7  2002-10-07 10:27:45  florian
+  Revision 1.8  2002-10-07 15:10:45  florian
+    + variant wrappers for cmp operators added
+
+  Revision 1.7  2002/10/07 10:27:45  florian
     + more variant wrappers added
     + more variant wrappers added
 
 
   Revision 1.6  2002/10/06 22:13:55  florian
   Revision 1.6  2002/10/06 22:13:55  florian

+ 9 - 1
rtl/inc/varianth.inc

@@ -269,11 +269,19 @@ operator /(const op1,op2 : variant) dest : variant;
 operator div(const op1,op2 : variant) dest : variant;
 operator div(const op1,op2 : variant) dest : variant;
 operator mod(const op1,op2 : variant) dest : variant;
 operator mod(const op1,op2 : variant) dest : variant;
 operator -(const op : variant) dest : variant;
 operator -(const op : variant) dest : variant;
+operator =(const op1,op2 : variant) dest : boolean;
+operator <(const op1,op2 : variant) dest : boolean;
+operator >(const op1,op2 : variant) dest : boolean;
+operator >=(const op1,op2 : variant) dest : boolean;
+operator <=(const op1,op2 : variant) dest : boolean;
 
 
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.8  2002-10-07 10:27:45  florian
+  Revision 1.9  2002-10-07 15:10:45  florian
+    + variant wrappers for cmp operators added
+
+  Revision 1.8  2002/10/07 10:27:45  florian
     + more variant wrappers added
     + more variant wrappers added
 
 
   Revision 1.7  2002/10/06 22:13:55  florian
   Revision 1.7  2002/10/06 22:13:55  florian