:art: Improve import again

diff --git a/src/lib/import.c b/src/lib/import.c
index 0b3fb10c388a9cc334a508f23ec417c635cfe416..2eda223f0c35785f3f3c11fa4324feb5a9bafbc2 100644 (file)
--- a/src/lib/import.c
+++ b/src/lib/import.c
@@ -392,11 +392,11 @@ tl_xxx(close, '>', --)
 ANN Type_List str2tl(const Env env, const m_str s, const loc_t pos) {
   struct GetTl gtl = { .str=s, .sz = strlen(s) };
   for(m_uint i = 0; i < gtl.sz; ++i) {
-    if(s[i] == '<' && !gtl.lvl)
+    if(s[i] == '<')
       CHECK_BO(tl_open(&gtl, ++i))
-    if(s[i] == '~' && !gtl.lvl)
+    else if(s[i] == '~')
       CHECK_BO(tl_close(&gtl, ++i))
-    if(s[i] == ',' && !gtl.lvl)
+    else if(s[i] == ',' && !gtl.lvl)
       return tlnext(env, s, i, pos);
   }
   return _str2tl(env, s, pos);
@@ -408,7 +408,7 @@ ANN Type_Decl* str2decl(const Env env, const m_str s, m_uint *depth, const loc_t
   Type_Decl* td = new_type_decl(env->gwion->mp, id);
   const m_str tl_name = get_type_name(env, s, 1);
   if(tl_name) {
-    if(!(td->types = str2tl(env, type_name, pos)) || !type_decl_resolve(env, td)) {
+    if(!(td->types = str2tl(env, tl_name, pos)) || !type_decl_resolve(env, td)) {
       free_type_decl(env->gwion->mp, td);
       return NULL;
     }

diff --git a/tests/import/class_template.c b/tests/import/class_template.c
index fa6afa6722ef6e36670f3123f582205c15798a6e..e532daa58c8d863347025d0df6976fa05b799eb7 100644 (file)
--- a/tests/import/class_template.c
+++ b/tests/import/class_template.c
@@ -34,13 +34,13 @@ GWION_IMPORT(class_template) {
   GWI_OB((t_class_template = gwi_mk_type(gwi, "ClassTemplate", SZ_INT, "Object")))
   GWI_BB(gwi_class_ini(gwi, t_class_template, class_template_ctor, NULL))
   gwi_tmpl_end(gwi);
-  GWI_BB(gwi_item_ini(gwi, "A[]", "key"))
+    GWI_BB(gwi_item_ini(gwi, "A[]", "key"))
     GWI_BB((o_map_key = gwi_item_end(gwi, ae_flag_member | ae_flag_template, NULL)))
     GWI_BB(gwi_item_ini(gwi, "B[]", "value"))
     GWI_BB((o_map_value = gwi_item_end(gwi, ae_flag_member, NULL)))
   GWI_BB(gwi_class_end(gwi))
 
-  GWI_BB(gwi_item_ini(gwi, "ClassTemplate<~Ptr<~int~>,int~>", "testObject"))
+  GWI_BB(gwi_item_ini(gwi, "ClassTemplate<~Ptr<~int~>,int[]~>", "testObject"))
   GWI_BB(gwi_item_end(gwi, ae_flag_none, NULL))
   return GW_OK;
 }