Merge branch 'alexamdre/various-fixes' into next

diff --git a/doc/developpez/poo/listings/type3_s.nit b/doc/developpez/poo/listings/type3_s.nit
index 607eb81..9ace3cd 100644 (file)
--- a/doc/developpez/poo/listings/type3_s.nit
+++ b/doc/developpez/poo/listings/type3_s.nit
@@ -1,3 +1,3 @@
-class XMLDocument special Graph end
+class XMLDocument super Graph end
 
-class XMLNode special Node end
+class XMLNode super Node end

diff --git a/doc/developpez/poo/listings/type6_s.nit b/doc/developpez/poo/listings/type6_s.nit
index 69fec03..25acb5d 100644 (file)
--- a/doc/developpez/poo/listings/type6_s.nit
+++ b/doc/developpez/poo/listings/type6_s.nit
@@ -12,12 +12,12 @@ end
 class Node end
 
 class XMLDocument 
-       special Graph 
+       super Graph 
 
        redef type NODE: XMLNode
 end
 
-class XMLNode special Node end
+class XMLNode super Node end
 
 var doc = new XMLDocument
 

diff --git a/src/metamodel/static_type.nit b/src/metamodel/static_type.nit
index fc1f684..c44efb9 100644 (file)
--- a/src/metamodel/static_type.nit
+++ b/src/metamodel/static_type.nit
@@ -336,9 +336,9 @@ abstract class MMType
        # 'c' Must be a super-class of self
        # Example:
        #   class A[E]
-       #   class B[F] special A[F]
-       #   class C[G] special B[String]
-       #   class D special C[Float]
+       #   class B[F] super A[F]
+       #   class C[G] super B[String]
+       #   class D super C[Float]
        # 'A[Int]'.upcast_for('A') -> 'A[Int]'
        # 'A[Int]'.upcast_for('B') -> abort
        # 'B[Int]'.upcast_for('B') -> 'B[Int]'

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index 96c4840..97a6e33 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -152,10 +152,10 @@ private class TypingVisitor
                        for p in false_candidates do
                                a.add("{p.full_name}{p.signature.as(not null)}")
                        end
-                       v.error(n, "Error: there is no available compatible constrctor in {c}. Discarded candidates are {a.join(", ")}.")
+                       v.error(n, "Error: there is no available compatible constructor in {c}. Discarded candidates are {a.join(", ")}.")
                        return null
                else
-                       v.error(n, "Error: there is no available compatible constrctor in {c}.")
+                       v.error(n, "Error: there is no available compatible constructor in {c}.")
                        return null
                end
        end

diff --git a/tests/sav/base_init_linext2_alt2.sav b/tests/sav/base_init_linext2_alt2.sav
index ce93357..66f86c6 100644 (file)
--- a/tests/sav/base_init_linext2_alt2.sav
+++ b/tests/sav/base_init_linext2_alt2.sav
@@ -1 +1 @@
-alt/base_init_linext2_alt2.nit:99,2--112,12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(Char).
+alt/base_init_linext2_alt2.nit:99,2--112,12: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(Char).

diff --git a/tests/sav/base_init_linext2_alt4.sav b/tests/sav/base_init_linext2_alt4.sav
index 3be440e..71438c3 100644 (file)
--- a/tests/sav/base_init_linext2_alt4.sav
+++ b/tests/sav/base_init_linext2_alt4.sav
@@ -1,2 +1,2 @@
 alt/base_init_linext2_alt4.nit:105,3--7: Error: Constructor of B must be invoked before constructor of C
-alt/base_init_linext2_alt4.nit:99,2--113,12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(Char).
+alt/base_init_linext2_alt4.nit:99,2--113,12: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(Char).