:art: Fix Ptr

diff --git a/src/lib/ptr.c b/src/lib/ptr.c
index fd8188cab760fc85b54d54b0c399006f9cbcf28d..9b9657dc824555e4e56441eb00574e33bd814b0a 100644 (file)
--- a/src/lib/ptr.c
+++ b/src/lib/ptr.c
@@ -45,7 +45,7 @@ static OP_EMIT(opem_ptr_assign) {
 
 static OP_CHECK(opck_ptr_deref) {
   const Exp_Unary* unary = (Exp_Unary*)data;
-  return exp_self(unary)->type = nspc_lookup_type1(unary->exp->type->e->owner, insert_symbol(get_type_name(env, unary->exp->type->name, 1)));
+  return exp_self(unary)->type = nspc_lookup_type1(env->curr, insert_symbol(get_type_name(env, unary->exp->type->name, 1)));
 }
 
 static OP_CHECK(opck_ptr_cast) {

diff --git a/src/oo/type.c b/src/oo/type.c
index 7b5b3b5aba42ca960b42aa2ccddda54e71a8d4ff..d9a03f1b306986678ece1c97f6593bf51504ca24 100644 (file)
--- a/src/oo/type.c
+++ b/src/oo/type.c
@@ -171,14 +171,11 @@ ANN m_str get_type_name(const Env env, const m_str s, const m_uint index) {
   ++name;
   while(*name++) {
     if(*name == '<') {
+      c[i++] = *name;
       lvl++;
       name++;
     } else if(*name == '~' && !lvl--)
       break;
-    if(*name == ',' && !lvl) {
-      ++name;
-      ++n;
-    }
     if(n == index)
       c[i++] = *name;
   }