Make Metamodel::Native(Ref)HOW consistent

With regards to the .(sub)method_table methods. Also make sure we create these return values at compile time.
rakudo · Mar 20, 2024 · 85b65a9 · 85b65a9
1 parent 6945637
commit 85b65a9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/Perl6/Metamodel/NativeHOW.nqp b/src/Perl6/Metamodel/NativeHOW.nqp
@@ -84,14 +84,15 @@ class Perl6::Metamodel::NativeHOW
     method unsigned(  $XXX?) { $!unsigned   }
     method nativesize($XXX?) { $!nativesize }
 
-    method method_table($XXX?) {
-        nqp::hash('new',
-          nqp::getstaticcode(sub (*@_, *%_) {
-            nqp::die('Cannot instantiate a native type')
-          }))
-    }
+    my constant METHOD_TABLE := nqp::hash('new',
+      nqp::getstaticcode(sub (*@_, *%_) {
+        nqp::die('Cannot instantiate a native type')
+      })
+    );
+    my constant SUBMETHOD_TABLE := nqp::hash;
 
-    method submethod_table($XXX?) { nqp::hash }
+    method method_table(   $XXX?) { METHOD_TABLE    }
+    method submethod_table($XXX?) { SUBMETHOD_TABLE }
 }
 
 # vim: expandtab sw=4
diff --git a/src/Perl6/Metamodel/NativeRefHOW.nqp b/src/Perl6/Metamodel/NativeRefHOW.nqp
@@ -55,8 +55,15 @@ class Perl6::Metamodel::NativeRefHOW
     method native_type($XXX?) { $!type    }
     method ref_kind($XXX?)    { $!refkind }
 
-    method method_table($XXX?)    { nqp::hash }
-    method submethod_table($XXX?) { nqp::hash }
+    my constant METHOD_TABLE := nqp::hash('new',
+      nqp::getstaticcode(sub (*@_, *%_) {
+        nqp::die('Cannot instantiate a native reference type')
+      })
+    );
+    my constant SUBMETHOD_TABLE := nqp::hash;
+
+    method method_table(   $XXX?) { METHOD_TABLE    }
+    method submethod_table($XXX?) { SUBMETHOD_TABLE }
 }
 
 # vim: expandtab sw=4