josh/propane
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Record accepting token in DFA state

Browse Source
This commit is contained in:
Josh Holtrop 2021-05-25 16:00:25 -04:00
parent 35ef94dbd3
commit b6e3a5c151
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/imbecile/grammar.rb
View File

@ -39,9 +39,11 @@ module Imbecile
end end
# Build NFA from each token expression. # Build NFA from each token expression.
i = 0
@tokens.each do |token_name, token_def| @tokens.each do |token_name, token_def|
token_def[:regex] = Regex.new(token_def[:pattern]) token_def[:regex] = Regex.new(token_def[:pattern])
token_def[:regex].nfa.end_state.accepts = token_name token_def[:regex].nfa.end_state.accepts = "#{i}:#{token_name}"
i += 1
end end
dfa = Regex::DFA.new(@tokens.map {|token_name, token_def| token_def[:regex].nfa}) dfa = Regex::DFA.new(@tokens.map {|token_name, token_def| token_def[:regex].nfa})
puts dfa puts dfa

17
lib/imbecile/regex/dfa.rb
View File

@ -60,13 +60,15 @@ module Imbecile
end end
rv = "" rv = ""
@states.each_with_index do |state, state_id| @states.each_with_index do |state, state_id|
rv += "#{state_id}:\n" accepts_s = state.accepts ? " (#{state.accepts})" : ""
rv += "#{state_id}#{accepts_s}:\n"
state.transitions.each do |transition| state.transitions.each do |transition|
range_s = chr[transition.code_point_range.first] range_s = chr[transition.code_point_range.first]
if transition.code_point_range.size > 1 if transition.code_point_range.size > 1
range_s += "-" + chr[transition.code_point_range.last] range_s += "-" + chr[transition.code_point_range.last]
end end
rv += " #{range_s} => #{transition.destination.id}\n" accepts_s = transition.destination.accepts ? " (#{transition.destination.accepts})" : ""
rv += " #{range_s} => #{transition.destination.id}#{accepts_s}\n"
end end
end end
rv rv
@ -85,6 +87,17 @@ module Imbecile
def process_nfa_state_set(nfa_state_set) def process_nfa_state_set(nfa_state_set)
state = @states[@nfa_state_sets[nfa_state_set]] state = @states[@nfa_state_sets[nfa_state_set]]
nfa_state_set.each do |nfa_state|
if nfa_state.accepts
if state.accepts
if nfa_state.accepts.to_i < state.accepts.to_i
state.accepts = nfa_state.accepts
end
else
state.accepts = nfa_state.accepts
end
end
end
transitions = transitions_for(nfa_state_set) transitions = transitions_for(nfa_state_set)
while transitions.size > 0 while transitions.size > 0
subrange = CodePointRange.first_subrange(transitions.map(&:code_point_range)) subrange = CodePointRange.first_subrange(transitions.map(&:code_point_range))