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

+ bug0259-260
* bug0227-258

pierre 26 жил өмнө
parent
commit
9d4e91b79c

+ 1 - 0
tests/tbs0227.pp

@@ -1,6 +1,7 @@
 function getheapsize:longint;assembler;
 function getheapsize:longint;assembler;
 var
 var
   heapsize : longint;external name 'HEAPSIZE';
   heapsize : longint;external name 'HEAPSIZE';
+  sbrk : longint;external name '___sbrk';
 asm
 asm
         movl    HEAPSIZE,%eax
         movl    HEAPSIZE,%eax
 end ['EAX'];
 end ['EAX'];

+ 30 - 12
tests/tbs0258.pp

@@ -1,43 +1,61 @@
 program test_set;
 program test_set;
 
 
-var error : boolean;
+uses erroru;
 
 
 
 
 procedure test;
 procedure test;
 
 
    var
    var
       i : longint;
       i : longint;
+      j : integer;
+      k : word;
+      l : shortint;
+      m : byte;
       x : array [1..32] of byte;
       x : array [1..32] of byte;
 
 
    begin
    begin
-      error:=false;
       for i:=1 to 32 do x[i]:=$ff;
       for i:=1 to 32 do x[i]:=$ff;
       i:=1;
       i:=1;
       if i in [1,3,5,8,11,14,15] then
       if i in [1,3,5,8,11,14,15] then
         writeln('1 is in [1,3,5,8,11,14,15]')
         writeln('1 is in [1,3,5,8,11,14,15]')
       else
       else
-        writeln('Error in set');
+        begin
+           writeln('Error in set');
+           error;
+        end;
       i:=135;
       i:=135;
       if i in [1,3,5,8,11,14,15] then
       if i in [1,3,5,8,11,14,15] then
         begin
         begin
            writeln('Error : 135 is in [1,3,5,8,11,14,15]');
            writeln('Error : 135 is in [1,3,5,8,11,14,15]');
-           error:=true;
+           error;
+        end;
+      i:=257;
+      if i in [1,3,5,8,11,14,15] then
+        begin
+           writeln('Error : 257 is in [1,3,5,8,11,14,15]');
+           error;
+        end;
+      l:=-1;
+      if l in [1,3,5,8,11,14,15,255] then
+        begin
+           writeln('Error : -127 is in [1,3,5,8,11,14,15,255]');
+           error;
+        end;
+      i:=257;
+      if l in [1,3,5,8,11,14,15,255] then
+        begin
+           writeln('Error : longint(257) is in [1,3,5,8,11,14,15,255]');
+           error;
         end;
         end;
       for i:=1 to 32 do x[i]:=0;
       for i:=1 to 32 do x[i]:=0;
       i:=135;
       i:=135;
       if i in [1,3,5,8,11,14,15] then
       if i in [1,3,5,8,11,14,15] then
         begin
         begin
-           writeln('Second try Error : 135 is in [1,3,5,8,11,14,15]')
-           error:=true;
-        end
-      else
-        begin
-           if error then
-             writeln('Result of 135 in [1,3,5,8,11,14,15] depends on x array !!');
+           writeln('Second try Error : 135 is in [1,3,5,8,11,14,15]');
+           error;
         end;
         end;
    end;
    end;
 
 
 begin
 begin
    test;
    test;
-   if error then halt(1);
 end.
 end.

+ 7 - 0
tests/tbs0259.pp

@@ -0,0 +1,7 @@
+{ $OPT= -O1}
+
+VAR time1,time2 : Real;
+BEGIN
+  time1 := 0;
+  time2 := time1*time1;
+END.

+ 32 - 0
tests/tbs0260.pp

@@ -0,0 +1,32 @@
+program test;
+
+  type
+      obj1 = object
+        st : string;
+      constructor init;
+      procedure writeit;
+      end;
+
+      obj2 = object(obj1)
+      procedure writeit;virtual;
+      end;
+
+      obj3 = object(obj2)
+        l : longint;
+      end;
+      
+      constructor obj1.init;
+        begin
+        end;
+
+      procedure obj1.writeit;
+        begin
+        end;
+        
+      procedure obj2.writeit;
+        begin
+        end;
+        
+
+begin
+end.