nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git]
/
contrib
/
nitcc
/
src
/
nitcc.nit
diff --git
a/contrib/nitcc/src/nitcc.nit
b/contrib/nitcc/src/nitcc.nit
index
a499217
..
7e380e1
100644
(file)
--- a/
contrib/nitcc/src/nitcc.nit
+++ b/
contrib/nitcc/src/nitcc.nit
@@
-72,8
+72,8
@@
end
var lr = gram.lr0
var conflitcs = new ArraySet[Production]
var lr = gram.lr0
var conflitcs = new ArraySet[Production]
-for s in lr.states do for t, a in s.guarded_reduce do if a.length > 1 or s.guarded_shift.has_key(t) then
- for i in a do conflitcs.add(i.alt.prod)
+for s in lr.states do
+ for i in s.conflicting_items do conflitcs.add(i.alt.prod)
end
if not conflitcs.is_empty then
end
if not conflitcs.is_empty then