0006288: Comparing integer with real does not work

git-svn-id: http://code.remobjects.com/svn/pascalscript@105 5c9d2617-0215-0410-a2ee-e80e04d1c6d8
This commit is contained in:
carlokok 2009-02-16 07:50:17 +00:00
parent 0ad049c53e
commit 2f61791b9f

View File

@ -4491,6 +4491,7 @@ begin
btS32: b := tbts32(var1^) >= tbts32(Var2^); btS32: b := tbts32(var1^) >= tbts32(Var2^);
btDouble: b := PSGetReal(Var1, var1type) >= tbtdouble(var2^); btDouble: b := PSGetReal(Var1, var1type) >= tbtdouble(var2^);
btSingle: B := psGetReal(Var1, var1Type) >= tbtsingle(var2^); btSingle: B := psGetReal(Var1, var1Type) >= tbtsingle(var2^);
btExtended: B := psGetReal(Var1, var1Type) >= tbtExtended(var2^);
{$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) >= tbts64(Var2^);{$ENDIF} {$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) >= tbts64(Var2^);{$ENDIF}
btChar: b := tbts32(var1^) >= Ord(tbtchar(Var2^)); btChar: b := tbts32(var1^) >= Ord(tbtchar(Var2^));
{$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) >= Ord(tbtwidechar(Var2^));{$ENDIF} {$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) >= Ord(tbtwidechar(Var2^));{$ENDIF}
@ -4565,6 +4566,7 @@ begin
btS32: b := tbts32(var1^) <= tbts32(Var2^); btS32: b := tbts32(var1^) <= tbts32(Var2^);
btDouble: b := PSGetReal(Var1, var1type) <= tbtdouble(var2^); btDouble: b := PSGetReal(Var1, var1type) <= tbtdouble(var2^);
btSingle: B := psGetReal(Var1, var1Type) <= tbtsingle(var2^); btSingle: B := psGetReal(Var1, var1Type) <= tbtsingle(var2^);
btExtended: B := psGetReal(Var1, var1Type) <= tbtExtended(var2^);
{$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) <= tbts64(Var2^);{$ENDIF} {$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) <= tbts64(Var2^);{$ENDIF}
btChar: b := tbts32(var1^) <= Ord(tbtchar(Var2^)); btChar: b := tbts32(var1^) <= Ord(tbtchar(Var2^));
{$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) <= Ord(tbtwidechar(Var2^));{$ENDIF} {$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) <= Ord(tbtwidechar(Var2^));{$ENDIF}
@ -4638,6 +4640,7 @@ begin
btS32: b := tbts32(var1^) > tbts32(Var2^); btS32: b := tbts32(var1^) > tbts32(Var2^);
btDouble: b := PSGetReal(Var1, var1type) > tbtdouble(var2^); btDouble: b := PSGetReal(Var1, var1type) > tbtdouble(var2^);
btSingle: B := psGetReal(Var1, var1Type) > tbtsingle(var2^); btSingle: B := psGetReal(Var1, var1Type) > tbtsingle(var2^);
btExtended: B := psGetReal(Var1, var1Type) > tbtExtended(var2^);
{$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) > tbts64(Var2^);{$ENDIF} {$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) > tbts64(Var2^);{$ENDIF}
btChar: b := tbts32(var1^) > Ord(tbtchar(Var2^)); btChar: b := tbts32(var1^) > Ord(tbtchar(Var2^));
{$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) = Ord(tbtwidechar(Var2^));{$ENDIF} {$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) = Ord(tbtwidechar(Var2^));{$ENDIF}
@ -4704,6 +4707,7 @@ begin
btS32: b := tbts32(var1^) < tbts32(Var2^); btS32: b := tbts32(var1^) < tbts32(Var2^);
btDouble: b := PSGetReal(Var1, var1type) < tbtdouble(var2^); btDouble: b := PSGetReal(Var1, var1type) < tbtdouble(var2^);
btSingle: B := psGetReal(Var1, var1Type) < tbtsingle(var2^); btSingle: B := psGetReal(Var1, var1Type) < tbtsingle(var2^);
btExtended: B := psGetReal(Var1, var1Type) < tbtExtended(var2^);
{$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) < tbts64(Var2^);{$ENDIF} {$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) < tbts64(Var2^);{$ENDIF}
btChar: b := tbts32(var1^) < Ord(tbtchar(Var2^)); btChar: b := tbts32(var1^) < Ord(tbtchar(Var2^));
{$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) < Ord(tbtwidechar(Var2^));{$ENDIF} {$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) < Ord(tbtwidechar(Var2^));{$ENDIF}
@ -4795,6 +4799,7 @@ begin
btS32: b := tbts32(var1^) <> tbts32(Var2^); btS32: b := tbts32(var1^) <> tbts32(Var2^);
btDouble: b := PSGetReal(Var1, var1type) <> tbtdouble(var2^); btDouble: b := PSGetReal(Var1, var1type) <> tbtdouble(var2^);
btSingle: B := psGetReal(Var1, var1Type) <> tbtsingle(var2^); btSingle: B := psGetReal(Var1, var1Type) <> tbtsingle(var2^);
btExtended: B := psGetReal(Var1, var1Type) <> tbtExtended(var2^);
{$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) <> tbts64(Var2^);{$ENDIF} {$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) <> tbts64(Var2^);{$ENDIF}
btChar: b := tbts32(var1^) <> Ord(tbtchar(Var2^)); btChar: b := tbts32(var1^) <> Ord(tbtchar(Var2^));
{$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) <> Ord(tbtwidechar(Var2^));{$ENDIF} {$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) <> Ord(tbtwidechar(Var2^));{$ENDIF}
@ -4894,6 +4899,7 @@ begin
btS32: b := tbts32(var1^) = tbts32(Var2^); btS32: b := tbts32(var1^) = tbts32(Var2^);
btDouble: b := PSGetReal(Var1, var1type) = tbtdouble(var2^); btDouble: b := PSGetReal(Var1, var1type) = tbtdouble(var2^);
btSingle: B := psGetReal(Var1, var1Type) = tbtsingle(var2^); btSingle: B := psGetReal(Var1, var1Type) = tbtsingle(var2^);
btExtended: B := psGetReal(Var1, var1Type) = tbtExtended(var2^);
{$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) = tbts64(Var2^);{$ENDIF} {$IFNDEF PS_NOINT64} btS64: b := tbts32(var1^) = tbts64(Var2^);{$ENDIF}
btChar: b := tbts32(var1^) = Ord(tbtchar(Var2^)); btChar: b := tbts32(var1^) = Ord(tbtchar(Var2^));
{$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) = Ord(tbtwidechar(Var2^));{$ENDIF} {$IFNDEF PS_NOWIDESTRING} btWideChar: b := tbts32(var1^) = Ord(tbtwidechar(Var2^));{$ENDIF}