Răsfoiți Sursa

- unconditionally enabled {$ifdef PARAOUTFILE}-code (that define was
decomissioned quite a while ago, but this file was forgotten in
that process)

git-svn-id: trunk@13181 -

Jonas Maebe 16 ani în urmă
părinte
comite
ee69d00bec
3 a modificat fișierele cu 32 adăugiri și 18 ștergeri
  1. 1 0
      .gitattributes
  2. 18 18
      rtl/objpas/objpas.pp
  3. 13 0
      tests/webtbs/tw13763.pp

+ 1 - 0
.gitattributes

@@ -8871,6 +8871,7 @@ tests/webtbs/tw13696.pp svneol=native#text/plain
 tests/webtbs/tw1374.pp svneol=native#text/plain
 tests/webtbs/tw1374.pp svneol=native#text/plain
 tests/webtbs/tw1375.pp svneol=native#text/plain
 tests/webtbs/tw1375.pp svneol=native#text/plain
 tests/webtbs/tw1376.pp svneol=native#text/plain
 tests/webtbs/tw1376.pp svneol=native#text/plain
+tests/webtbs/tw13763.pp svneol=native#text/plain
 tests/webtbs/tw1398.pp svneol=native#text/plain
 tests/webtbs/tw1398.pp svneol=native#text/plain
 tests/webtbs/tw1401.pp svneol=native#text/plain
 tests/webtbs/tw1401.pp svneol=native#text/plain
 tests/webtbs/tw1407.pp svneol=native#text/plain
 tests/webtbs/tw1407.pp svneol=native#text/plain

+ 18 - 18
rtl/objpas/objpas.pp

@@ -50,22 +50,22 @@ Var
 
 
     { Untyped file support }
     { Untyped file support }
 
 
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;const Name:string);
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;p:pchar);
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;c:char);
+     Procedure AssignFile(out f:File;const Name:string);
+     Procedure AssignFile(out f:File;p:pchar);
+     Procedure AssignFile(out f:File;c:char);
      Procedure CloseFile(var f:File);
      Procedure CloseFile(var f:File);
 
 
      { Text file support }
      { Text file support }
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;const s:string);
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;p:pchar);
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;c:char);
+     Procedure AssignFile(out t:Text;const s:string);
+     Procedure AssignFile(out t:Text;p:pchar);
+     Procedure AssignFile(out t:Text;c:char);
      Procedure CloseFile(Var t:Text);
      Procedure CloseFile(Var t:Text);
 
 
      { Typed file supoort }
      { Typed file supoort }
 
 
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;const Name:string);
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;p:pchar);
-     Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;c:char);
+     Procedure AssignFile(out f:TypedFile;const Name:string);
+     Procedure AssignFile(out f:TypedFile;p:pchar);
+     Procedure AssignFile(out f:TypedFile;c:char);
 
 
      { ParamStr should return also an ansistring }
      { ParamStr should return also an ansistring }
      Function ParamStr(Param : Integer) : Ansistring;
      Function ParamStr(Param : Integer) : Ansistring;
@@ -106,19 +106,19 @@ Var
 
 
 { Untyped file support }
 { Untyped file support }
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;const Name:string);
+Procedure AssignFile(out f:File;const Name:string);
 
 
 begin
 begin
   System.Assign (F,Name);
   System.Assign (F,Name);
 end;
 end;
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;p:pchar);
+Procedure AssignFile(out f:File;p:pchar);
 
 
 begin
 begin
   System.Assign (F,P);
   System.Assign (F,P);
 end;
 end;
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;c:char);
+Procedure AssignFile(out f:File;c:char);
 
 
 begin
 begin
   System.Assign (F,C);
   System.Assign (F,C);
@@ -133,19 +133,19 @@ end;
 
 
 { Text file support }
 { Text file support }
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;const s:string);
+Procedure AssignFile(out t:Text;const s:string);
 
 
 begin
 begin
   System.Assign (T,S);
   System.Assign (T,S);
 end;
 end;
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;p:pchar);
+Procedure AssignFile(out t:Text;p:pchar);
 
 
 begin
 begin
   System.Assign (T,P);
   System.Assign (T,P);
 end;
 end;
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;c:char);
+Procedure AssignFile(out t:Text;c:char);
 
 
 begin
 begin
   System.Assign (T,C);
   System.Assign (T,C);
@@ -160,19 +160,19 @@ end;
 
 
 { Typed file support }
 { Typed file support }
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;const Name:string);
+Procedure AssignFile(out f:TypedFile;const Name:string);
 
 
 begin
 begin
   system.Assign(F,Name);
   system.Assign(F,Name);
 end;
 end;
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;p:pchar);
+Procedure AssignFile(out f:TypedFile;p:pchar);
 
 
 begin
 begin
   system.Assign (F,p);
   system.Assign (F,p);
 end;
 end;
 
 
-Procedure AssignFile({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;c:char);
+Procedure AssignFile(out f:TypedFile;c:char);
 
 
 begin
 begin
   system.Assign (F,C);
   system.Assign (F,C);

+ 13 - 0
tests/webtbs/tw13763.pp

@@ -0,0 +1,13 @@
+{ %norun }
+{ %opt=-vh -Seh }
+
+{$MODE OBJFPC}
+
+var
+   f: TextFile;
+
+begin
+     AssignFile (f, 'test.dat'); // Hint: Variable not initialized
+     Reset (f);
+     CloseFile (f);
+end.