allow redefinition of egal parametric types

Author: vtjnash

src/interpreter.c

@@ -97,14 +97,13 @@ extern int inside_typedef;
 static int equiv_type(jl_datatype_t *dta, jl_datatype_t *dtb)
 {
     return (jl_typeof(dta) == jl_typeof(dtb) &&
-            // TODO: can't yet handle parametric types due to how constructors work
-            dta->parameters == jl_emptysvec &&
             dta->name->name == dtb->name->name &&
-            jl_egal((jl_value_t*)dta->types, (jl_value_t*)dtb->types) &&
             dta->abstract == dtb->abstract &&
             dta->mutabl == dtb->mutabl &&
             dta->size == dtb->size &&
             dta->ninitialized == dtb->ninitialized &&
+            jl_egal((jl_value_t*)dta->parameters, (jl_value_t*)dtb->parameters) &&
+            jl_egal((jl_value_t*)dta->types, (jl_value_t*)dtb->types) &&
             jl_egal((jl_value_t*)dta->super, (jl_value_t*)dtb->super) &&
             jl_egal((jl_value_t*)dta->name->names, (jl_value_t*)dtb->name->names) &&
             jl_egal((jl_value_t*)dta->parameters, (jl_value_t*)dtb->parameters));
@@ -297,7 +296,7 @@ static jl_value_t *eval(jl_value_t *e, interpreter_state *s)
             jl_rethrow();
         }
         b->value = temp;
-        if (temp==NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
+        if (temp == NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
             jl_checked_assignment(b, (jl_value_t*)dt);
         }
         JL_GC_POP();
@@ -339,7 +338,7 @@ static jl_value_t *eval(jl_value_t *e, interpreter_state *s)
             jl_rethrow();
         }
         b->value = temp;
-        if (temp==NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
+        if (temp == NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
             jl_checked_assignment(b, (jl_value_t*)dt);
         }
         JL_GC_POP();
@@ -405,12 +404,9 @@ static jl_value_t *eval(jl_value_t *e, interpreter_state *s)
         }
 
         b->value = temp;
-        if (temp==NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
+        if (temp == NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
             jl_checked_assignment(b, (jl_value_t*)dt);
         }
-        else {
-            // TODO: remove all old ctors and set temp->name->ctor_factory = dt->name->ctor_factory
-        }
 
         JL_GC_POP();
         return (jl_value_t*)jl_nothing;

src/jltypes.c

@@ -3607,7 +3607,7 @@ void jl_init_types(void)
                                            jl_symbol("bound")),
                                    jl_svec(4, jl_sym_type, jl_type_type,
                                            jl_type_type, jl_any_type),
-                                   0, 1, 3);
+                                   0, 0, 3);
 
     vararg_sym = jl_symbol("Vararg");
     jl_svec_t *tv;