nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/html: implement the tag list as an hashset instead of a array.
[nit.git]
/
src
/
annotation.nit
diff --git
a/src/annotation.nit
b/src/annotation.nit
index
882b645
..
73c9985
100644
(file)
--- a/
src/annotation.nit
+++ b/
src/annotation.nit
@@
-30,7
+30,7
@@
redef class Prod
var res = get_annotations(name)
if res.is_empty then return null
if res.length > 1 then
var res = get_annotations(name)
if res.is_empty then return null
if res.length > 1 then
- modelbuilder.error(res[1], "Error: multiple annotation `{name}`. A previous one is defined line {res[0].location.line_start}")
+ modelbuilder.error(res[1], "Syntax Error: multiple `{name}`. A previous one is defined line {res[0].location.line_start}.")
end
return res.first
end
end
return res.first
end
@@
-47,7
+47,7
@@
redef class AAnnotation
if arg != null then return arg
end
if arg != null then return arg
end
- modelbuilder.error(self, "Annotation error: \"{name}\" expects a single String as argument.")
+ modelbuilder.error(self, "Syntax Error: `{name}` expects a single String as argument.")
return null
end
return null
end
@@
-61,7
+61,7
@@
redef class AAnnotation
if arg != null then return arg
end
if arg != null then return arg
end
- modelbuilder.error(self, "Annotation error: \"{name}\" expects a single Int as argument.")
+ modelbuilder.error(self, "Syntax Error: `{name}` expects a single Int as argument.")
return null
end
return null
end
@@
-75,7
+75,7
@@
redef class AAnnotation
if arg != null then return arg
end
if arg != null then return arg
end
- modelbuilder.error(self, "Annotation error: \"{name}\" expects a single identifier as argument.")
+ modelbuilder.error(self, "Syntax Error: `{name}` expects a single identifier as argument.")
return null
end
end
return null
end
end
@@
-142,7
+142,7
@@
redef class ModelBuilder
for annot in annotations do locs.add(annot.location)
toolcontext.error(mmodule.location,
for annot in annotations do locs.add(annot.location)
toolcontext.error(mmodule.location,
- "Priority conflict on annotation {name}, it has been defined in: {locs.join(", ")}")
+ "Error: priority conflict on annotation `{name}`, it has been defined in: {locs.join(", ")}.")
end
return annotations.first
end
end
return annotations.first
end