2
0
Эх сурвалжийг харах

* format(%u",[<qword>]); fixed
* made test working

git-svn-id: trunk@13 -

florian 20 жил өмнө
parent
commit
f949a53da8

+ 4 - 4
compiler/ncgld.pas

@@ -763,10 +763,10 @@ implementation
                        if is_64bit(lt) then
                          begin
                             case torddef(lt).typ of
-                               s64bit:
-                                 vtype:=vtInt64;
-                               u64bit:
-                                 vtype:=vtQWord;
+                              s64bit:
+                                vtype:=vtInt64;
+                              u64bit:
+                                vtype:=vtQWord;
                             end;
                             freetemp:=false;
                             vaddr:=true;

+ 3 - 1
rtl/objpas/sysutils/sysformt.inc

@@ -234,8 +234,10 @@ begin
               if Checkarg(vtinteger,false) then
                 Str(cardinal(Args[Doarg].VInteger),ToAdd)
               {$IFNDEF VIRTUALPASCAL}
-              else if CheckArg(vtInt64,true) then
+              else if CheckArg(vtInt64,false) then
                 Str(qword(Args[DoArg].VInt64^),toadd)
+              else if CheckArg(vtQWord,true) then
+                Str(Args[DoArg].VQWord^,toadd);
               {$ENDIF}
               ;
               Width:=Abs(width);

+ 5 - 2
tests/webtbs/tw3973.pp

@@ -139,6 +139,9 @@ begin
   WriteLn;
   if FailureCount = 0 then
     WriteLn('All passed')
-  else WriteLn(FailureCount, 'Failures');
-  ReadLn;
+  else
+    begin
+      WriteLn(FailureCount, 'Failures');
+      halt(1);
+    end;
 end.