summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2016-03-15 15:07:58 +0100
committerErich Eckner <git@eckner.net>2016-03-15 15:07:58 +0100
commit209bb1ecf3238ae57ba1b9f9f7e0b3a0d592b2f9 (patch)
treef2cdb6189721d00795e32bacc76fe581ee15918f
parent34db569497a760a7e83c1a79ac3220a8bac8f1df (diff)
downloadunits-209bb1ecf3238ae57ba1b9f9f7e0b3a0d592b2f9.tar.xz
Formatierung in matheunit.pas
-rw-r--r--matheunit.pas14
1 files changed, 7 insertions, 7 deletions
diff --git a/matheunit.pas b/matheunit.pas
index c913ae5..c728d29 100644
--- a/matheunit.pas
+++ b/matheunit.pas
@@ -390,12 +390,13 @@ begin
end;
function exprtofloat(st: boolean; s: string; kvs: tKnownValues; cbgv: tCallBackGetValue): extended;
-var i,j,k,l,m: longint;
- inv,neg,cbv: boolean;
- val1,val2: extended;
+var
+ i,j,k,l,m: longint;
+ inv,neg,cbv: boolean;
+ val1,val2: extended;
const
- fkt1: array[0..9] of string = ('exp','sin','cos','tan','sqr','sqrt','ln','round','floor','ceil');
- fkt2: array[0..1] of string = ('min','max');
+ fkt1: array[0..9] of string = ('exp','sin','cos','tan','sqr','sqrt','ln','round','floor','ceil');
+ fkt2: array[0..1] of string = ('min','max');
begin
s:=trimAll(s);
@@ -530,8 +531,7 @@ begin
else if assigned(cbgv) then result:=cbgv(s)
else begin
result:=nan;
- gibAus(''''+s+''' kann ich nicht auflösen!',3);
- halt(1);
+ fehler(''''+s+''' kann ich nicht auflösen!');
end;
end;