Move some calls to "is_astype"

ponylang · Jan 18, 2025 · 10254a5 · 10254a5
1 parent 9749420
commit 10254a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/libponyc/codegen/gentrace.c b/src/libponyc/codegen/gentrace.c
@@ -546,7 +546,7 @@ static int trace_cap_nominal(pass_opt_t* opt, ast_t* type, ast_t* orig,
   // val and tag in that order.
   if(orig_cap == TK_ISO)
   {
-    if(is_matchtype(orig, type, NULL, opt) == MATCHTYPE_ACCEPT)
+    if(is_astype(orig, type, NULL, opt) == MATCHTYPE_ACCEPT)
     {
       return PONY_TRACE_MUTABLE;
     } else {
@@ -556,7 +556,7 @@ static int trace_cap_nominal(pass_opt_t* opt, ast_t* type, ast_t* orig,
 
   if(ast_id(cap) == TK_VAL)
   {
-    if(is_matchtype(orig, type, NULL, opt) == MATCHTYPE_ACCEPT)
+    if(is_astype(orig, type, NULL, opt) == MATCHTYPE_ACCEPT)
     {
       ast_setid(cap, orig_cap);
       return PONY_TRACE_IMMUTABLE;
@@ -568,7 +568,7 @@ static int trace_cap_nominal(pass_opt_t* opt, ast_t* type, ast_t* orig,
   pony_assert(ast_id(cap) == TK_TAG);
 
   int ret = -1;
-  if(is_matchtype(orig, type, NULL, opt) == MATCHTYPE_ACCEPT)
+  if(is_astype(orig, type, NULL, opt) == MATCHTYPE_ACCEPT)
     ret = PONY_TRACE_OPAQUE;
 
   ast_setid(cap, orig_cap);

diff --git a/src/libponyc/type/matchtype.c b/src/libponyc/type/matchtype.c
@@ -600,6 +600,7 @@ static matchtype_t is_nominal_match_entity(ast_t* operand, ast_t* pattern,
     }
     else
     {
+      printf("----> o_cap: %d, o_eph: %d, p_cap: %d, p_eph: %d\n", ast_id(o_cap), ast_id(o_eph), ast_id(p_cap), ast_id(p_eph));
       printf("----> errorf is NULL\n");
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         else
         {
+          printf("----> o_cap: %d, o_eph: %d, p_cap: %d, p_eph: %d\n", ast_id(o_cap), ast_id(o_eph), ast_id(p_cap), ast_id(p_eph));
           printf("----> errorf is NULL\n");
         }
@@ Expand Down @@