pdecl.pas 24 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665
  1. {
  2. $Id$
  3. Copyright (c) 1998-2000 by Florian Klaempfl
  4. Does declaration (but not type) parsing for Free Pascal
  5. This program is free software; you can redistribute it and/or modify
  6. it under the terms of the GNU General Public License as published by
  7. the Free Software Foundation; either version 2 of the License, or
  8. (at your option) any later version.
  9. This program is distributed in the hope that it will be useful,
  10. but WITHOUT ANY WARRANTY; without even the implied warranty of
  11. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12. GNU General Public License for more details.
  13. You should have received a copy of the GNU General Public License
  14. along with this program; if not, write to the Free Software
  15. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  16. ****************************************************************************
  17. }
  18. unit pdecl;
  19. {$i defines.inc}
  20. interface
  21. uses
  22. { global }
  23. globals,
  24. { symtable }
  25. symsym,
  26. { pass_1 }
  27. node;
  28. function readconstant(const name:string;const filepos:tfileposinfo):tconstsym;
  29. procedure const_dec;
  30. procedure label_dec;
  31. procedure type_dec;
  32. procedure var_dec;
  33. procedure threadvar_dec;
  34. procedure resourcestring_dec;
  35. implementation
  36. uses
  37. { common }
  38. cutils,cclasses,
  39. { global }
  40. globtype,tokens,verbose,
  41. systems,
  42. { aasm }
  43. aasm,
  44. { symtable }
  45. symconst,symbase,symtype,symdef,symtable,
  46. { pass 1 }
  47. nmat,nadd,ncal,nset,ncnv,ninl,ncon,nld,nflw,
  48. { parser }
  49. scanner,
  50. pbase,pexpr,ptype,ptconst,pdecsub,pdecvar,pdecobj;
  51. function readconstant(const name:string;const filepos:tfileposinfo):tconstsym;
  52. var
  53. hp : tconstsym;
  54. p : tnode;
  55. ps : pconstset;
  56. pd : pbestreal;
  57. sp : pchar;
  58. storetokenpos : tfileposinfo;
  59. begin
  60. readconstant:=nil;
  61. if name='' then
  62. internalerror(9584582);
  63. hp:=nil;
  64. p:=comp_expr(true);
  65. storetokenpos:=akttokenpos;
  66. akttokenpos:=filepos;
  67. case p.nodetype of
  68. ordconstn:
  69. begin
  70. if is_constintnode(p) then
  71. hp:=tconstsym.create_typed(name,constint,tordconstnode(p).value,tordconstnode(p).resulttype)
  72. else if is_constcharnode(p) then
  73. hp:=tconstsym.create(name,constchar,tordconstnode(p).value)
  74. else if is_constboolnode(p) then
  75. hp:=tconstsym.create(name,constbool,tordconstnode(p).value)
  76. else if is_constwidecharnode(p) then
  77. hp:=tconstsym.create(name,constwchar,tordconstnode(p).value)
  78. else if p.resulttype.def.deftype=enumdef then
  79. hp:=tconstsym.create_typed(name,constord,tordconstnode(p).value,p.resulttype)
  80. else if p.resulttype.def.deftype=pointerdef then
  81. hp:=tconstsym.create_typed(name,constord,tordconstnode(p).value,p.resulttype)
  82. else internalerror(111);
  83. end;
  84. stringconstn:
  85. begin
  86. getmem(sp,tstringconstnode(p).len+1);
  87. move(tstringconstnode(p).value_str^,sp^,tstringconstnode(p).len+1);
  88. hp:=tconstsym.create_string(name,conststring,sp,tstringconstnode(p).len);
  89. end;
  90. realconstn :
  91. begin
  92. new(pd);
  93. pd^:=trealconstnode(p).value_real;
  94. hp:=tconstsym.create(name,constreal,longint(pd));
  95. end;
  96. setconstn :
  97. begin
  98. new(ps);
  99. ps^:=tsetconstnode(p).value_set^;
  100. hp:=tconstsym.create_typed(name,constset,longint(ps),p.resulttype);
  101. end;
  102. pointerconstn :
  103. begin
  104. hp:=tconstsym.create_typed(name,constpointer,tordconstnode(p).value,p.resulttype);
  105. end;
  106. niln :
  107. begin
  108. hp:=tconstsym.create_typed(name,constnil,0,p.resulttype);
  109. end;
  110. else
  111. Message(cg_e_illegal_expression);
  112. end;
  113. akttokenpos:=storetokenpos;
  114. p.free;
  115. readconstant:=hp;
  116. end;
  117. procedure const_dec;
  118. var
  119. name : stringid;
  120. tt : ttype;
  121. sym : tsym;
  122. storetokenpos,filepos : tfileposinfo;
  123. old_block_type : tblock_type;
  124. skipequal : boolean;
  125. begin
  126. consume(_CONST);
  127. old_block_type:=block_type;
  128. block_type:=bt_const;
  129. repeat
  130. name:=pattern;
  131. filepos:=akttokenpos;
  132. consume(_ID);
  133. case token of
  134. _EQUAL:
  135. begin
  136. consume(_EQUAL);
  137. sym:=readconstant(name,filepos);
  138. if assigned(sym) then
  139. symtablestack.insert(sym);
  140. try_consume_hintdirective(sym.symoptions);
  141. consume(_SEMICOLON);
  142. end;
  143. _COLON:
  144. begin
  145. { set the blocktype first so a consume also supports a
  146. caret, to support const s : ^string = nil }
  147. block_type:=bt_type;
  148. consume(_COLON);
  149. ignore_equal:=true;
  150. read_type(tt,'');
  151. ignore_equal:=false;
  152. block_type:=bt_const;
  153. skipequal:=false;
  154. { create symbol }
  155. storetokenpos:=akttokenpos;
  156. akttokenpos:=filepos;
  157. {$ifdef DELPHI_CONST_IN_RODATA}
  158. if m_delphi in aktmodeswitches then
  159. begin
  160. if assigned(readtypesym) then
  161. sym:=ttypedconstsym.createsym(name,readtypesym,true)
  162. else
  163. sym:=ttypedconstsym.create(name,def,true)
  164. end
  165. else
  166. {$endif DELPHI_CONST_IN_RODATA}
  167. begin
  168. sym:=ttypedconstsym.createtype(name,tt,false)
  169. end;
  170. akttokenpos:=storetokenpos;
  171. symtablestack.insert(sym);
  172. { procvar can have proc directives }
  173. if (tt.def.deftype=procvardef) then
  174. begin
  175. { support p : procedure;stdcall=nil; }
  176. if (token=_SEMICOLON) then
  177. begin
  178. consume(_SEMICOLON);
  179. if is_proc_directive(token) then
  180. parse_var_proc_directives(sym)
  181. else
  182. begin
  183. Message(parser_e_proc_directive_expected);
  184. skipequal:=true;
  185. end;
  186. end
  187. else
  188. { support p : procedure stdcall=nil; }
  189. begin
  190. if is_proc_directive(token) then
  191. parse_var_proc_directives(sym);
  192. end;
  193. end;
  194. if not skipequal then
  195. begin
  196. { get init value }
  197. consume(_EQUAL);
  198. {$ifdef DELPHI_CONST_IN_RODATA}
  199. if m_delphi in aktmodeswitches then
  200. readtypedconst(tt,ttypedconstsym(sym),true)
  201. else
  202. {$endif DELPHI_CONST_IN_RODATA}
  203. readtypedconst(tt,ttypedconstsym(sym),false);
  204. try_consume_hintdirective(sym.symoptions);
  205. consume(_SEMICOLON);
  206. end;
  207. end;
  208. else
  209. { generate an error }
  210. consume(_EQUAL);
  211. end;
  212. until token<>_ID;
  213. block_type:=old_block_type;
  214. end;
  215. procedure label_dec;
  216. var
  217. hl : tasmlabel;
  218. begin
  219. consume(_LABEL);
  220. if not(cs_support_goto in aktmoduleswitches) then
  221. Message(sym_e_goto_and_label_not_supported);
  222. repeat
  223. if not(token in [_ID,_INTCONST]) then
  224. consume(_ID)
  225. else
  226. begin
  227. if (cs_create_smart in aktmoduleswitches) then
  228. begin
  229. getdatalabel(hl);
  230. { we still want a warning if unused }
  231. hl.refs:=0;
  232. end
  233. else
  234. getlabel(hl);
  235. symtablestack.insert(tlabelsym.create(pattern,hl));
  236. consume(token);
  237. end;
  238. if token<>_SEMICOLON then consume(_COMMA);
  239. until not(token in [_ID,_INTCONST]);
  240. consume(_SEMICOLON);
  241. end;
  242. { search in symtablestack used, but not defined type }
  243. procedure resolve_type_forward(p : tnamedindexitem);
  244. var
  245. hpd,pd : tdef;
  246. stpos : tfileposinfo;
  247. again : boolean;
  248. srsym : tsym;
  249. srsymtable : tsymtable;
  250. begin
  251. { Check only typesyms or record/object fields }
  252. case tsym(p).typ of
  253. typesym :
  254. pd:=ttypesym(p).restype.def;
  255. varsym :
  256. if (tsym(p).owner.symtabletype in [objectsymtable,recordsymtable]) then
  257. pd:=tvarsym(p).vartype.def
  258. else
  259. exit;
  260. else
  261. exit;
  262. end;
  263. repeat
  264. again:=false;
  265. case pd.deftype of
  266. arraydef :
  267. begin
  268. { elementtype could also be defined using a forwarddef }
  269. pd:=tarraydef(pd).elementtype.def;
  270. again:=true;
  271. end;
  272. pointerdef,
  273. classrefdef :
  274. begin
  275. { classrefdef inherits from pointerdef }
  276. hpd:=tpointerdef(pd).pointertype.def;
  277. { still a forward def ? }
  278. if hpd.deftype=forwarddef then
  279. begin
  280. { try to resolve the forward }
  281. { get the correct position for it }
  282. stpos:=akttokenpos;
  283. akttokenpos:=tforwarddef(hpd).forwardpos;
  284. resolving_forward:=true;
  285. make_ref:=false;
  286. searchsym(tforwarddef(hpd).tosymname,srsym,srsymtable);
  287. make_ref:=true;
  288. resolving_forward:=false;
  289. akttokenpos:=stpos;
  290. { we don't need the forwarddef anymore, dispose it }
  291. hpd.free;
  292. tpointerdef(pd).pointertype.def:=nil; { if error occurs }
  293. { was a type sym found ? }
  294. if assigned(srsym) and
  295. (srsym.typ=typesym) then
  296. begin
  297. tpointerdef(pd).pointertype.setsym(srsym);
  298. { avoid wrong unused warnings web bug 801 PM }
  299. inc(tstoredsym(srsym).refs);
  300. {$ifdef GDB}
  301. if (cs_debuginfo in aktmoduleswitches) and assigned(debuglist) and
  302. (tsym(p).owner.symtabletype in [globalsymtable,staticsymtable]) then
  303. begin
  304. ttypesym(p).isusedinstab := true;
  305. ttypesym(p).concatstabto(debuglist);
  306. end;
  307. {$endif GDB}
  308. { we need a class type for classrefdef }
  309. if (pd.deftype=classrefdef) and
  310. not(is_class(ttypesym(srsym).restype.def)) then
  311. Message1(type_e_class_type_expected,ttypesym(srsym).restype.def.typename);
  312. end
  313. else
  314. begin
  315. MessagePos1(tsym(p).fileinfo,sym_e_forward_type_not_resolved,tsym(p).realname);
  316. { try to recover }
  317. tpointerdef(pd).pointertype:=generrortype;
  318. end;
  319. end;
  320. end;
  321. recorddef :
  322. trecorddef(pd).symtable.foreach_static({$ifdef FPCPROCVAR}@{$endif}resolve_type_forward);
  323. objectdef :
  324. begin
  325. if not(m_fpc in aktmodeswitches) and
  326. (oo_is_forward in tobjectdef(pd).objectoptions) then
  327. begin
  328. { only give an error as the implementation may follow in an
  329. other type block which is allowed by FPC modes }
  330. MessagePos1(tsym(p).fileinfo,sym_e_forward_type_not_resolved,tsym(p).realname);
  331. end
  332. else
  333. begin
  334. { Check all fields of the object declaration, but don't
  335. check objectdefs in objects/records, because these
  336. can't exist (anonymous objects aren't allowed) }
  337. if not(tsym(p).owner.symtabletype in [objectsymtable,recordsymtable]) then
  338. tobjectdef(pd).symtable.foreach_static({$ifdef FPCPROCVAR}@{$endif}resolve_type_forward);
  339. end;
  340. end;
  341. end;
  342. until not again;
  343. end;
  344. { reads a type declaration to the symbol table }
  345. procedure type_dec;
  346. var
  347. typename,orgtypename : stringid;
  348. newtype : ttypesym;
  349. sym : tsym;
  350. srsymtable : tsymtable;
  351. tt : ttype;
  352. defpos,storetokenpos : tfileposinfo;
  353. old_block_type : tblock_type;
  354. begin
  355. old_block_type:=block_type;
  356. block_type:=bt_type;
  357. consume(_TYPE);
  358. typecanbeforward:=true;
  359. repeat
  360. typename:=pattern;
  361. orgtypename:=orgpattern;
  362. defpos:=akttokenpos;
  363. consume(_ID);
  364. consume(_EQUAL);
  365. { support 'ttype=type word' syntax }
  366. if token=_TYPE then
  367. Consume(_TYPE);
  368. { is the type already defined? }
  369. searchsym(typename,sym,srsymtable);
  370. newtype:=nil;
  371. { found a symbol with this name? }
  372. if assigned(sym) then
  373. begin
  374. if (sym.typ=typesym) then
  375. begin
  376. if ((token=_CLASS) or
  377. (token=_INTERFACE)) and
  378. (assigned(ttypesym(sym).restype.def)) and
  379. is_class_or_interface(ttypesym(sym).restype.def) and
  380. (oo_is_forward in tobjectdef(ttypesym(sym).restype.def).objectoptions) then
  381. begin
  382. { we can ignore the result }
  383. { the definition is modified }
  384. object_dec(orgtypename,tobjectdef(ttypesym(sym).restype.def));
  385. newtype:=ttypesym(sym);
  386. end;
  387. end;
  388. end;
  389. { no old type reused ? Then insert this new type }
  390. if not assigned(newtype) then
  391. begin
  392. { insert the new type first with an errordef, so that
  393. referencing the type before it's really set it
  394. will give an error (PFV) }
  395. tt:=generrortype;
  396. storetokenpos:=akttokenpos;
  397. newtype:=ttypesym.create(orgtypename,tt);
  398. symtablestack.insert(newtype);
  399. akttokenpos:=defpos;
  400. akttokenpos:=storetokenpos;
  401. { read the type definition }
  402. read_type(tt,orgtypename);
  403. { update the definition of the type }
  404. newtype.restype:=tt;
  405. if not assigned(tt.sym) then
  406. tt.sym:=newtype;
  407. if assigned(tt.def) and not assigned(tt.def.typesym) then
  408. tt.def.typesym:=newtype;
  409. { KAZ: handle TGUID declaration in system unit }
  410. if (cs_compilesystem in aktmoduleswitches) and not assigned(rec_tguid) and
  411. (typename='TGUID') and { name: TGUID and size=16 bytes that is 128 bits }
  412. assigned(tt.def) and (tt.def.deftype=recorddef) and (tt.def.size=16) then
  413. rec_tguid:=trecorddef(tt.def);
  414. end;
  415. if assigned(newtype.restype.def) then
  416. begin
  417. case newtype.restype.def.deftype of
  418. pointerdef :
  419. begin
  420. consume(_SEMICOLON);
  421. if try_to_consume(_FAR) then
  422. begin
  423. tpointerdef(newtype.restype.def).is_far:=true;
  424. consume(_SEMICOLON);
  425. end;
  426. end;
  427. procvardef :
  428. begin
  429. if not is_proc_directive(token) then
  430. consume(_SEMICOLON);
  431. parse_var_proc_directives(tsym(newtype));
  432. end;
  433. objectdef,
  434. recorddef :
  435. begin
  436. try_consume_hintdirective(newtype.symoptions);
  437. consume(_SEMICOLON);
  438. end;
  439. else
  440. consume(_SEMICOLON);
  441. end;
  442. end;
  443. until token<>_ID;
  444. typecanbeforward:=false;
  445. symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}resolve_type_forward);
  446. block_type:=old_block_type;
  447. end;
  448. procedure var_dec;
  449. { parses variable declarations and inserts them in }
  450. { the top symbol table of symtablestack }
  451. begin
  452. consume(_VAR);
  453. read_var_decs(false,false,false);
  454. end;
  455. procedure threadvar_dec;
  456. { parses thread variable declarations and inserts them in }
  457. { the top symbol table of symtablestack }
  458. begin
  459. consume(_THREADVAR);
  460. if not(symtablestack.symtabletype in [staticsymtable,globalsymtable]) then
  461. message(parser_e_threadvars_only_sg);
  462. read_var_decs(false,false,true);
  463. end;
  464. procedure resourcestring_dec;
  465. var
  466. name : stringid;
  467. p : tnode;
  468. storetokenpos,filepos : tfileposinfo;
  469. old_block_type : tblock_type;
  470. sp : pchar;
  471. begin
  472. consume(_RESOURCESTRING);
  473. if not(symtablestack.symtabletype in [staticsymtable,globalsymtable]) then
  474. message(parser_e_resourcestring_only_sg);
  475. old_block_type:=block_type;
  476. block_type:=bt_const;
  477. repeat
  478. name:=pattern;
  479. filepos:=akttokenpos;
  480. consume(_ID);
  481. case token of
  482. _EQUAL:
  483. begin
  484. consume(_EQUAL);
  485. p:=comp_expr(true);
  486. storetokenpos:=akttokenpos;
  487. akttokenpos:=filepos;
  488. case p.nodetype of
  489. ordconstn:
  490. begin
  491. if is_constcharnode(p) then
  492. begin
  493. getmem(sp,2);
  494. sp[0]:=chr(tordconstnode(p).value);
  495. sp[1]:=#0;
  496. symtablestack.insert(tconstsym.create_string(name,constresourcestring,sp,1));
  497. end
  498. else
  499. Message(cg_e_illegal_expression);
  500. end;
  501. stringconstn:
  502. begin
  503. getmem(sp,tstringconstnode(p).len+1);
  504. move(tstringconstnode(p).value_str^,sp^,tstringconstnode(p).len+1);
  505. symtablestack.insert(tconstsym.create_string(name,constresourcestring,sp,tstringconstnode(p).len));
  506. end;
  507. else
  508. Message(cg_e_illegal_expression);
  509. end;
  510. akttokenpos:=storetokenpos;
  511. consume(_SEMICOLON);
  512. p.free;
  513. end;
  514. else consume(_EQUAL);
  515. end;
  516. until token<>_ID;
  517. block_type:=old_block_type;
  518. end;
  519. end.
  520. {
  521. $Log$
  522. Revision 1.31 2001-06-03 21:57:35 peter
  523. + hint directive parsing support
  524. Revision 1.30 2001/05/08 21:06:31 florian
  525. * some more support for widechars commited especially
  526. regarding type casting and constants
  527. Revision 1.29 2001/04/13 01:22:11 peter
  528. * symtable change to classes
  529. * range check generation and errors fixed, make cycle DEBUG=1 works
  530. * memory leaks fixed
  531. Revision 1.28 2001/04/04 22:43:50 peter
  532. * remove unnecessary calls to firstpass
  533. Revision 1.27 2001/04/04 21:30:43 florian
  534. * applied several fixes to get the DD8 Delphi Unit compiled
  535. e.g. "forward"-interfaces are working now
  536. Revision 1.26 2001/04/02 21:20:31 peter
  537. * resulttype rewrite
  538. Revision 1.25 2001/03/11 22:58:49 peter
  539. * getsym redesign, removed the globals srsym,srsymtable
  540. Revision 1.24 2000/12/25 00:07:27 peter
  541. + new tlinkedlist class (merge of old tstringqueue,tcontainer and
  542. tlinkedlist objects)
  543. Revision 1.23 2000/12/07 17:19:42 jonas
  544. * new constant handling: from now on, hex constants >$7fffffff are
  545. parsed as unsigned constants (otherwise, $80000000 got sign extended
  546. and became $ffffffff80000000), all constants in the longint range
  547. become longints, all constants >$7fffffff and <=cardinal($ffffffff)
  548. are cardinals and the rest are int64's.
  549. * added lots of longint typecast to prevent range check errors in the
  550. compiler and rtl
  551. * type casts of symbolic ordinal constants are now preserved
  552. * fixed bug where the original resulttype.def wasn't restored correctly
  553. after doing a 64bit rangecheck
  554. Revision 1.22 2000/11/29 00:30:35 florian
  555. * unused units removed from uses clause
  556. * some changes for widestrings
  557. Revision 1.21 2000/11/12 22:17:46 peter
  558. * some realname updates for messages
  559. Revision 1.20 2000/11/11 16:19:11 peter
  560. * allow far directive for pointer type declarations
  561. Revision 1.19 2000/11/04 14:25:20 florian
  562. + merged Attila's changes for interfaces, not tested yet
  563. Revision 1.18 2000/10/31 22:02:49 peter
  564. * symtable splitted, no real code changes
  565. Revision 1.17 2000/10/14 10:14:51 peter
  566. * moehrendorf oct 2000 rewrite
  567. Revision 1.16 2000/09/24 21:19:50 peter
  568. * delphi compile fixes
  569. Revision 1.15 2000/09/24 15:06:21 peter
  570. * use defines.inc
  571. Revision 1.14 2000/09/11 17:00:23 florian
  572. + first implementation of Netware Module support, thanks to
  573. Armin Diehl ([email protected]) for providing the patches
  574. Revision 1.13 2000/08/27 20:19:39 peter
  575. * store strings with case in ppu, when an internal symbol is created
  576. a '$' is prefixed so it's not automatic uppercased
  577. Revision 1.12 2000/08/27 16:11:51 peter
  578. * moved some util functions from globals,cobjects to cutils
  579. * splitted files into finput,fmodule
  580. Revision 1.11 2000/08/20 15:01:17 peter
  581. * don't allow forward class in separate type blocks for delphi (merged)
  582. Revision 1.10 2000/08/17 09:17:19 pierre
  583. * fix go32v2 cycle problem
  584. Revision 1.9 2000/08/16 18:33:53 peter
  585. * splitted namedobjectitem.next into indexnext and listnext so it
  586. can be used in both lists
  587. * don't allow "word = word" type definitions (merged)
  588. Revision 1.8 2000/08/13 13:11:28 peter
  589. * put defaultpara values in parast and changed the name to
  590. 'def<Parameter name>'
  591. Revision 1.7 2000/08/13 08:42:59 peter
  592. * support absolute refering to funcret (merged)
  593. Revision 1.6 2000/08/02 19:49:59 peter
  594. * first things for default parameters
  595. Revision 1.5 2000/07/30 17:04:43 peter
  596. * merged fixes
  597. Revision 1.4 2000/07/14 05:11:49 michael
  598. + Patch to 1.1
  599. Revision 1.3 2000/07/13 12:08:26 michael
  600. + patched to 1.1.0 with former 1.09patch from peter
  601. Revision 1.2 2000/07/13 11:32:44 michael
  602. + removed logs
  603. }