From 2a27fd4fc13053a3261caa5b69c012b08420318a Mon Sep 17 00:00:00 2001
From: Aoran Zeng <ccmywish@qq.com>
Date: Wed, 16 Jul 2025 20:51:08 +0800
Subject: [PATCH] Move `name` config value into Config

---
 tool/rawstr4c/lib/Config.rakumod    | 14 ++++++++++++--
 tool/rawstr4c/lib/Generator.rakumod | 10 +---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tool/rawstr4c/lib/Config.rakumod b/tool/rawstr4c/lib/Config.rakumod
index e3b3843..bb8359d 100644
--- a/tool/rawstr4c/lib/Config.rakumod
+++ b/tool/rawstr4c/lib/Config.rakumod
@@ -99,9 +99,19 @@ class SectionConfig {
     return self.get-direct-config('language');
   }
 
-  #| RS4C-String 或 RS4C-Nil
+  #| RS4C-String
   method name() {
-    return self.get-direct-config('name');
+    # RS4C-String 或 RS4C-Nil
+    my $config-name = self.get-direct-config('name');
+
+    my $name;
+
+    if $config-name.is-nil {
+      $name = $.section.title.lc
+    } else {
+      $name = $config-name.string-value;
+    }
+    return Parser::ConfigItem's-Value.new($name);
   }
 
   #| RS4C-Bool
diff --git a/tool/rawstr4c/lib/Generator.rakumod b/tool/rawstr4c/lib/Generator.rakumod
index b157fd3..3aa8233 100644
--- a/tool/rawstr4c/lib/Generator.rakumod
+++ b/tool/rawstr4c/lib/Generator.rakumod
@@ -76,15 +76,7 @@ my class CVariableNameGenerator {
     my $keep-prefix = $config.keep-prefix.bool-value;
     my $keep-postfix = $config.keep-postfix.bool-value;
 
-    my $config-name = $config.name;
-    my $name;
-
-    if $config-name.is-nil() {
-      $name = $section.title.lc
-    } else {
-      $name = $config-name.string-value;
-    }
-
+    my $name = $config.name.string-value;
     my $namespace = $config.namespace.string-value;
     my $name-literally = $config.name-literally.bool-value;