nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: nitunit: Use markdown2
[nit.git]
/
contrib
/
nitcc
/
src
/
grammar.nit
diff --git
a/contrib/nitcc/src/grammar.nit
b/contrib/nitcc/src/grammar.nit
index
b3b2c6b
..
feb4498
100644
(file)
--- a/
contrib/nitcc/src/grammar.nit
+++ b/
contrib/nitcc/src/grammar.nit
@@
-569,7
+569,7
@@
class LRAutomaton
res.add "\t\tREDUCE {r}\n"
end
end
res.add "\t\tREDUCE {r}\n"
end
end
- return res.to_s
+ return res.join
end
# Generate a graphviz file of the automaton
end
# Generate a graphviz file of the automaton
@@
-640,7
+640,7
@@
private class Generator
var gram = autom.grammar
add "# Parser generated by nitcc for the grammar {name}"
var gram = autom.grammar
add "# Parser generated by nitcc for the grammar {name}"
- add "module {name}_parser is no_warning(\"missing-doc\",\"old-init\")"
+ add "module {name}_parser is generated, no_warning(\"missing-doc\",\"old-init\")"
add "import nitcc_runtime"
add "class Parser_{name}"
add "import nitcc_runtime"
add "class Parser_{name}"
@@
-653,6
+653,11
@@
private class Generator
end
for p in gram.prods do
add "private fun goto_{p.cname}: Goto_{p.cname} do return once new Goto_{p.cname}"
end
for p in gram.prods do
add "private fun goto_{p.cname}: Goto_{p.cname} do return once new Goto_{p.cname}"
+ for a in p.alts do
+ add "private fun reduce_{a.cname}(parser: Parser) do"
+ gen_reduce_to_nit(a)
+ add "end"
+ end
end
add "redef class NToken"
end
add "redef class NToken"
@@
-664,7
+669,8
@@
private class Generator
if s.reduces.length != 1 then
add "\t\tparser.parse_error"
else
if s.reduces.length != 1 then
add "\t\tparser.parse_error"
else
- gen_reduce_to_nit(s.reduces.first)
+ add "\t\treduce_{s.reduces.first.cname}(parser)"
+ #gen_reduce_to_nit(s.reduces.first)
end
add "\tend"
end
end
add "\tend"
end
@@
-687,7
+693,8
@@
private class Generator
if not s.need_guard then continue
if s.reduces.length <= 1 then continue
add "\tredef fun action_s{s.cname}(parser) do"
if not s.need_guard then continue
if s.reduces.length <= 1 then continue
add "\tredef fun action_s{s.cname}(parser) do"
- gen_reduce_to_nit(s.guarded_reduce[t].first.alt)
+ add "\t\treduce_{s.guarded_reduce[t].first.alt.cname}(parser)"
+ #gen_reduce_to_nit(s.guarded_reduce[t].first.alt)
add "\tend"
end
add "\tredef fun node_name do return \"{t.name.escape_to_nit}\""
add "\tend"
end
add "\tredef fun node_name do return \"{t.name.escape_to_nit}\""
@@
-783,7
+790,8
@@
private class Generator
if s.need_guard then
add "\t\tparser.peek_token.action_s{s.cname}(parser)"
else if s.reduces.length == 1 then
if s.need_guard then
add "\t\tparser.peek_token.action_s{s.cname}(parser)"
else if s.reduces.length == 1 then
- gen_reduce_to_nit(s.reduces.first)
+ add "\t\treduce_{s.reduces.first.cname}(parser)"
+ #gen_reduce_to_nit(s.reduces.first)
else
abort
end
else
abort
end
@@
-886,10
+894,10
@@
class LRState
var name: String
# Mangled name
var name: String
# Mangled name
- fun cname: String do return name.to_cmangle
+ var cname: String is lazy do return name.to_cmangle
# Number
# Number
- var number: Int = -1
+ var number = -1
# Set of all items
var items = new HashSet[Item]
# Set of all items
var items = new HashSet[Item]
@@
-1001,6
+1009,7
@@
class LRState
if a.length > 1 then
print "REDUCE/REDUCE Conflict on state {self.number} {self.name} for token {t}:"
for i in a do print "\treduce: {i}"
if a.length > 1 then
print "REDUCE/REDUCE Conflict on state {self.number} {self.name} for token {t}:"
for i in a do print "\treduce: {i}"
+ conflicting_items.add_all a
end
if guarded_shift.has_key(t) then
var ri = a.first
end
if guarded_shift.has_key(t) then
var ri = a.first
@@
-1040,14
+1049,22
@@
class LRState
print "\treduce: {ri}"
for i in guarded_shift[t] do print "\tshift: {i}"
removed_reduces.add t
print "\treduce: {ri}"
for i in guarded_shift[t] do print "\tshift: {i}"
removed_reduces.add t
+ conflicting_items.add_all a
+ conflicting_items.add_all guarded_shift[t]
end
end
end
for t in removed_reduces do
guarded_reduce.keys.remove(t)
end
end
end
for t in removed_reduces do
guarded_reduce.keys.remove(t)
+ t.reduces.remove(self)
end
end
end
end
+ # Items within a reduce/reduce or a shift/reduce conflict.
+ #
+ # Is computed by `analysis`
+ var conflicting_items = new ArraySet[Item]
+
# Return `i` and all other items of the state that expands, directly or indirectly, to `i`
fun back_expand(i: Item): Set[Item]
do
# Return `i` and all other items of the state that expands, directly or indirectly, to `i`
fun back_expand(i: Item): Set[Item]
do