readALine() und readAnAndorString() sind nun Funktionen -- workaround für regression in fpc-3.2.0

3 files changed, 98 insertions, 97 deletions

diff --git a/epost.lps b/epost.lps
index e162aa8..8badae8 100644
--- a/epost.lps
+++ b/epost.lps
@@ -7,9 +7,8 @@
       <Unit0>
         <Filename Value="epost.lpr"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="76"/>
-        <CursorPos Y="96"/>
+        <TopLine Value="614"/>
+        <CursorPos X="11" Y="632"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -24,17 +23,18 @@
         <Filename Value="epostunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="3447"/>
-        <CursorPos Y="3456"/>
+        <TopLine Value="773"/>
+        <CursorPos Y="791"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="werteunit.pas"/>
         <IsPartOfProject Value="True"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="5"/>
-        <TopLine Value="712"/>
-        <CursorPos Y="729"/>
+        <TopLine Value="5"/>
+        <CursorPos X="32" Y="129"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit3>
@@ -42,8 +42,8 @@
         <Filename Value="typenunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="10"/>
-        <TopLine Value="2407"/>
-        <CursorPos X="12" Y="2426"/>
+        <TopLine Value="217"/>
+        <CursorPos X="15" Y="234"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -75,8 +75,7 @@
         <Filename Value="werteunit.inc"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="6"/>
-        <TopLine Value="179"/>
-        <CursorPos X="70" Y="193"/>
+        <CursorPos X="95" Y="8"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit8>
@@ -86,7 +85,7 @@
         <EditorIndex Value="7"/>
         <TopLine Value="86"/>
         <CursorPos X="26" Y="115"/>
-        <UsageCount Value="99"/>
+        <UsageCount Value="104"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -94,7 +93,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="8"/>
         <CursorPos X="3" Y="2"/>
-        <UsageCount Value="95"/>
+        <UsageCount Value="100"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
@@ -113,8 +112,8 @@
       <Unit13>
         <Filename Value="../units/lowlevelunit.pas"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="1407"/>
-        <CursorPos X="24" Y="1441"/>
+        <TopLine Value="1393"/>
+        <CursorPos X="11" Y="1421"/>
         <UsageCount Value="101"/>
         <Loaded Value="True"/>
       </Unit13>
@@ -210,120 +209,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="8152" TopLine="8134"/>
+        <Caret Line="242" Column="23" TopLine="213"/>
       </Position1>
       <Position2>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="78" Column="15" TopLine="60"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="6206" Column="13" TopLine="6178"/>
       </Position2>
       <Position3>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8145" Column="42" TopLine="8134"/>
+        <Filename Value="werteunit.inc"/>
+        <Caret Line="8" Column="20"/>
       </Position3>
       <Position4>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3515" TopLine="3471"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2250" Column="64" TopLine="2222"/>
       </Position4>
       <Position5>
-        <Filename Value="epostunit.pas"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="13"/>
       </Position5>
       <Position6>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="165" Column="36" TopLine="137"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="51" Column="44" TopLine="17"/>
       </Position6>
       <Position7>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="166" Column="35" TopLine="138"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="14" Column="19" TopLine="4"/>
       </Position7>
       <Position8>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="167" Column="36" TopLine="139"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="61" Column="68" TopLine="42"/>
       </Position8>
       <Position9>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="2336" Column="26" TopLine="2328"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="84" Column="31" TopLine="65"/>
       </Position9>
       <Position10>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3445" Column="17" TopLine="3426"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="88" Column="81" TopLine="71"/>
       </Position10>
       <Position11>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3446" Column="24" TopLine="3426"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="107" Column="33" TopLine="87"/>
       </Position11>
       <Position12>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3455" Column="17" TopLine="3426"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2537" Column="89" TopLine="2525"/>
       </Position12>
       <Position13>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3482" Column="24" TopLine="3454"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2535" Column="93" TopLine="2525"/>
       </Position13>
       <Position14>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3493" Column="17" TopLine="3459"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2559" Column="71" TopLine="2527"/>
       </Position14>
       <Position15>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3515" TopLine="3491"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="102" Column="62" TopLine="89"/>
       </Position15>
       <Position16>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3519" Column="2" TopLine="3502"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2514" Column="81" TopLine="2507"/>
       </Position16>
       <Position17>
-        <Filename Value="epost.lpr"/>
-        <Caret Line="99" Column="67" TopLine="88"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="102" Column="108" TopLine="88"/>
       </Position17>
       <Position18>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8152" TopLine="8135"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2513" Column="95" TopLine="2503"/>
       </Position18>
       <Position19>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3484" Column="32" TopLine="3462"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="101" Column="108" TopLine="91"/>
       </Position19>
       <Position20>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="7561" Column="24" TopLine="7533"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="127" TopLine="112"/>
       </Position20>
       <Position21>
-        <Filename Value="epostunit.pas"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="15"/>
       </Position21>
       <Position22>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3480" Column="14" TopLine="3470"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="12" Column="34"/>
       </Position22>
       <Position23>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3519" TopLine="3488"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2513" Column="95" TopLine="2362"/>
       </Position23>
       <Position24>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="301" Column="10" TopLine="289"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="12" Column="38"/>
       </Position24>
       <Position25>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3487" Column="38" TopLine="3458"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="10" Column="31"/>
       </Position25>
       <Position26>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="3511" Column="26" TopLine="3482"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="15" TopLine="12"/>
       </Position26>
       <Position27>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8140" Column="21" TopLine="8120"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="129" TopLine="95"/>
       </Position27>
       <Position28>
         <Filename Value="epostunit.pas"/>
+        <Caret Line="791" TopLine="773"/>
       </Position28>
       <Position29>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="301" Column="16" TopLine="272"/>
+        <Filename Value="werteunit.inc"/>
+        <Caret Line="9" Column="16"/>
       </Position29>
       <Position30>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="3487" Column="38" TopLine="3470"/>
+        <Caret Line="790" Column="24" TopLine="773"/>
       </Position30>
     </JumpHistory>
     <RunParams>
diff --git a/epostunit.pas b/epostunit.pas
index 628b627..71487b0 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -1923,19 +1923,19 @@ begin
       end;
       assignFile(f,dateien[i].name);
       reset(f,1);
-      readALine(f,s);
+      s:=readALine(f);
       if s<>'Andor Technology Multi-Channel File' then begin
         gibAus('Syntax-Fehler in '''+dateien[i].name+''': erkenne Andor Datei nicht ('+intToStr(filePos(f))+')!',3);
         closeFile(f);
         exit;
       end;
-      readALine(f,s);
+      s:=readALine(f);
       if s<>'65538 1' then begin
         gibAus('Syntax-Fehler in '''+dateien[i].name+''': diese Andor Datei hält der strengen Prüfung nicht stand ('+intToStr(filePos(f))+')!',3);
         closeFile(f);
         exit;
       end;
-      readALine(f,s);
+      s:=readALine(f);
       for j:=0 to 4 do
         erstesArgument(s,' ',false);
       try
@@ -2002,14 +2002,13 @@ begin
       for j:=22 to 75 do
         erstesArgument(s,' ',false);
       try
-        readAnAndorString(f,(dateien[i] as tAndorInputDateiInfo).detektorTyp,strToInt64(s),true);
+        (dateien[i] as tAndorInputDateiInfo).detektorTyp:=readAnAndorString(f,strToInt64(s),true);
       except
         gibAus('Syntax-Fehler in '''+dateien[i].name+''': Detektor-String nicht lesbar ('+intToStr(filePos(f))+')!',3);
         closeFile(f);
         exit;
       end;
-      readALine(f,s);
-      s:=trim(s);
+      s:=trim(readALine(f));
       try
         (dateien[i] as tAndorInputDateiInfo).detektorGroesze['x']:=strToInt64(erstesArgument(s,' ',false));
         (dateien[i] as tAndorInputDateiInfo).detektorGroesze['y']:=strToInt64(erstesArgument(s,' ',false));
@@ -2023,7 +2022,7 @@ begin
         dateien[i].tStop:=(dateien[i] as tAndorInputDateiInfo).detektorGroesze['y']-1;
       end;
       try
-        readAnAndorString(f,(dateien[i] as tAndorInputDateiInfo).dateiName,strToInt64(s),true);
+        (dateien[i] as tAndorInputDateiInfo).dateiName:=readAnAndorString(f,strToInt64(s),true);
       except
         gibAus('Syntax-Fehler in '''+dateien[i].name+''': originaler Dateiname nicht lesbar ('+intToStr(filePos(f))+')!',3);
         closeFile(f);
@@ -2031,11 +2030,11 @@ begin
       end;
       if extractFileName((dateien[i] as tAndorInputDateiInfo).dateiName) <> extractFileName(dateien[i].name) then
         gibAus('Warnung in '''+dateien[i].name+''': interner Name ist '''+extractFileName((dateien[i] as tAndorInputDateiInfo).dateiName)+'''.',3);
-      readALine(f,s);
+      s:=readALine(f);
       erstesArgument(s);
       seek(f,filePos(f)+strToInt64(s));
       for j:=0 to 2 do
-        readALine(f,s);
+        s:=readALine(f);
       for j:=0 to 3 do
         erstesArgument(s,' ',false);
       try
@@ -2047,7 +2046,7 @@ begin
         exit;
       end;
       for j:=0 to (dateien[i] as tAndorInputDateiInfo).detectorSkipLines do
-        readALine(f,s);
+        s:=readALine(f);
       try
         dateien[i].xStart:=strToFloat(erstesArgument(s,' ',false));
       except
@@ -2064,18 +2063,18 @@ begin
         exit;
       end;
       for j:=1 to (dateien[i] as tAndorInputDateiInfo).detectorSkipLines2 do
-        readALine(f,s);
+        s:=readALine(f);
       try
-        readAnAndorString(f,(dateien[i] as tAndorInputDateiInfo).xAchsenTitel,false);
-        readAnAndorString(f,(dateien[i] as tAndorInputDateiInfo).datenTypTitel,false);
-        readAnAndorString(f,(dateien[i] as tAndorInputDateiInfo).yAchsenTitel,false);
+        (dateien[i] as tAndorInputDateiInfo).xAchsenTitel:=readAnAndorString(f,false);
+        (dateien[i] as tAndorInputDateiInfo).datenTypTitel:=readAnAndorString(f,false);
+        (dateien[i] as tAndorInputDateiInfo).yAchsenTitel:=readAnAndorString(f,false);
       except
         gibAus('Syntax-Fehler in '''+dateien[i].name+''': Achsenbeschriftung nicht lesbar ('+intToStr(filePos(f))+')!',3);
         closeFile(f);
         exit;
       end;
-      readALine(f,s);
-      readALine(f,t);
+      s:=readALine(f);
+      t:=readALine(f);
       splitStrToInt(s+' '+t,iArr);
       if (iArr[0]<>65541) or (iArr[9]<>65538) or (iArr[16]<>0) then begin
         gibAus('Syntax-Fehler in '''+dateien[i].name+''': inkonsistenter Kopf ('+intToStr(filePos(f))+'): '+intArrayToStr(iArr),3);
@@ -2122,13 +2121,13 @@ begin
         exit;
       end;
       while j>=0 do begin
-        readAnAndorString(f,s,false); // labels
+        s:=readAnAndorString(f,false); // labels
         dec(j);
       end;
       (dateien[i] as tAndorInputDateiInfo).datenStart:=filePos(f);
       seek(f,(dateien[i] as tAndorInputDateiInfo).datenStart+dateien[i].xSteps*dateien[i].tSiz*sizeOf(single));
       try
-        readAnAndorString(f,s,false);
+        s:=readAnAndorString(f,false);
       except
         s:='falsch';
       end;
@@ -2137,26 +2136,26 @@ begin
         closeFile(f);
         exit;
       end;
-      readALine(f,s);
+      s:=readALine(f);
       (dateien[i] as tAndorInputDateiInfo).hatHintergrund:=s='1'; // es kommen noch Daten
       if (dateien[i] as tAndorInputDateiInfo).hatHintergrund then begin
         // wir überspringen den Header und hoffen, dass der mit dem anderen übereinstimmt (was er nicht muss!)
         for j:=0 to 4 do
-          readALine(f,s);
+          s:=readALine(f);
         erstesArgument(s);
         seek(f,filePos(f)+strToInt64(s));
         for j:=0 to 3 + (dateien[i] as tAndorInputDateiInfo).detectorSkipLines + (dateien[i] as tAndorInputDateiInfo).detectorSkipLines2 do
-          readALine(f,s);
+          readALine(f);
         for j:=0 to 2 do
-          readAnAndorString(f,s,false);
+          readAnAndorString(f,false);
         for j:=0 to 1 do
-          readALine(f,s);
+          readALine(f);
         for j:=0 to 1 do
-          readAnAndorString(f,s,false);
+          readAnAndorString(f,false);
         (dateien[i] as tAndorInputDateiInfo).hintergrundStart:=filePos(f);
         seek(f,(dateien[i] as tAndorInputDateiInfo).hintergrundStart+dateien[i].xSteps*dateien[i].tSiz*sizeOf(single));
         try
-          readAnAndorString(f,s,false);
+          s:=readAnAndorString(f,false);
         except
           s:='falsch';
         end;
@@ -2165,14 +2164,14 @@ begin
           closeFile(f);
           exit;
         end;
-        readALine(f,s);
+        s:=readALine(f);
         if s<>'0' then begin
           gibAus('Syntax-Fehler in '''+dateien[i].name+''': hier gibt es zusätzlich zum Hintergrund und den Daten noch mehr (eine Referenz?) - das versteh ich (noch) nicht ('+intToStr(filePos(f))+').',3);
           closeFile(f);
           exit;
         end;
         if not eof(f) then begin
-          readALine(f,s);
+          s:=readALine(f);
           if s<>'<?xml version="1.0" ?>' then begin
             gibAus('Syntax-Fehler in '''+dateien[i].name+''': Nach dem Hintergrund kommen noch unerwartete Daten: '''+s+''' ('+intToStr(filePos(f))+'/'+intToStr(fileSize(f))+').',3);
             closeFile(f);
diff --git a/werteunit.pas b/werteunit.pas
index e4e79e3..9ffa8cd 100644
--- a/werteunit.pas
+++ b/werteunit.pas
@@ -687,7 +687,7 @@ begin
           end;
       end{of case};
       try
-        readAnAndorString(f,s,false);
+        s:=readAnAndorString(f,false);
       except
         s:='falsch';
       end;