modelbuilder: error when using `intrude' on classes and properties

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

diff --git a/src/modelize_class.nit b/src/modelize_class.nit
index 197ded4..90eb70d 100644 (file)
--- a/src/modelize_class.nit
+++ b/src/modelize_class.nit
@@ -54,6 +54,9 @@ redef class ModelBuilder
                        if mvisibility == protected_visibility then
                                error(nvisibility, "Error: only properties can be protected.")
                                return
+                       else if mvisibility == intrude_visibility then
+                               error(nvisibility, "Error: intrude is not a legal visibility for classes.")
+                               return
                        end
                else if nclassdef isa ATopClassdef then
                        name = "Object"

diff --git a/src/modelize_property.nit b/src/modelize_property.nit
index 0215897..2a8a225 100644 (file)
--- a/src/modelize_property.nit
+++ b/src/modelize_property.nit
@@ -207,7 +207,13 @@ redef class APropdef
        private fun new_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility): MVisibility
        do
                var mvisibility = public_visibility
-               if nvisibility != null then mvisibility = nvisibility.mvisibility
+               if nvisibility != null then
+                       mvisibility = nvisibility.mvisibility
+                       if mvisibility == intrude_visibility then
+                               modelbuilder.error(nvisibility, "Error: intrude is not a legal visibility for properties.")
+                               mvisibility = public_visibility
+                       end
+               end
                if nclassdef.mclassdef.mclass.visibility == private_visibility then
                        if mvisibility == protected_visibility then
                                assert nvisibility != null

diff --git a/tests/error_visibility_protected.nit b/tests/error_visibility_protected.nit
index 0bb634c..6e1fa98 100644 (file)
--- a/tests/error_visibility_protected.nit
+++ b/tests/error_visibility_protected.nit
@@ -14,10 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import kernel #alt1# private import kernel #alt2# protected import kernel
+import kernel #alt1# private import kernel #alt2# protected import kernel #alt7# intrude import kernel
 
-class A #alt3# private class A #alt4# protected class A
-       fun foo #alt5# private fun foo #alt6# protected fun foo
+class A #alt3# private class A #alt4# protected class A #alt8# intrude class A
+       fun foo #alt5# private fun foo #alt6# protected fun foo #alt9# intrude fun foo
        do
                1.output
        end

diff --git a/tests/sav/error_visibility_protected_alt7.res b/tests/sav/error_visibility_protected_alt7.res
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/tests/sav/error_visibility_protected_alt7.res
@@ -0,0 +1 @@
+1

diff --git a/tests/sav/error_visibility_protected_alt8.res b/tests/sav/error_visibility_protected_alt8.res
new file mode 100644 (file)
index 0000000..70c00d9
--- /dev/null
+++ b/tests/sav/error_visibility_protected_alt8.res
@@ -0,0 +1 @@
+alt/error_visibility_protected_alt8.nit:19,1--7: Error: intrude is not a legal visibility for classes.

diff --git a/tests/sav/error_visibility_protected_alt9.res b/tests/sav/error_visibility_protected_alt9.res
new file mode 100644 (file)
index 0000000..1b7fa04
--- /dev/null
+++ b/tests/sav/error_visibility_protected_alt9.res
@@ -0,0 +1 @@
+alt/error_visibility_protected_alt9.nit:20,2--8: Error: intrude is not a legal visibility for properties.

diff --git a/tests/sav/nitc/fixme/error_visibility_protected_alt8.res b/tests/sav/nitc/fixme/error_visibility_protected_alt8.res
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/tests/sav/nitc/fixme/error_visibility_protected_alt8.res
@@ -0,0 +1 @@
+1

diff --git a/tests/sav/nitc/fixme/error_visibility_protected_alt9.res b/tests/sav/nitc/fixme/error_visibility_protected_alt9.res
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/tests/sav/nitc/fixme/error_visibility_protected_alt9.res
@@ -0,0 +1 @@
+1