paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-27 22:08:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Resolved conflict with none in TStringSplitoptions

Browse Source 
git-svn-id: trunk@32264 -
This commit is contained in:
michael 2015-11-07 10:08:28 +00:00
parent 4a32135563
commit b86ef67a54
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/tply/lextable.pas
View File

@ -77,7 +77,7 @@ type
SymTable = array [1..max_keys] of record SymTable = array [1..max_keys] of record
pname : StrPtr; pname : StrPtr;
(* print name; empty entries are denoted by pname=nil *) (* print name; empty entries are denoted by pname=nil *)
case sym_type : ( none, macro_sym, start_state_sym ) of case sym_type : ( none_sym, macro_sym, start_state_sym ) of
macro_sym : ( subst : StrPtr ); macro_sym : ( subst : StrPtr );
(* macro substitution *) (* macro substitution *)
start_state_sym : ( start_state : Integer ); start_state_sym : ( start_state : Integer );
@ -212,7 +212,7 @@ procedure entry(k : Integer; symbol : String);
with sym_table^[k] do with sym_table^[k] do
begin begin
pname := newStr(symbol); pname := newStr(symbol);
sym_type := none; sym_type := none_sym;
end end
end(*entry*); end(*entry*);

4
utils/tply/plex.pas
View File

@ -96,7 +96,7 @@ procedure define_start_state ( symbol : String; pos : Integer );
{$else} {$else}
with sym_table^[key(symbol, max_keys, lookup, entry)] do with sym_table^[key(symbol, max_keys, lookup, entry)] do
{$endif} {$endif}
if sym_type=none then if sym_type=none_sym then
begin begin
inc(n_start_states); inc(n_start_states);
if n_start_states>max_start_states then if n_start_states>max_start_states then
@ -119,7 +119,7 @@ procedure define_macro ( symbol, replacement : String );
{$else} {$else}
with sym_table^[key('{'+symbol+'}', max_keys, lookup, entry)] do with sym_table^[key('{'+symbol+'}', max_keys, lookup, entry)] do
{$endif} {$endif}
if sym_type=none then if sym_type=none_sym then
begin begin
sym_type := macro_sym; sym_type := macro_sym;
subst := newStr(strip(replacement)); subst := newStr(strip(replacement));