diff --git a/tool/rawstr4c/bin/rawstr4c b/tool/rawstr4c/bin/rawstr4c index ea3921d..fc7fafb 100644 --- a/tool/rawstr4c/bin/rawstr4c +++ b/tool/rawstr4c/bin/rawstr4c @@ -14,13 +14,13 @@ # Raw strings for the C programming language # --------------------------------------------------------------- -use Parser; -use Generator; -use Version; +use Rawstr4c::Parser; +use Rawstr4c::Generator; +use Rawstr4c::Version; sub USAGE() { print qq:to/END/; - rawstr4c: Raw String for C (GPLv3+) v{Version::VERSION}-{Version::RELEASE_DATE} + rawstr4c: Raw String for C (GPLv3+) v{Rawstr4c::Version::VERSION}-{Rawstr4c::Version::RELEASE_DATE} Usage: rawstr4c [options] diff --git a/tool/rawstr4c/lib/Config.rakumod b/tool/rawstr4c/lib/Rawstr4c/Config.rakumod similarity index 97% rename from tool/rawstr4c/lib/Config.rakumod rename to tool/rawstr4c/lib/Rawstr4c/Config.rakumod index 890e6db..8f3bc03 100644 --- a/tool/rawstr4c/lib/Config.rakumod +++ b/tool/rawstr4c/lib/Rawstr4c/Config.rakumod @@ -10,14 +10,14 @@ # Represent a section's working configuration # --------------------------------------------------------------- -use Parser; +use Rawstr4c::Parser; -unit module Config; +unit module Rawstr4c::Config; #| 一个 section 的配置 (基于层次化结构而形成的最终真正生效的配置) class SectionConfig { - has Parser::Section $.section; + has Rawstr4c::Parser::Section $.section; method new($section) { self.bless(:$section); diff --git a/tool/rawstr4c/lib/Generator.rakumod b/tool/rawstr4c/lib/Rawstr4c/Generator.rakumod similarity index 95% rename from tool/rawstr4c/lib/Generator.rakumod rename to tool/rawstr4c/lib/Rawstr4c/Generator.rakumod index 2dfb20a..76c1472 100644 --- a/tool/rawstr4c/lib/Generator.rakumod +++ b/tool/rawstr4c/lib/Rawstr4c/Generator.rakumod @@ -10,11 +10,11 @@ # Generates C code from rawstr4c configuration # --------------------------------------------------------------- -unit module Generator; +unit module Rawstr4c::Generator; -use Parser; -use Config; -use Version; +use Rawstr4c::Parser; +use Rawstr4c::Config; +use Rawstr4c::Version; my class CStringConverter { @@ -198,11 +198,11 @@ my class CVariableGenerator { class Generator { - has Bool $!enable-debug = False; # 是否启用调试模式 - has Parser::Parser $.parser; - has CStringConverter $.string-converter; - has CVariableNameGenerator $.varname-generator; - has CVariableGenerator $.variable-generator; + has Bool $!enable-debug = False; # 是否启用调试模式 + has Rawstr4c::Parser::Parser $.parser; + has CStringConverter $.string-converter; + has CVariableNameGenerator $.varname-generator; + has CVariableGenerator $.variable-generator; method new($parser) { self.bless( diff --git a/tool/rawstr4c/lib/Parser.rakumod b/tool/rawstr4c/lib/Rawstr4c/Parser.rakumod similarity index 99% rename from tool/rawstr4c/lib/Parser.rakumod rename to tool/rawstr4c/lib/Rawstr4c/Parser.rakumod index 3747aab..f01f621 100644 --- a/tool/rawstr4c/lib/Parser.rakumod +++ b/tool/rawstr4c/lib/Rawstr4c/Parser.rakumod @@ -10,7 +10,7 @@ # rawstr4c.md parsing # --------------------------------------------------------------- -unit module Parser; +unit module Rawstr4c::Parser; #| 不能用 Bool,只能用 Boolean my enum ConfigItem's-ValueType < RS4C-Nil RS4C-String RS4C-Mode RS4C-Bool>; diff --git a/tool/rawstr4c/lib/Version.rakumod b/tool/rawstr4c/lib/Rawstr4c/Version.rakumod similarity index 97% rename from tool/rawstr4c/lib/Version.rakumod rename to tool/rawstr4c/lib/Rawstr4c/Version.rakumod index 622e391..ff79ca3 100644 --- a/tool/rawstr4c/lib/Version.rakumod +++ b/tool/rawstr4c/lib/Rawstr4c/Version.rakumod @@ -8,7 +8,7 @@ # Last Modified : <2025-07-16> # --------------------------------------------------------------- -unit module Version; +unit module Rawstr4c::Version; constant VERSION = "0.2.1.0"; constant RELEASE_DATE = "2025/07/16";