modelbuilder: prevent names of formal type to have lowercases

fixes #97

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

diff --git a/src/modelize_class.nit b/src/modelize_class.nit
index e96877d..688ee7a 100644 (file)
--- a/src/modelize_class.nit
+++ b/src/modelize_class.nit
@@ -116,6 +116,10 @@ redef class ModelBuilder
                                        error(nfd, "Error: A formal parameter type `{ptname}' already exists")
                                        return
                                end
+                               for c in ptname do if c >= 'a' and c<= 'z' then
+                                       warning(nfd, "Warning: lowercase in the formal parameter type {ptname}")
+                                       break
+                               end
                                names.add(ptname)
                                nfd.mtype = mclass.mclass_type.arguments[i].as(MParameterType)
                        end

diff --git a/src/modelize_property.nit b/src/modelize_property.nit
index a53de2d..2f94421 100644 (file)
--- a/src/modelize_property.nit
+++ b/src/modelize_property.nit
@@ -837,6 +837,10 @@ redef class ATypePropdef
                if mprop == null then
                        var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
                        mprop = new MVirtualTypeProp(mclassdef, name, mvisibility)
+                       for c in name do if c >= 'a' and c<= 'z' then
+                               modelbuilder.warning(n_id, "Warning: lowercase in the virtual type {name}")
+                               break
+                       end
                        if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, false, mprop) then return
                else
                        if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, true, mprop) then return

diff --git a/tests/error_formal_name.nit b/tests/error_formal_name.nit
new file mode 100644 (file)
index 0000000..be27718
--- /dev/null
+++ b/tests/error_formal_name.nit
@@ -0,0 +1,19 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import kernel
+
+class G[Foo]
+       type Bar: Object
+end

diff --git a/tests/sav/error_formal_name.res b/tests/sav/error_formal_name.res
new file mode 100644 (file)
index 0000000..6337d8c
--- /dev/null
+++ b/tests/sav/error_formal_name.res
@@ -0,0 +1,2 @@
+error_formal_name.nit:17,9--11: Warning: lowercase in the formal parameter type Foo
+error_formal_name.nit:18,7--9: Warning: lowercase in the virtual type Bar

diff --git a/tests/sav/nitc/error_formal_name.res b/tests/sav/nitc/error_formal_name.res
new file mode 100644 (file)
index 0000000..e69de29