From 2972be4ddd1fe68ae30fb7a8c887dcd104ac962c Mon Sep 17 00:00:00 2001 From: Mattias Gaertner Date: Sat, 15 Dec 2018 11:32:28 +0000 Subject: [PATCH] pastojs: fixed compile under pas2js git-svn-id: trunk@40555 - --- packages/fcl-js/src/jsbase.pp | 4 ++-- packages/fcl-passrc/src/pasresolveeval.pas | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/fcl-js/src/jsbase.pp b/packages/fcl-js/src/jsbase.pp index 6811268d49..277fff59f1 100644 --- a/packages/fcl-js/src/jsbase.pp +++ b/packages/fcl-js/src/jsbase.pp @@ -26,8 +26,8 @@ uses Classes, SysUtils; const - MinSafeIntDouble = -$10000000000000; // -4503599627370496 - MaxSafeIntDouble = $fffffffffffff; // 4503599627370495 + MinSafeIntDouble = -$fffffffffffff-1; // -4503599627370496 + MaxSafeIntDouble = $fffffffffffff; // 4503599627370495 Type TJSType = (jstUNDEFINED,jstNull,jstBoolean,jstNumber,jstString,jstObject,jstReference,jstCompletion); diff --git a/packages/fcl-passrc/src/pasresolveeval.pas b/packages/fcl-passrc/src/pasresolveeval.pas index 0e155364d2..0afdcb8c3b 100644 --- a/packages/fcl-passrc/src/pasresolveeval.pas +++ b/packages/fcl-passrc/src/pasresolveeval.pas @@ -340,8 +340,8 @@ const MinSafeIntSingle = -16777216; MaxSafeIntSingle = 16777216; MaskUIntSingle = $3fffff; - MinSafeIntDouble = -$10000000000000; // -4503599627370496 - MaxSafeIntDouble = $fffffffffffff; // 4503599627370495 + MinSafeIntDouble = -$fffffffffffff-1; // -4503599627370496 + MaxSafeIntDouble = $fffffffffffff; // 4503599627370495 MaskUIntDouble = $fffffffffffff; type @@ -1249,7 +1249,7 @@ begin reitLongWord: TResEvalInt(Result).Int:=not longword(TResEvalInt(Result).Int); reitLongInt: TResEvalInt(Result).Int:=not longint(TResEvalInt(Result).Int); reitUIntDouble: TResEvalInt(Result).Int:=(not TResEvalInt(Result).Int) and $fffffffffffff; - reitIntDouble: TResEvalInt(Result).Int:=(not TResEvalInt(Result).Int) and $1fffffffffffff; + reitIntDouble: {$ifdef fpc}TResEvalInt(Result).Int:=(not TResEvalInt(Result).Int) and $1fffffffffffff{$endif}; else TResEvalInt(Result).Int:=not TResEvalInt(Result).Int; end; end;