From 9e4fa2863541204c75ccf2c251065d370b14b303 Mon Sep 17 00:00:00 2001
From: Vadim Belman <vrurg@lflat.org>
Date: Sat, 11 Feb 2023 18:25:32 -0500
Subject: [PATCH] Fix serialization issues with Version

Attempt to declare a class starting with `Version::` was causing 'Object
does not exist in serialization context' error. Turning class
declaration into a lexical (`my` was missing) and making pre-declared
constants lexicals fix the problem.
---
 src/core.c/Version.pm6 | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/core.c/Version.pm6 b/src/core.c/Version.pm6
index 2c8b0330008..c40ee5aa280 100644
--- a/src/core.c/Version.pm6
+++ b/src/core.c/Version.pm6
@@ -1,19 +1,18 @@
-# class Version {
-#     has $!parts;
-#     has int $!plus;
-#     has int $!whatever;
-#     has str $!string;
-# }
+my class Version {
+    # class Version {
+    #     has $!parts;
+    #     has int $!plus;
+    #     has int $!whatever;
+    #     has str $!string;
+    # }
 
-class Version {
-
-    constant $v  = do {
+    my constant $v  = do {
         my $version := nqp::create(Version);
         nqp::bindattr(  $version,Version,'$!parts', nqp::list());
         nqp::bindattr_s($version,Version,'$!string',"");
         $version
     }
-    constant $vw = do {
+    my constant $vw = do {
         my $version := nqp::create(Version);
         nqp::bindattr(  $version,Version,'$!parts',   nqp::list(*));
         nqp::bindattr_i($version,Version,'$!plus',   -1);
@@ -21,31 +20,31 @@ class Version {
         nqp::bindattr_s($version,Version,'$!string', "*");
         $version
     }
-    constant $v6  = do {
+    my constant $v6  = do {
         my $version := nqp::create(Version);
         nqp::bindattr(  $version,Version,'$!parts', nqp::list(6));
         nqp::bindattr_s($version,Version,'$!string',"6");
         $version
     }
-    constant $v6c = do {
+    my constant $v6c = do {
         my $version := nqp::create(Version);
         nqp::bindattr(  $version,Version,'$!parts', nqp::list(6,"c"));
         nqp::bindattr_s($version,Version,'$!string',"6.c");
         $version
     }
-    constant $v6d = do {
+    my constant $v6d = do {
         my $version := nqp::create(Version);
         nqp::bindattr(  $version,Version,'$!parts', nqp::list(6,"d"));
         nqp::bindattr_s($version,Version,'$!string',"6.d");
         $version
     }
-    constant $v6e = do {
+    my constant $v6e = do {
         my $version := nqp::create(Version);
         nqp::bindattr(  $version,Version,'$!parts', nqp::list(6,"e","PREVIEW"));
         nqp::bindattr_s($version,Version,'$!string',"6.e.PREVIEW");
         $version
     }
-    constant $vplus = do {
+    my constant $vplus = do {
         my $version := nqp::create(Version);
         nqp::bindattr(  $version,Version,'$!parts', nqp::list);
         nqp::bindattr_i($version,Version,'$!plus',  1);