diff --git a/Header.pas b/Header.pas index 635fb21..689d74d 100644 --- a/Header.pas +++ b/Header.pas @@ -18,7 +18,7 @@ uses CCommon, MM, Scanner, Symbol, CGI; {$segment 'SCANNER'} const - symFileVersion = 23; {version number of .sym file format} + symFileVersion = 24; {version number of .sym file format} var inhibitHeader: boolean; {should .sym includes be blocked?} @@ -744,7 +744,6 @@ procedure EndInclude {chPtr: ptr}; tp := mp^.tokens; {loop over token list} while tp <> nil do begin WriteByte(1); {write tokenListRecord} - WriteLongString(tp^.tokenString); WriteToken(tp^.token); WriteByte(ord(tp^.expandEnabled)); WriteChars(tp^.tokenStart, tp^.tokenEnd); @@ -1387,7 +1386,6 @@ var while ReadByte <> 0 do begin tp := pointer(GMalloc(sizeof(tokenListRecord))); tp^.next := nil; - tp^.tokenString := ReadLongString; ReadToken(tp^.token); tp^.expandEnabled := boolean(ReadByte); ReadChars(tp^.tokenStart, tp^.tokenEnd); diff --git a/Scanner.pas b/Scanner.pas index 4540637..01ea4e5 100644 --- a/Scanner.pas +++ b/Scanner.pas @@ -46,7 +46,6 @@ type tokenListRecordPtr = ^tokenListRecord; tokenListRecord = record {element of a list of tokens} next: tokenListRecordPtr; {next element in list} - tokenString: longStringPtr; {string making up the token} token: tokenType; {token} expandEnabled: boolean; {can this token be macro expanded?} tokenStart,tokenEnd: ptr; {token start/end markers} @@ -2459,11 +2458,6 @@ var pnum: integer; {for counting parameters} tPtr,tk1,tk2: tokenListRecordPtr; {pointer to a token} - {for building token strings} - sptr: longStringPtr; {token string work pointer} - tcp: ptr; {temp character pointer} - slen: integer; {token string length} - begin {DoDefine} expandMacros := false; {block expansions} saveNumber := true; {save characters in numeric tokens} @@ -2584,15 +2578,6 @@ var tPtr^.tokenStart := tokenStart; tPtr^.tokenEnd := tokenEnd; tPtr^.expandEnabled := true; - slen := ord(ord4(chPtr) - ord4(tokenStart)); - sptr := pointer(GMalloc(slen+2)); - sptr^.length := slen; - tcp := tokenStart; - for i := 1 to slen do begin - sptr^.str[i] := chr(tcp^); - tcp := pointer(ord4(tcp)+1); - end; {for} - tPtr^.tokenString := sptr; NextToken; end; {while} mPtr^.readOnly := false; @@ -4365,7 +4350,6 @@ repeat new(mp^.tokens); with mp^.tokens^ do begin next := nil; - tokenString := @''; expandEnabled := true; end; {with} token.kind := intconst; {create the default value}