:art: Tmpl_Class => Tmpl_List

diff --git a/ast b/ast
index fe0bdff5928947b832ec50726f96979a534d08f9..94e10dede128475686da71e1f35b5a89b88073fd 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit fe0bdff5928947b832ec50726f96979a534d08f9
+Subproject commit 94e10dede128475686da71e1f35b5a89b88073fd

diff --git a/src/emit/emit.c b/src/emit/emit.c
index b33b1f098319a23032cc342eb579e9c9887ff2cf..a45afe3cdedb2ded4a4b2724f56d1d850b18a7e2 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -1750,7 +1750,7 @@ ANN static inline void emit_class_pop(const Emitter emit) {
 ANN static m_bool emit_class_def(const Emitter emit, const Class_Def cdef) {
   const Type type = cdef->base.type;
   const Nspc nspc = type->nspc;
-  if(tmpl_class_base(cdef->tmpl))
+  if(tmpl_list_base(cdef->tmpl))
     return GW_OK;
   if(cdef->base.ext && ((/*!GET_FLAG(type->e->parent, emit) &&*/
       GET_FLAG(cdef->base.ext, typedef)) || cdef->base.ext->types)) {

diff --git a/src/lib/import.c b/src/lib/import.c
index 258012b8779e295f5cb7a2954d75a77ee8564bea..7f5aee96663871ea26eea6ed1adb01ab7b577b6c 100644 (file)
--- a/src/lib/import.c
+++ b/src/lib/import.c
@@ -221,7 +221,7 @@ ANN2(1,2) m_int gwi_class_ini(const Gwi gwi, const Type type, const f_xtor pre_c
   if(gwi->templater.n) {
     const ID_List types = templater_def(gwi->gwion->st, gwi);
     type->e->def = new_class_def(gwi->gwion->mp, 0, insert_symbol(gwi->gwion->st, type->name), NULL, NULL, loc_cpy(gwi->gwion->mp, gwi->loc));
-    type->e->def->tmpl = new_tmpl_class(gwi->gwion->mp, types, -1);
+    type->e->def->tmpl = new_tmpl_list(gwi->gwion->mp, types, -1);
     type->e->def->base.type = type;
     SET_FLAG(type, template);
   } else

diff --git a/src/parse/check.c b/src/parse/check.c
index 3e8f8c4ab457b69a414dde6f6aaa864f5fe31d41..83f56484c185909c72d9be33dd5dcae1ce0e9e5e 100644 (file)
--- a/src/parse/check.c
+++ b/src/parse/check.c
@@ -1180,7 +1180,7 @@ ANN static inline void inherit(const Type t) {
 }
 
 ANN m_bool check_class_def(const Env env, const Class_Def cdef) {
-  if(tmpl_class_base(cdef->tmpl))
+  if(tmpl_list_base(cdef->tmpl))
     return GW_OK;
   const Type type = cdef->base.type;
    if(type->e->parent == t_undefined) {

diff --git a/src/parse/scan1.c b/src/parse/scan1.c
index ee1069e35c5cb46cc13d919771316a6c06b5dab5..e4d9c29fc7029192eea5b6b3d93db35c9e49b0a5 100644 (file)
--- a/src/parse/scan1.c
+++ b/src/parse/scan1.c
@@ -338,7 +338,7 @@ ANN static m_bool scan1_class_parent(const Env env, const Class_Def cdef) {
 ANN m_bool scan1_class_def(const Env env, const Class_Def cdef) {
   if(!cdef->base.type)
     CHECK_BB(scan0_class_def(env, cdef))
-  if(tmpl_class_base(cdef->tmpl))
+  if(tmpl_list_base(cdef->tmpl))
     return GW_OK;
   if(cdef->base.ext)
     CHECK_BB(scan1_class_parent(env, cdef))

diff --git a/src/parse/scan2.c b/src/parse/scan2.c
index bc4981a02afa1f8e2477de5ca449943a3ca664e0..538d20ade8d9fb840fe2a14ca008af808968f377 100644 (file)
--- a/src/parse/scan2.c
+++ b/src/parse/scan2.c
@@ -549,7 +549,7 @@ ANN static m_bool scan2_class_parent(const Env env, const Class_Def cdef) {
 }
 
 ANN m_bool scan2_class_def(const Env env, const Class_Def cdef) {
-  if(tmpl_class_base(cdef->tmpl))
+  if(tmpl_list_base(cdef->tmpl))
     return GW_OK;
   if(cdef->base.ext)
     CHECK_BB(scan2_class_parent(env, cdef))

diff --git a/src/parse/template.c b/src/parse/template.c
index aff4b2939a4a151ec28b329623c407f9bc3447ee..26ba90fc0f6c0d9a6f089f08dd45bc29c091ee33 100644 (file)
--- a/src/parse/template.c
+++ b/src/parse/template.c
@@ -155,7 +155,7 @@ ANN Type scan_type(const Env env, const Type t, const Type_Decl* type) {
     SET_FLAG(a, ref);
     if(a->base.type)
       return a->base.type;
-    a->tmpl = new_tmpl_class(env->gwion->mp, get_total_type_list(env, t), 0);
+    a->tmpl = new_tmpl_list(env->gwion->mp, get_total_type_list(env, t), 0);
     a->tmpl->call = type->types;
 
     CHECK_BO(scan0_class_def(env, a))