Skip to content

Commit 7a79232

Browse files
schmoukschmouk
authored
Merge pull request #221 from schmouk/tests
Tests branch
2 parents cfdb448 + 19d3913 commit 7a79232

File tree

9 files changed

+7052
-547
lines changed

9 files changed

+7052
-547
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@
3434
# Visual Studio specifics
3535
.vs
3636
x64
37+
Debug
38+
Release
39+
40+
# CppStrings specifics
41+
archive

‎cpp-strings-tests/cpp-strings-tests.cpp‎

Lines changed: 5695 additions & 0 deletions
Large diffs are not rendered by default.

‎cpp-strings-tests/cpp-strings-tests.vcxproj‎

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>17.0</VCProjectVersion>
23+
<ProjectGuid>{3B180A14-A496-4E9D-8D9B-57D871C8E005}</ProjectGuid>
24+
<Keyword>Win32Proj</Keyword>
25+
<RootNamespace>cppstringstests</RootNamespace>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
27+
<ProjectSubType>NativeUnitTestProject</ProjectSubType>
28+
</PropertyGroup>
29+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
31+
<ConfigurationType>DynamicLibrary</ConfigurationType>
32+
<UseDebugLibraries>true</UseDebugLibraries>
33+
<PlatformToolset>v143</PlatformToolset>
34+
<CharacterSet>Unicode</CharacterSet>
35+
<UseOfMfc>false</UseOfMfc>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38+
<ConfigurationType>DynamicLibrary</ConfigurationType>
39+
<UseDebugLibraries>false</UseDebugLibraries>
40+
<PlatformToolset>v143</PlatformToolset>
41+
<WholeProgramOptimization>true</WholeProgramOptimization>
42+
<CharacterSet>Unicode</CharacterSet>
43+
<UseOfMfc>false</UseOfMfc>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
46+
<ConfigurationType>DynamicLibrary</ConfigurationType>
47+
<UseDebugLibraries>true</UseDebugLibraries>
48+
<PlatformToolset>v143</PlatformToolset>
49+
<CharacterSet>Unicode</CharacterSet>
50+
<UseOfMfc>false</UseOfMfc>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
53+
<ConfigurationType>DynamicLibrary</ConfigurationType>
54+
<UseDebugLibraries>false</UseDebugLibraries>
55+
<PlatformToolset>v143</PlatformToolset>
56+
<WholeProgramOptimization>true</WholeProgramOptimization>
57+
<CharacterSet>Unicode</CharacterSet>
58+
<UseOfMfc>false</UseOfMfc>
59+
</PropertyGroup>
60+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
61+
<ImportGroup Label="ExtensionSettings">
62+
</ImportGroup>
63+
<ImportGroup Label="Shared">
64+
</ImportGroup>
65+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
</ImportGroup>
68+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
69+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70+
</ImportGroup>
71+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
72+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
73+
</ImportGroup>
74+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
75+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
76+
</ImportGroup>
77+
<PropertyGroup Label="UserMacros" />
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
79+
<LinkIncremental>true</LinkIncremental>
80+
</PropertyGroup>
81+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
82+
<LinkIncremental>true</LinkIncremental>
83+
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
85+
<LinkIncremental>false</LinkIncremental>
86+
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
88+
<LinkIncremental>false</LinkIncremental>
89+
</PropertyGroup>
90+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
91+
<ClCompile>
92+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
93+
<WarningLevel>Level3</WarningLevel>
94+
<SDLCheck>true</SDLCheck>
95+
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(ProjectDir)..\cpp-strings</AdditionalIncludeDirectories>
96+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97+
<UseFullPaths>true</UseFullPaths>
98+
<PrecompiledHeaderFile>
99+
</PrecompiledHeaderFile>
100+
<LanguageStandard>stdcpplatest</LanguageStandard>
101+
<LanguageStandard_C>stdclatest</LanguageStandard_C>
102+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
103+
<EnableModules>false</EnableModules>
104+
<PrecompiledHeaderOutputFile />
105+
</ClCompile>
106+
<Link>
107+
<SubSystem>Windows</SubSystem>
108+
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
109+
</Link>
110+
</ItemDefinitionGroup>
111+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
112+
<ClCompile>
113+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
114+
<WarningLevel>Level3</WarningLevel>
115+
<SDLCheck>true</SDLCheck>
116+
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(ProjectDir)..\cpp-strings</AdditionalIncludeDirectories>
117+
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<UseFullPaths>true</UseFullPaths>
119+
<PrecompiledHeaderFile>
120+
</PrecompiledHeaderFile>
121+
<LanguageStandard>stdcpplatest</LanguageStandard>
122+
<LanguageStandard_C>stdclatest</LanguageStandard_C>
123+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
124+
<EnableModules>false</EnableModules>
125+
<PrecompiledHeaderOutputFile />
126+
</ClCompile>
127+
<Link>
128+
<SubSystem>Windows</SubSystem>
129+
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
130+
</Link>
131+
</ItemDefinitionGroup>
132+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
133+
<ClCompile>
134+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
135+
<WarningLevel>Level3</WarningLevel>
136+
<FunctionLevelLinking>true</FunctionLevelLinking>
137+
<IntrinsicFunctions>true</IntrinsicFunctions>
138+
<SDLCheck>true</SDLCheck>
139+
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(ProjectDir)..\cpp-strings</AdditionalIncludeDirectories>
140+
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141+
<UseFullPaths>true</UseFullPaths>
142+
<PrecompiledHeaderFile>
143+
</PrecompiledHeaderFile>
144+
<LanguageStandard>stdcpplatest</LanguageStandard>
145+
<LanguageStandard_C>stdclatest</LanguageStandard_C>
146+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
147+
<EnableModules>false</EnableModules>
148+
<PrecompiledHeaderOutputFile />
149+
</ClCompile>
150+
<Link>
151+
<SubSystem>Windows</SubSystem>
152+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
153+
<OptimizeReferences>true</OptimizeReferences>
154+
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155+
</Link>
156+
</ItemDefinitionGroup>
157+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
158+
<ClCompile>
159+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
160+
<WarningLevel>Level3</WarningLevel>
161+
<FunctionLevelLinking>true</FunctionLevelLinking>
162+
<IntrinsicFunctions>true</IntrinsicFunctions>
163+
<SDLCheck>true</SDLCheck>
164+
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(ProjectDir)..\cpp-strings</AdditionalIncludeDirectories>
165+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166+
<UseFullPaths>true</UseFullPaths>
167+
<PrecompiledHeaderFile>
168+
</PrecompiledHeaderFile>
169+
<LanguageStandard>stdcpplatest</LanguageStandard>
170+
<LanguageStandard_C>stdclatest</LanguageStandard_C>
171+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
172+
<EnableModules>false</EnableModules>
173+
<PrecompiledHeaderOutputFile />
174+
</ClCompile>
175+
<Link>
176+
<SubSystem>Windows</SubSystem>
177+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
178+
<OptimizeReferences>true</OptimizeReferences>
179+
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
180+
</Link>
181+
</ItemDefinitionGroup>
182+
<ItemGroup>
183+
<ClCompile Include="cpp-strings-tests.cpp" />
184+
</ItemGroup>
185+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
186+
<ImportGroup Label="ExtensionTargets">
187+
</ImportGroup>
188+
</Project>

‎cpp-strings-tests/cpp-strings-tests.vcxproj.filters‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClCompile Include="cpp-strings-tests.cpp">
19+
<Filter>Source Files</Filter>
20+
</ClCompile>
21+
</ItemGroup>
22+
</Project>

‎cpp-strings-tests/cpp-strings-tests.vcxproj.user‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ShowAllFiles>true</ShowAllFiles>
5+
</PropertyGroup>
6+
</Project>

‎cpp-strings/cpp-strings.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.5.33414.496
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-strings", "cpp-strings.vcxproj", "{520980FD-2242-443E-89DB-B8E41D9606B5}"
77
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-strings-tests", "..\cpp-strings-tests\cpp-strings-tests.vcxproj", "{3B180A14-A496-4E9D-8D9B-57D871C8E005}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|x64 = Debug|x64
@@ -21,6 +23,14 @@ Global
2123
{520980FD-2242-443E-89DB-B8E41D9606B5}.Release|x64.Build.0 = Release|x64
2224
{520980FD-2242-443E-89DB-B8E41D9606B5}.Release|x86.ActiveCfg = Release|Win32
2325
{520980FD-2242-443E-89DB-B8E41D9606B5}.Release|x86.Build.0 = Release|Win32
26+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Debug|x64.ActiveCfg = Debug|x64
27+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Debug|x64.Build.0 = Debug|x64
28+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Debug|x86.ActiveCfg = Debug|Win32
29+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Debug|x86.Build.0 = Debug|Win32
30+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Release|x64.ActiveCfg = Release|x64
31+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Release|x64.Build.0 = Release|x64
32+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Release|x86.ActiveCfg = Release|Win32
33+
{3B180A14-A496-4E9D-8D9B-57D871C8E005}.Release|x86.Build.0 = Release|Win32
2434
EndGlobalSection
2535
GlobalSection(SolutionProperties) = preSolution
2636
HideSolutionNode = FALSE

‎cpp-strings/cpp-strings.vcxproj‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
<SDLCheck>true</SDLCheck>
7777
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7878
<ConformanceMode>true</ConformanceMode>
79+
<LanguageStandard>stdcpp20</LanguageStandard>
80+
<LanguageStandard_C>stdc17</LanguageStandard_C>
81+
<EnableModules>false</EnableModules>
7982
</ClCompile>
8083
<Link>
8184
<SubSystem>Console</SubSystem>
@@ -90,6 +93,9 @@
9093
<SDLCheck>true</SDLCheck>
9194
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9295
<ConformanceMode>true</ConformanceMode>
96+
<LanguageStandard>stdcpp20</LanguageStandard>
97+
<LanguageStandard_C>stdc17</LanguageStandard_C>
98+
<EnableModules>false</EnableModules>
9399
</ClCompile>
94100
<Link>
95101
<SubSystem>Console</SubSystem>
@@ -104,9 +110,10 @@
104110
<SDLCheck>true</SDLCheck>
105111
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106112
<ConformanceMode>true</ConformanceMode>
107-
<LanguageStandard>stdcpplatest</LanguageStandard>
113+
<LanguageStandard>stdcpp20</LanguageStandard>
108114
<LanguageStandard_C>stdc17</LanguageStandard_C>
109-
<EnableModules>true</EnableModules>
115+
<EnableModules>false</EnableModules>
116+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
110117
</ClCompile>
111118
<Link>
112119
<SubSystem>Console</SubSystem>
@@ -121,9 +128,10 @@
121128
<SDLCheck>true</SDLCheck>
122129
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123130
<ConformanceMode>true</ConformanceMode>
124-
<LanguageStandard>stdcpplatest</LanguageStandard>
131+
<LanguageStandard>stdcpp20</LanguageStandard>
125132
<LanguageStandard_C>stdc17</LanguageStandard_C>
126-
<EnableModules>true</EnableModules>
133+
<EnableModules>false</EnableModules>
134+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
127135
</ClCompile>
128136
<Link>
129137
<SubSystem>Console</SubSystem>
@@ -136,6 +144,7 @@
136144
<ClCompile Include="cppstrings.cpp" />
137145
</ItemGroup>
138146
<ItemGroup>
147+
<ClInclude Include="archive\cppstrings.h" />
139148
<ClInclude Include="cppstrings.h" />
140149
</ItemGroup>
141150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎cpp-strings/cppstrings.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Library cppstrings
33
"What if c++ strings where as easy to use as Python strings?"
44
5-
Copyright (C) 2023 Philippe Schmouker
5+
Copyright (C) 2023-2025 Philippe Schmouker
66
contact - ph (dot) schmouker (at) gmail (dot) com
77
88
This program is free software: you can redistribute it and/or modify
@@ -29,11 +29,17 @@ using namespace pcs;
2929
*/
3030
int main()
3131
{
32-
CppString s = "-5.1";
33-
CppWString ws{ L"-5.2"cs };
32+
CppString s = "-5.1"_cs;
33+
CppWString ws{ L"-5.2"_cs };
3434

3535
std::cout << ws.isupper() << std::endl;
3636
std::cout << s.zfill(10).c_str() << std::endl;
3737

38+
s.format("{} {}", 1, 3.14);
39+
ws.format(L"{} abc", 2);
40+
41+
std::cout << s.c_str() << " / ";
42+
std::wcout << ws.c_str() << std::endl;
43+
3844
return 0;
3945
}

0 commit comments

Comments
 (0)