paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 09:26:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* add support for exclusive start conditions

Browse Source 
Reintegrate fpcres-rc branch by Martok

git-svn-id: trunk@46371 -
This commit is contained in:
svenbarth 2020-08-12 19:02:18 +00:00
parent f31ed1551e
commit f91a5cfe25
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/tply/lexdfa.pas
View File

@ -53,7 +53,8 @@ procedure makeDFATable;
begin begin
(* initialize start states: *) (* initialize start states: *)
for i := 2 to 2*n_start_states+1 do for i := 2 to 2*n_start_states+1 do
setunion(first_pos_table^[i]^, first_pos_table^[i mod 2]^); if not start_excl^[i div 2] then
setunion(first_pos_table^[i]^, first_pos_table^[i mod 2]^);
for i := 0 to 2*n_start_states+1 do for i := 0 to 2*n_start_states+1 do
act_state := newState(first_pos_table^[i]); act_state := newState(first_pos_table^[i]);
act_state := -1; act_state := -1;

4
utils/tply/lextable.pas
View File

@ -105,6 +105,8 @@ FirstPosTable = array [0..2*max_start_states+1] of IntSetPtr;
default, states 2..2*n_start_states+1 user-defined default, states 2..2*n_start_states+1 user-defined
start states) *) start states) *)
StartStateExclusive = array[0..max_start_states] of Boolean;
StateTableEntry = record StateTableEntry = record
state_pos : IntSetPtr; state_pos : IntSetPtr;
(* positions covered by state *) (* positions covered by state *)
@ -137,6 +139,7 @@ optimize : Boolean; (* status of the optimization option *)
sym_table : ^SymTable; (* symbol table *) sym_table : ^SymTable; (* symbol table *)
pos_table : ^PosTable; (* position table *) pos_table : ^PosTable; (* position table *)
first_pos_table : ^FirstPosTable; (* first positions table *) first_pos_table : ^FirstPosTable; (* first positions table *)
start_excl : ^StartStateExclusive; (* user-defined start state type *)
state_table : ^StateTable; (* DFA state table *) state_table : ^StateTable; (* DFA state table *)
trans_table : ^TransTable; (* DFA transition table *) trans_table : ^TransTable; (* DFA transition table *)
@ -460,6 +463,7 @@ begin
new(sym_table); new(sym_table);
new(pos_table); new(pos_table);
new(first_pos_table); new(first_pos_table);
new(start_excl);
new(state_table); new(state_table);
new(trans_table); new(trans_table);

7
utils/tply/plex.pas
View File

@ -88,7 +88,7 @@ procedure next_section;
var n_rules : Integer; (* current number of rules *) var n_rules : Integer; (* current number of rules *)
procedure define_start_state ( symbol : String; pos : Integer ); procedure define_start_state ( symbol : String; pos : Integer; excl : Boolean );
(* process start state definition *) (* process start state definition *)
begin begin
{$ifdef fpc} {$ifdef fpc}
@ -106,6 +106,7 @@ procedure define_start_state ( symbol : String; pos : Integer );
writeln(yyout, 'const ', symbol, ' = ', 2*start_state, ';'); writeln(yyout, 'const ', symbol, ' = ', 2*start_state, ';');
first_pos_table^[2*start_state] := newIntSet; first_pos_table^[2*start_state] := newIntSet;
first_pos_table^[2*start_state+1] := newIntSet; first_pos_table^[2*start_state+1] := newIntSet;
start_excl^[start_state] := excl;
end end
else else
error(symbol_already_defined, pos) error(symbol_already_defined, pos)
@ -505,12 +506,12 @@ procedure definitions;
begin begin
split(line, 2); split(line, 2);
com := upper(itemv(1)); com := upper(itemv(1));
if (com='%S') or (com='%START') then if (com='%S') or (com='%START') or (com='%X') then
begin begin
split(line, max_items); split(line, max_items);
for i := 2 to itemc do for i := 2 to itemc do
if check_id(itemv(i)) then if check_id(itemv(i)) then
define_start_state(itemv(i), itempos[i]) define_start_state(itemv(i), itempos[i], com='%X')
else else
error(syntax_error, itempos[i]); error(syntax_error, itempos[i]);
end end