nitcc: improve error messages

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/contrib/nitcc/src/nitcc.nit b/contrib/nitcc/src/nitcc.nit
index 3d172ef..bc2e8b3 100644 (file)
--- a/contrib/nitcc/src/nitcc.nit
+++ b/contrib/nitcc/src/nitcc.nit
@@ -114,12 +114,14 @@ nfa.to_dot("{name}.nfa.dot")
 
 var dfa = nfa.to_dfa
 if dfa.tags.has_key(dfa.start) then
-       print "ERROR: Empty tokens {dfa.tags[dfa.start].join(" ")}"
+       print "Error: Empty tokens {dfa.tags[dfa.start].join(" ")}"
+       exit(1)
 end
 dfa.solve_token_inclusion
 for s, tks in dfa.tags do
        if tks.length <= 1 then continue
-       print "ERROR: Conflicting tokens: {tks.join(" ")}"
+       print "Error: Conflicting tokens: {tks.join(" ")}"
+       exit(1)
 end
 print "DFA automaton: {dfa.states.length} states (see {name}.dfa.dot)"
 dfa.to_dot("{name}.dfa.dot")

diff --git a/contrib/nitcc/src/nitcc_semantic.nit b/contrib/nitcc/src/nitcc_semantic.nit
index 8713da0..39546d8 100644 (file)
--- a/contrib/nitcc/src/nitcc_semantic.nit
+++ b/contrib/nitcc/src/nitcc_semantic.nit
@@ -213,13 +213,13 @@ redef class Nre_id
                var id = children.first.as(Nid)
                var name = id.text
                if not v.v1.names.has_key(name) then
-                       print "Error: unknown name {name}"
+                       print "{id.position} Error: unknown name {name}"
                        exit(1)
                        abort
                end
                var node = v.v1.names[name]
                if node isa Nprod then
-                       print "Error: cannot use production {name} in a regular expression"
+                       print "{id.position} Error: cannot use production {name} in a regular expression"
                        exit(1)
                        abort
                else if not node isa Nexpr then
@@ -243,14 +243,14 @@ redef class Nign
                var id = children[1].as(Nid)
                var name = id.text
                if not v.v1.names.has_key(name) then
-                       print "Error: unknown name {name}"
+                       print "{id.position} Error: unknown name {name}"
                        exit(1)
                        abort
                end
                var node = v.v1.names[name]
                var elem: nullable Element
                if node isa Nprod then
-                       print "Error cannot ignore a production"
+                       print "{id.position} Error: cannot ignore a production"
                        exit(1)
                        abort
                else if node isa Nexpr then
@@ -412,7 +412,7 @@ redef class Nelem_id
                var id = children.first.as(Nid)
                var name = id.text
                if not v.v1.names.has_key(name) then
-                       print "Error: unknown name {name}"
+                       print "{id.position} Error: unknown name {name}"
                        exit(1)
                        abort
                end

diff --git a/contrib/nitcc/tests/sav/lexer-c-comment.res b/contrib/nitcc/tests/sav/lexer-c-comment.res
index f66dc98..6518794 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer-c-comment.res
+++ b/contrib/nitcc/tests/sav/lexer-c-comment.res
@@ -1 +1 @@
-ERROR: Conflicting tokens: com1 com2
+Error: Conflicting tokens: com1 com2

diff --git a/contrib/nitcc/tests/sav/lexer-errors.alt1.res b/contrib/nitcc/tests/sav/lexer-errors.alt1.res
index dc6af8c..d1feb78 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer-errors.alt1.res
+++ b/contrib/nitcc/tests/sav/lexer-errors.alt1.res
@@ -1 +1 @@
-ERROR: Empty tokens a
+Error: Empty tokens a

diff --git a/contrib/nitcc/tests/sav/lexer-errors.alt5.res b/contrib/nitcc/tests/sav/lexer-errors.alt5.res
index 38d2860..dec67f4 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer-errors.alt5.res
+++ b/contrib/nitcc/tests/sav/lexer-errors.alt5.res
@@ -1 +1 @@
-Error: unknown name fail
+8:13-8:17 Error: unknown name fail

diff --git a/contrib/nitcc/tests/sav/lexer-errors.alt8.res b/contrib/nitcc/tests/sav/lexer-errors.alt8.res
index 38d2860..29cfebe 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer-errors.alt8.res
+++ b/contrib/nitcc/tests/sav/lexer-errors.alt8.res
@@ -1 +1 @@
-Error: unknown name fail
+14:9-14:13 Error: unknown name fail

diff --git a/contrib/nitcc/tests/sav/lexer-errors.res b/contrib/nitcc/tests/sav/lexer-errors.res
index 866a8f6..85df7b1 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer-errors.res
+++ b/contrib/nitcc/tests/sav/lexer-errors.res
@@ -1 +1 @@
-Error: unknown name a
+15:5-15:6 Error: unknown name a

diff --git a/contrib/nitcc/tests/sav/lexer-precedences.alt4.res b/contrib/nitcc/tests/sav/lexer-precedences.alt4.res
index 6a70780..83e0c5b 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer-precedences.alt4.res
+++ b/contrib/nitcc/tests/sav/lexer-precedences.alt4.res
@@ -1 +1 @@
-ERROR: Conflicting tokens: xa xb
+Error: Conflicting tokens: xa xb

diff --git a/contrib/nitcc/tests/sav/lexer-precedences.res b/contrib/nitcc/tests/sav/lexer-precedences.res
index 866a8f6..53ca463 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer-precedences.res
+++ b/contrib/nitcc/tests/sav/lexer-precedences.res
@@ -1 +1 @@
-Error: unknown name a
+9:6-9:7 Error: unknown name a

diff --git a/contrib/nitcc/tests/sav/lexer_conflict_token.res b/contrib/nitcc/tests/sav/lexer_conflict_token.res
index 438487c..179aba7 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer_conflict_token.res
+++ b/contrib/nitcc/tests/sav/lexer_conflict_token.res
@@ -1 +1 @@
-ERROR: Conflicting tokens: a b
+Error: Conflicting tokens: a b

diff --git a/contrib/nitcc/tests/sav/lexer_empty_token.res b/contrib/nitcc/tests/sav/lexer_empty_token.res
index a22914d..5f519d9 100644 (file)
--- a/contrib/nitcc/tests/sav/lexer_empty_token.res
+++ b/contrib/nitcc/tests/sav/lexer_empty_token.res
@@ -1 +1 @@
-ERROR: Empty tokens b a
+Error: Empty tokens b a