summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-12-13 11:12:33 +0100
committerErich Eckner <git@eckner.net>2019-12-13 11:12:33 +0100
commit03205fd384bec3237bee2ec92c3ac83c70628904 (patch)
treea6d86ce8148b31385906b5d138fb30f82a53c7d2
parentcefe43f211b342811dadcd2821a007a22716406c (diff)
downloadepost-03205fd384bec3237bee2ec92c3ac83c70628904.tar.xz
epostunit.pas: ausführlichere Fehlermeldung bei Syntaxfehlern in .sif
-rw-r--r--epost.lps93
-rw-r--r--epostunit.pas8
2 files changed, 52 insertions, 49 deletions
diff --git a/epost.lps b/epost.lps
index 21b235e..f3dc097 100644
--- a/epost.lps
+++ b/epost.lps
@@ -24,8 +24,8 @@
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
- <TopLine Value="2064"/>
- <CursorPos X="47" Y="2080"/>
+ <TopLine Value="2085"/>
+ <CursorPos X="128" Y="2116"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit2>
@@ -113,8 +113,8 @@
<Unit13>
<Filename Value="../units/lowlevelunit.pas"/>
<EditorIndex Value="1"/>
- <TopLine Value="1486"/>
- <CursorPos Y="1521"/>
+ <TopLine Value="1407"/>
+ <CursorPos X="24" Y="1441"/>
<UsageCount Value="101"/>
<Loaded Value="True"/>
</Unit13>
@@ -210,122 +210,121 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="epostunit.pas"/>
- <Caret Line="2785" Column="17" TopLine="2757"/>
+ <Caret Line="45" Column="9" TopLine="16"/>
</Position1>
<Position2>
<Filename Value="epostunit.pas"/>
- <Caret Line="2786" Column="11" TopLine="2758"/>
+ <Caret Line="48" Column="18" TopLine="40"/>
</Position2>
<Position3>
<Filename Value="epostunit.pas"/>
- <Caret Line="2795" Column="42" TopLine="2767"/>
+ <Caret Line="52" Column="32" TopLine="40"/>
</Position3>
<Position4>
<Filename Value="epostunit.pas"/>
- <Caret Line="2796" Column="23" TopLine="2768"/>
+ <Caret Line="132" Column="15" TopLine="110"/>
</Position4>
<Position5>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2797" Column="11" TopLine="2769"/>
+ <Filename Value="epost.lpr"/>
+ <Caret Line="193" TopLine="175"/>
</Position5>
<Position6>
<Filename Value="epostunit.pas"/>
- <Caret Line="2808" Column="38" TopLine="2780"/>
+ <Caret Line="2344" Column="44" TopLine="2336"/>
</Position6>
<Position7>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2834" Column="11" TopLine="2806"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="87" Column="46" TopLine="68"/>
</Position7>
<Position8>
<Filename Value="epostunit.pas"/>
- <Caret Line="2880" Column="19" TopLine="2852"/>
+ <Caret Line="2788" Column="7" TopLine="2771"/>
</Position8>
<Position9>
<Filename Value="epostunit.pas"/>
- <Caret Line="2884" Column="82" TopLine="2856"/>
+ <Caret Line="7513" TopLine="7497"/>
</Position9>
<Position10>
<Filename Value="epostunit.pas"/>
- <Caret Line="2896" Column="126" TopLine="2868"/>
+ <Caret Line="2352" TopLine="2335"/>
</Position10>
<Position11>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2911" Column="19" TopLine="2882"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="2532" Column="105" TopLine="2526"/>
</Position11>
<Position12>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2924" Column="7" TopLine="2895"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="2270" TopLine="2252"/>
</Position12>
<Position13>
<Filename Value="epostunit.pas"/>
- <Caret Line="2945" Column="24" TopLine="2929"/>
+ <Caret Line="2381" TopLine="2363"/>
</Position13>
<Position14>
- <Filename Value="epostunit.pas"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="2177" Column="93" TopLine="2152"/>
</Position14>
<Position15>
<Filename Value="epostunit.pas"/>
- <Caret Line="45" Column="9" TopLine="16"/>
+ <Caret Line="7513" TopLine="7481"/>
</Position15>
<Position16>
<Filename Value="epostunit.pas"/>
- <Caret Line="48" Column="18" TopLine="40"/>
+ <Caret Line="2378" Column="106" TopLine="2364"/>
</Position16>
<Position17>
<Filename Value="epostunit.pas"/>
- <Caret Line="52" Column="32" TopLine="40"/>
+ <Caret Line="2081" Column="109" TopLine="2064"/>
</Position17>
<Position18>
- <Filename Value="epostunit.pas"/>
- <Caret Line="132" Column="15" TopLine="110"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="178" Column="57" TopLine="155"/>
</Position18>
<Position19>
- <Filename Value="epost.lpr"/>
- <Caret Line="193" TopLine="175"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
</Position19>
<Position20>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2344" Column="44" TopLine="2336"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="21" Column="16"/>
</Position20>
<Position21>
<Filename Value="../units/lowlevelunit.pas"/>
- <Caret Line="87" Column="46" TopLine="68"/>
+ <Caret Line="22" Column="34"/>
</Position21>
<Position22>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2788" Column="7" TopLine="2771"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="23" Column="55"/>
</Position22>
<Position23>
- <Filename Value="epostunit.pas"/>
- <Caret Line="7513" TopLine="7497"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="169" Column="50" TopLine="140"/>
</Position23>
<Position24>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2352" TopLine="2335"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="170" Column="86" TopLine="141"/>
</Position24>
<Position25>
- <Filename Value="typenunit.pas"/>
- <Caret Line="2532" Column="105" TopLine="2526"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="171" Column="67" TopLine="142"/>
</Position25>
<Position26>
- <Filename Value="typenunit.pas"/>
- <Caret Line="2270" TopLine="2252"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="178" Column="12" TopLine="155"/>
</Position26>
<Position27>
<Filename Value="epostunit.pas"/>
- <Caret Line="2381" TopLine="2363"/>
+ <Caret Line="2081" Column="61" TopLine="2064"/>
</Position27>
<Position28>
- <Filename Value="typenunit.pas"/>
- <Caret Line="2177" Column="93" TopLine="2152"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="2116" Column="73" TopLine="2088"/>
</Position28>
<Position29>
<Filename Value="epostunit.pas"/>
- <Caret Line="7513" TopLine="7481"/>
</Position29>
<Position30>
<Filename Value="epostunit.pas"/>
- <Caret Line="2378" Column="106" TopLine="2364"/>
+ <Caret Line="2081" Column="73" TopLine="2053"/>
</Position30>
</JumpHistory>
<RunParams>
diff --git a/epostunit.pas b/epostunit.pas
index d462fe8..3b5d21d 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -2078,7 +2078,7 @@ begin
readALine(f,t);
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))+').',3);
+ gibAus('Syntax-Fehler in '''+dateien[i].name+''': inkonsistenter Kopf ('+intToStr(filePos(f))+'): '+intArrayToStr(iArr),3);
closeFile(f);
exit;
end;
@@ -2113,7 +2113,11 @@ begin
(dateien[i] as tAndorInputDateiInfo).berechneXStop;
if (dateien[i].xSteps*dateien[i].tSiz <> iArr[8]) or
(iArr[8]*j <> iArr[7]) then begin
- gibAus('Syntax-Fehler in '''+dateien[i].name+''': inkonsistenter Kopf ('+intToStr(filePos(f))+').',3);
+ gibAus('Syntax-Fehler in '''+dateien[i].name+''': inkonsistenter Kopf ('+intToStr(filePos(f))+'): '+intArrayToStr(iArr),3);
+ if dateien[i].xSteps*dateien[i].tSiz <> iArr[8] then
+ gibAus(' ' + intToStr(dateien[i].xSteps) + ' * ' + intToStr(dateien[i].tSiz) + ' <> ' +intToStr(iArr[8]),3);
+ if iArr[8]*j <> iArr[7] then
+ gibAus(intToStr(iArr[8]) + ' * ' + intToStr(j) + ' <> ' + intToStr(iArr[7]),3);
closeFile(f);
exit;
end;