https://gitlab.com/saalen/astyle/-/issues/36 fixed addition of closing brace within statement blocks

Master

See merge request saalen/astyle!7

.gitignore

@@ -7,4 +7,4 @@ AStyleTest/file-py/*.tmp
 AStyleTest/file-py/*.pyc
 AStyleTest/file-py/test-diff.txt
 AStyleTest/file-py/test.txt
-
+AStyle/src/.idea/

.gitlab-ci.yml

@@ -0,0 +1,17 @@
+# Specify the docker image to use (only used if using docker runners)
+# See: http://doc.gitlab.com/ee/ci/docker/using_docker_images.html
+image: debian:stable-slim
+
+# Define commands that run before each job's script
+before_script:
+  - apt-get update
+  - apt-get install -y make gcc g++ cmake
+
+compile:
+  script:
+    - cd AStyle/
+    - mkdir build_local && cd build_local
+    - cmake .. && make
+    - cd ../../AStyleTest/regression-sh/
+    # Verify that our compiled app works properly with a custom "test" script
+    - bash ./run_tests.sh

AStyle/CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.8)
+cmake_policy(SET CMP0112 OLD)
 project(astyle CXX)
 
 include( build/cmake/Options.cmake REQUIRED )

AStyle/README.md

@@ -3,7 +3,7 @@ Instructions for using Artistic Style are included in the *doc* directory.
 The file **install.html** contains instructions for compiling and
 installing Artistic Style.
 
-The file **astyle.html**' contains information on using Artistic Style.
+The file **astyle.html** contains information on using Artistic Style.
 
 The files **news.html** and **notes.html** contain information on changes
 made to the various releases.

AStyle/build/clang/Makefile

@@ -46,7 +46,7 @@ INSTALL=install -o $(USER) -g $(USER)
 # Library's major version number -- Increment in case of incompatible API
 # change.
 MAJORVER = 3
-# Library's minor version number -- Increment when functionnality is added in a
+# Library's minor version number -- Increment when functionality is added in a
 # backward-compatible manner; reset to 0 when major number changes.
 MINORVER = 2
 # Library's patch version number -- Increment in case of backward-compatible

AStyle/build/cmake/CompilerOptions.cmake

@@ -14,7 +14,7 @@ elseif(NOT WIN32)   # Linux
     endif()
 elseif(MINGW)
     target_compile_options(astyle PRIVATE -Wall -Wextra -fno-rtti -fno-exceptions -std=c++11)
-elseif(BORLAND)     # Release must be explicitely requested for Borland
+elseif(BORLAND)     # Release must be explicitly requested for Borland
     target_compile_options(astyle PRIVATE -q -w -x-)   # Cannot use no-rtti (-RT-)
 endif()
 

AStyle/build/cmake/Options.cmake

@@ -10,7 +10,7 @@ endif()
 
 # Linux Soname Version
 set(MAJORVER 3)
-set(MINORVER 2)
+set(MINORVER 4)
 set(PATCHVER 0)
 set(SOLIBVER ${MAJORVER}.${MINORVER}.${PATCHVER})
 

AStyle/build/gcc/Makefile

@@ -43,7 +43,7 @@ INSTALL=install -o $(USER) -g $(USER)
 # Library's major version number -- Increment in case of incompatible API
 # change.
 MAJORVER = 3
-# Library's minor version number -- Increment when functionnality is added in a
+# Library's minor version number -- Increment when functionality is added in a
 # backward-compatible manner; reset to 0 when major number changes.
 MINORVER = 2
 # Library's patch version number -- Increment in case of backward-compatible

AStyle/build/intel/Makefile

@@ -56,7 +56,7 @@ INSTALL=install -o $(USER) -g $(USER)
 # Library's major version number -- Increment in case of incompatible API
 # change.
 MAJORVER = 3
-# Library's minor version number -- Increment when functionnality is added in a
+# Library's minor version number -- Increment when functionality is added in a
 # backward-compatible manner; reset to 0 when major number changes.
 MINORVER = 2
 # Library's patch version number -- Increment in case of backward-compatible

AStyle/build/vs2022/AStyle 2022.sln

@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28516.95
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle", "AStyle\AStyle.vcxproj", "{24189F85-8CB6-4993-8530-855BD6C8B70A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Static|x64 = Static|x64
+		Static|x86 = Static|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x64.ActiveCfg = Debug|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x64.Build.0 = Debug|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x86.ActiveCfg = Debug|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x86.Build.0 = Debug|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x64.ActiveCfg = Release|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x64.Build.0 = Release|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x86.ActiveCfg = Release|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x86.Build.0 = Release|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x64.ActiveCfg = Static|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x64.Build.0 = Static|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x86.ActiveCfg = Static|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x86.Build.0 = Static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C49A012F-6AB6-4660-B927-2AAF54D082AA}
+	EndGlobalSection
+EndGlobal

AStyle/build/vs2022/AStyle Dll 2022.sln

@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28516.95
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle Dll", "AStyle Dll\AStyle Dll.vcxproj", "{07229666-1841-4021-B206-1A8917985A66}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Static|x64 = Static|x64
+		Static|x86 = Static|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x64.ActiveCfg = Debug|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x64.Build.0 = Debug|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x86.ActiveCfg = Debug|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x86.Build.0 = Debug|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x64.ActiveCfg = Release|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x64.Build.0 = Release|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x86.ActiveCfg = Release|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x86.Build.0 = Release|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x64.ActiveCfg = Static|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x64.Build.0 = Static|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x86.ActiveCfg = Static|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x86.Build.0 = Static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {71D57643-84DD-4750-89C3-6369BEA22324}
+	EndGlobalSection
+EndGlobal

AStyle/build/vs2022/AStyle Dll/AStyle Dll.vcxproj

@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|Win32">
+      <Configuration>Static</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|x64">
+      <Configuration>Static</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{07229666-1841-4021-B206-1A8917985A66}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>AStyleDll</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)debug\</OutDir>
+    <TargetName>AStyle32d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\debug\</OutDir>
+    <TargetName>AStyle32d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+    <TargetName>AStyle32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)binstatic\</OutDir>
+    <TargetName>AStyle32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\bin\</OutDir>
+    <TargetName>AStyle32</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\binstatic\</OutDir>
+    <TargetName>AStyle32</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;ASTYLE_LIB</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalOptions>/EXPORT:AStyleMain=_AStyleMain@16
+/EXPORT:AStyleMainUtf16=_AStyleMainUtf16@16
+/EXPORT:AStyleGetVersion=_AStyleGetVersion@0</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;ASTYLE_LIB</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/EXPORT:AStyleMain=_AStyleMain@16
+/EXPORT:AStyleMainUtf16=_AStyleMainUtf16@16
+/EXPORT:AStyleGetVersion=_AStyleGetVersion@0</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/EXPORT:AStyleMain=_AStyleMain@16
+/EXPORT:AStyleMainUtf16=_AStyleMainUtf16@16
+/EXPORT:AStyleGetVersion=_AStyleGetVersion@0</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp" />
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp" />
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp" />
+    <ClCompile Include="..\..\..\src\ASResource.cpp" />
+    <ClCompile Include="..\..\..\src\astyle_main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\astyle.h" />
+    <ClInclude Include="..\..\..\src\astyle_main.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

AStyle/build/vs2022/AStyle Dll/AStyle Dll.vcxproj.filters

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\astyle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\astyle_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASResource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\astyle_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

AStyle/build/vs2022/AStyle Java 2022.sln

@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28516.95
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle Java", "AStyle Java\AStyle Java.vcxproj", "{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Static|x64 = Static|x64
+		Static|x86 = Static|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x64.ActiveCfg = Debug|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x64.Build.0 = Debug|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x86.ActiveCfg = Debug|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x86.Build.0 = Debug|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x64.ActiveCfg = Release|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x64.Build.0 = Release|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x86.ActiveCfg = Release|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x86.Build.0 = Release|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x64.ActiveCfg = Static|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x64.Build.0 = Static|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x86.ActiveCfg = Static|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x86.Build.0 = Static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A4619C60-3409-478F-B944-70443175BDEB}
+	EndGlobalSection
+EndGlobal

AStyle/build/vs2022/AStyle Java/AStyle Java.vcxproj

@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|Win32">
+      <Configuration>Static</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|x64">
+      <Configuration>Static</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>AStyleJava</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)debug\</OutDir>
+    <TargetName>AStyle32jd</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\debug\</OutDir>
+    <TargetName>AStyle32jd</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+    <TargetName>AStyle32j</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)binstatic\</OutDir>
+    <TargetName>AStyle32j</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\bin\</OutDir>
+    <TargetName>AStyle32j</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\binstatic\</OutDir>
+    <TargetName>AStyle32j</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalOptions>/EXPORT:AStyleMain=_AStyleMain@16
+/EXPORT:AStyleMainUtf16=_AStyleMainUtf16@16
+/EXPORT:AStyleGetVersion=_AStyleGetVersion@0 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_JNI</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32</AdditionalIncludeDirectories>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/EXPORT:AStyleMain=_AStyleMain@16
+/EXPORT:AStyleMainUtf16=_AStyleMainUtf16@16
+/EXPORT:AStyleGetVersion=_AStyleGetVersion@0 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_JNI</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32</AdditionalIncludeDirectories>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/EXPORT:AStyleMain=_AStyleMain@16
+/EXPORT:AStyleMainUtf16=_AStyleMainUtf16@16
+/EXPORT:AStyleGetVersion=_AStyleGetVersion@0 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_JNI</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32</AdditionalIncludeDirectories>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_JNI</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32</AdditionalIncludeDirectories>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp" />
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp" />
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp" />
+    <ClCompile Include="..\..\..\src\ASResource.cpp" />
+    <ClCompile Include="..\..\..\src\astyle_main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\astyle.h" />
+    <ClInclude Include="..\..\..\src\astyle_main.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

AStyle/build/vs2022/AStyle Java/AStyle Java.vcxproj.filters

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\astyle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\astyle_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASResource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\astyle_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

AStyle/build/vs2022/AStyle Lib 2022.sln

@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28516.95
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle Lib", "AStyle Lib\AStyle Lib.vcxproj", "{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Static|x64 = Static|x64
+		Static|x86 = Static|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x64.ActiveCfg = Debug|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x64.Build.0 = Debug|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x86.ActiveCfg = Debug|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x86.Build.0 = Debug|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x64.ActiveCfg = Release|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x64.Build.0 = Release|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x86.ActiveCfg = Release|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x86.Build.0 = Release|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x64.ActiveCfg = Static|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x64.Build.0 = Static|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x86.ActiveCfg = Static|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x86.Build.0 = Static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9A55493F-97EF-4723-B937-B41EBB84F52B}
+	EndGlobalSection
+EndGlobal

AStyle/build/vs2022/AStyle Lib/AStyle Lib.vcxproj

@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|Win32">
+      <Configuration>Static</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|x64">
+      <Configuration>Static</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>AStyleLib</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)debug\</OutDir>
+    <TargetName>AStyleLibd</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\debug\</OutDir>
+    <TargetName>AStyleLibd</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)bin\</OutDir>
+    <TargetName>AStyleLib</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <OutDir>$(SolutionDir)binstatic\</OutDir>
+    <TargetName>AStyleLib</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\bin\</OutDir>
+    <TargetName>AStyleLib</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\binstatic\</OutDir>
+    <TargetName>AStyleLib</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;ASTYLE_LIB;ASTYLE_NO_EXPORT</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;ASTYLE_LIB;ASTYLE_NO_EXPORT</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB;ASTYLE_NO_EXPORT</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB;ASTYLE_NO_EXPORT</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB;ASTYLE_NO_EXPORT</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0;ASTYLE_LIB;ASTYLE_NO_EXPORT</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp" />
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp" />
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp" />
+    <ClCompile Include="..\..\..\src\ASResource.cpp" />
+    <ClCompile Include="..\..\..\src\astyle_main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\astyle.h" />
+    <ClInclude Include="..\..\..\src\astyle_main.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

AStyle/build/vs2022/AStyle Lib/AStyle Lib.vcxproj.filters

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\astyle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\astyle_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASResource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\astyle_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

AStyle/build/vs2022/AStyle/AStyle.vcxproj

@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|Win32">
+      <Configuration>Static</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Static|x64">
+      <Configuration>Static</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{24189F85-8CB6-4993-8530-855BD6C8B70A}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>AStyle</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)debug\</OutDir>
+    <TargetName>AStyled</TargetName>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\debug\</OutDir>
+    <TargetName>AStyled</TargetName>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+    <TargetName>AStyle</TargetName>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)binstatic\</OutDir>
+    <TargetName>AStyle</TargetName>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\bin\</OutDir>
+    <TargetName>AStyle</TargetName>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\binstatic\</OutDir>
+    <TargetName>AStyle</TargetName>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>_DEBUG</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/utf-8</AdditionalOptions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>_DEBUG</PreprocessorDefinitions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/utf-8</AdditionalOptions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0</PreprocessorDefinitions>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OmitFramePointers>true</OmitFramePointers>
+      <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>/utf-8</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0</PreprocessorDefinitions>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>/utf-8</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>/utf-8</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>false</EnablePREfast>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_HAS_EXCEPTIONS=0</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>/utf-8</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp" />
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp" />
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp" />
+    <ClCompile Include="..\..\..\src\ASLocalizer.cpp" />
+    <ClCompile Include="..\..\..\src\ASResource.cpp" />
+    <ClCompile Include="..\..\..\src\astyle_main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\ASLocalizer.h" />
+    <ClInclude Include="..\..\..\src\astyle.h" />
+    <ClInclude Include="..\..\..\src\astyle_main.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

AStyle/build/vs2022/AStyle/AStyle.vcxproj.filters

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\ASBeautifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASEnhancer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASFormatter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASLocalizer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\ASResource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\astyle_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\ASLocalizer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\astyle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\astyle_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

AStyle/build/vs2022/All AStyle 2022.sln

@@ -0,0 +1,79 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28516.95
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle", "AStyle\AStyle.vcxproj", "{24189F85-8CB6-4993-8530-855BD6C8B70A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle Dll", "AStyle Dll\AStyle Dll.vcxproj", "{07229666-1841-4021-B206-1A8917985A66}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle Java", "AStyle Java\AStyle Java.vcxproj", "{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyle Lib", "AStyle Lib\AStyle Lib.vcxproj", "{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Static|x64 = Static|x64
+		Static|x86 = Static|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x64.ActiveCfg = Debug|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x64.Build.0 = Debug|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x86.ActiveCfg = Debug|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Debug|x86.Build.0 = Debug|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x64.ActiveCfg = Release|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x64.Build.0 = Release|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x86.ActiveCfg = Release|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Release|x86.Build.0 = Release|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x64.ActiveCfg = Static|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x64.Build.0 = Static|x64
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x86.ActiveCfg = Static|Win32
+		{24189F85-8CB6-4993-8530-855BD6C8B70A}.Static|x86.Build.0 = Static|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x64.ActiveCfg = Debug|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x64.Build.0 = Debug|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x86.ActiveCfg = Debug|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Debug|x86.Build.0 = Debug|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x64.ActiveCfg = Release|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x64.Build.0 = Release|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x86.ActiveCfg = Release|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Release|x86.Build.0 = Release|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x64.ActiveCfg = Static|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x64.Build.0 = Static|x64
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x86.ActiveCfg = Static|Win32
+		{07229666-1841-4021-B206-1A8917985A66}.Static|x86.Build.0 = Static|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x64.ActiveCfg = Debug|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x64.Build.0 = Debug|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x86.ActiveCfg = Debug|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Debug|x86.Build.0 = Debug|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x64.ActiveCfg = Release|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x64.Build.0 = Release|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x86.ActiveCfg = Release|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Release|x86.Build.0 = Release|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x64.ActiveCfg = Static|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x64.Build.0 = Static|x64
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x86.ActiveCfg = Static|Win32
+		{4EDD4F9E-2088-4FE1-BDED-9357F05305CB}.Static|x86.Build.0 = Static|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x64.ActiveCfg = Debug|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x64.Build.0 = Debug|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x86.ActiveCfg = Debug|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Debug|x86.Build.0 = Debug|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x64.ActiveCfg = Release|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x64.Build.0 = Release|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x86.ActiveCfg = Release|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Release|x86.Build.0 = Release|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x64.ActiveCfg = Static|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x64.Build.0 = Static|x64
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x86.ActiveCfg = Static|Win32
+		{5CBCE435-6123-4FFA-A5C7-B91EA0FAE44E}.Static|x86.Build.0 = Static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {33934F68-90BE-4D0F-B5D0-5EEF8F43412D}
+	EndGlobalSection
+EndGlobal

AStyle/build/xcode/install.sh

@@ -53,7 +53,7 @@ if [ ! -f install.sh ]; then
 	exit 1
 fi
 
-# remove previous documentaion
+# remove previous documentation
 echo $CYAN
 echo "Installing documentation to $SYSCONF_PATH"
 echo -n $YELLOW
@@ -61,12 +61,12 @@ if [ -d $SYSCONF_PATH/html ]; then
 	rm -rf  $SYSCONF_PATH/html
 	result=$?;	check_error
 fi
-# create documentaion install directory
+# create documentation install directory
 if [ ! -d $SYSCONF_PATH/html ]; then
 	$INSTALL -m 755 -d $SYSCONF_PATH/html
 	result=$?;	check_error
 fi
-# copy documentaion
+# copy documentation
 for files in astyle.html \
              install.html \
              news.html \

AStyle/doc/astyle.html

@@ -17,14 +17,16 @@
     <style type="text/css">
         hr { margin-left: -0.4in; }
         /* the following styles are for formatting code samples */
-        div.code { background: #fffdda; padding: 0.5em; border-style: 1px solid;}
+        div.code { background: #fffdda; padding: 0.5em; border: 1px gray solid; border-radius: 5px;}
         /* code */
-        code { color: navy; }
+        code { color: mediumblue; }
         code.title { font-size: larger; font-weight: bold; }
         /* spans */
         span.brace { color: red; }
         span.comment { color: dimgray; font-style: italic; }
         span.option { color: saddlebrown; font-weight: bold; }
+
+        p.contents2 > a { margin-left: 2em; display: list-item;}
     </style>
 
     <!--  When the user scrolls down from the top of the document, show the button -->
@@ -58,164 +60,173 @@
 
     <button onclick="topFunction()" id="topBtn" title="Go to Contents"><b>Top</b></button>
 
-    <h1>Artistic Style 3.2</h1>
+    <h1>Artistic Style 3.4.12</h1>
 
     <h2>
         A Free, Fast, and Small Automatic Formatter<br />
-        for C, C++, C++/CLI, Objective&#8209;C, C#, and Java Source Code
+        for C, C++, C++/CLI, <span style="white-space: nowrap;">Objective-C</span>, C#, and Java Source Code
     </h2>
 
     <h3 id="Contents">Contents</h3>
 
     <p class="contents1">
-        <a class="contents" href="#_General_Information">General&nbsp;Information</a></p>
+        <a   href="#_General_Information">General&nbsp;Information</a></p>
     <p class="contents1">
-        <a class="contents" href="#_Quick_Start">Quick&nbsp;Start</a></p>
+        <a   href="#_Quick_Start">Quick&nbsp;Start</a></p>
     <p class="contents1">
-        <a class="contents" href="#_Usage">Usage</a></p>
+        <a   href="#_Usage">Usage</a></p>
     <p class="contents1">
-        <a class="contents" href="#_Options">Options</a></p>
+        <a   href="#_Options">Options</a></p>
     <p class="contents1">
-        <a class="contents" href="#_Option_Files">Option&nbsp;Files</a></p>
+        <a   href="#_Option_Files">Option&nbsp;Files</a></p>
     <p class="contents1">
-        <a class="contents" href="#_Disable_Formatting">Disable&nbsp;Formatting</a></p>
+        <a   href="#_Disable_Formatting">Disable&nbsp;Formatting</a></p>
     <p class="contents1">
-        <a class="contents" href="#_Basic_Brace_Styles">Basic&nbsp;Brace&nbsp;Styles</a></p>
+        <a   href="#_Basic_Brace_Styles">Basic&nbsp;Brace&nbsp;Styles</a></p>
     <p class="contents1">
-        <a class="contents" href="#_Brace_Style_Options">Brace&nbsp;Style&nbsp;Options</a></p>
+        <a   href="#_Brace_Style_Options">Brace&nbsp;Style&nbsp;Options</a></p>
     <p class="contents2">
-        <a class="contents" href="#_default_brace_style">default&nbsp;brace&nbsp;style</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=allman">style=allman</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=java">style=java</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=kr">style=kr</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=stroustrup">style=stroustrup</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=whitesmith">style=whitesmith</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=vtk">style=vtk</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=ratliff">style=ratliff</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=gnu">style=gnu</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=linux">style=linux</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=horstmann">style=horstmann</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=1tbs">style=1tbs</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=google">style=google</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=mozilla">style=mozilla</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=webkit">style=webkit</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=pico">style=pico</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_style=lisp">style=lisp</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_default_brace_style">default&nbsp;brace&nbsp;style</a>
+        <a class="contents" href="#_style=allman">style=allman</a>
+        <a class="contents" href="#_style=java">style=java</a>
+        <a class="contents" href="#_style=kr">style=kr</a>
+        <a class="contents" href="#_style=stroustrup">style=stroustrup</a>
+        <a class="contents" href="#_style=whitesmith">style=whitesmith</a>
+        <a class="contents" href="#_style=vtk">style=vtk</a>
+        <a class="contents" href="#_style=ratliff">style=ratliff</a>
+        <a class="contents" href="#_style=gnu">style=gnu</a>
+        <a class="contents" href="#_style=linux">style=linux</a>
+        <a class="contents" href="#_style=horstmann">style=horstmann</a>
+        <a class="contents" href="#_style=1tbs">style=1tbs</a>
+        <a class="contents" href="#_style=google">style=google</a>
+        <a class="contents" href="#_style=mozilla">style=mozilla</a>
+        <a class="contents" href="#_style=webkit">style=webkit</a>
+        <a class="contents" href="#_style=pico">style=pico</a>
+        <a class="contents" href="#_style=lisp">style=lisp</a>
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Tab_Options">Tab&nbsp;Options</a></p>
+        <a   href="#_Tab_Options">Tab&nbsp;Options</a></p>
     <p class="contents2">
-        <a class="contents" href="#_default_indent">default&nbsp;indent</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent=spaces">indent=spaces</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent=tab">indent=tab</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent=force-tab">indent=force&#8209;tab</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent=force-tab-x">--indent=force&#8209;tab&#8209;x</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_default_indent">default&nbsp;indent</a>
+        <a class="contents" href="#_indent=spaces">indent=spaces</a>
+        <a class="contents" href="#_indent=tab">indent=tab</a>
+        <a class="contents" href="#_indent=force-tab">indent=force-tab</a>
+        <a class="contents" href="#_indent=force-tab-x">--indent=force-tab-x</a>
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Brace_Modify_Options">Brace&nbsp;Modify&nbsp;Options</a></p>
+        <a  href="#_Brace_Modify_Options">Brace&nbsp;Modify&nbsp;Options</a></p>
     <p class="contents2">
-        <a class="contents" href="#_attach_namespaces">attach&#8209;namespaces</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_attach_classes">attach&#8209;classes</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_attach_inlines">attach&#8209;inlines</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_attach-extern-c">attach&#8209;extern&#8209;c</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_attach-closing-while">attach&#8209;closing&#8209;while</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_attach_namespaces">attach-namespaces</a>
+        <a class="contents" href="#_attach_classes">attach-classes</a>
+        <a class="contents" href="#_attach_inlines">attach-inlines</a>
+        <a class="contents" href="#_attach-extern-c">attach-extern-c</a>
+        <a class="contents" href="#_attach-closing-while">attach-closing-while</a>
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Indentation_Options">Indentation&nbsp;Options</a></p>
+        <a  href="#_Indentation_Options">Indentation&nbsp;Options</a></p>
     <p class="contents2">
-        <a class="contents" href="#_indent-classes">indent&#8209;classes</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-modifiers">indent&#8209;modifiers</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-switches">indent&#8209;switches</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-cases">indent&#8209;cases</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-namespaces">indent&#8209;namespaces</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-after-parens">indent&#8209;after&#8209;parens</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-continuation">indent&#8209;continuation</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-labels">indent&#8209;labels</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-preproc-block">indent&#8209;preproc&#8209;block</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-preproc-define">indent&#8209;preproc&#8209;define</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-preproc-cond">indent&#8209;preproc&#8209;cond</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_indent-col1-comments">indent&#8209;col1&#8209;comments</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_min-conditional-indent">min&#8209;conditional&#8209;indent</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_max-continuation-indent">max&#8209;continuation&#8209;indent</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_indent-classes">indent-classes</a>
+        <a class="contents" href="#_indent-modifiers">indent-modifiers</a>
+        <a class="contents" href="#_indent-switches">indent-switches</a>
+        <a class="contents" href="#_indent-cases">indent-cases</a>
+        <a class="contents" href="#_indent-namespaces">indent-namespaces</a>
+        <a class="contents" href="#_indent-after-parens">indent-after-parens</a>
+        <a class="contents" href="#_indent-continuation">indent-continuation</a>
+        <a class="contents" href="#_indent-labels">indent-labels</a>
+        <a class="contents" href="#_indent-preproc-block">indent-preproc-block</a>
+        <a class="contents" href="#_indent-preproc-define">indent-preproc-define</a>
+        <a class="contents" href="#_indent-preproc-cond">indent-preproc-cond</a>
+        <a class="contents" href="#_indent-col1-comments">indent-col1-comments</a>
+        <a class="contents" href="#_min-conditional-indent">min-conditional-indent</a>
+        <a class="contents" href="#_max-continuation-indent">max-continuation-indent</a>
+        <a class="contents" href="#_lambda_indent">lambda-indent</a>
+
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Padding_Options">Padding&nbsp;Options</a></p>
+        <a href="#_Padding_Options">Padding&nbsp;Options</a></p>
     <p class="contents2">
-        <a class="contents" href="#_break-blocks">break&#8209;blocks</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_break-blocks=all">break&#8209;blocks=all</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-oper">pad&#8209;oper</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-comma">pad&#8209;comma</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-paren">pad&#8209;paren</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-paren-out">pad&#8209;paren&#8209;out</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-first-paren-out">pad&#8209;first&#8209;paren&#8209;out</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-paren-in">pad&#8209;paren&#8209;in</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-header">pad&#8209;header</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_unpad-paren">unpad&#8209;paren</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_delete-empty-lines">delete&#8209;empty&#8209;lines</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_fill-empty-lines">fill&#8209;empty&#8209;lines</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_align-pointer">align&#8209;pointer</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_align-reference">align&#8209;reference</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_break-blocks">break-blocks</a>
+        <a class="contents" href="#_break-blocks=all">break-blocks=all</a>
+        <a class="contents" href="#_pad-oper">pad-oper</a>
+        <a class="contents" href="#_pad-comma">pad-comma</a>
+        <a class="contents" href="#_pad-paren">pad-paren</a>
+        <a class="contents" href="#_pad-paren-out">pad-paren-out</a>
+        <a class="contents" href="#_pad-first-paren-out">pad-first-paren-out</a>
+        <a class="contents" href="#_pad-paren-in">pad-paren-in</a>
+        <a class="contents" href="#_pad-header">pad-header</a>
+        <a class="contents" href="#_unpad-paren">unpad-paren</a>
+        <a class="contents" href="#_pad-empty-paren">pad-empty-paren</a>
+        <a class="contents" href="#_pad-brackets">pad-brackets</a>
+        <a class="contents" href="#_pad-brackets-in">pad-brackets-in</a>
+        <a class="contents" href="#_pad-brackets-out">pad-brackets-out</a>
+        <a class="contents" href="#_unpad-brackets">unpad-brackets</a>
+        <a class="contents" href="#_delete-empty-lines">delete-empty-lines</a>
+        <a class="contents" href="#_fill-empty-lines">fill-empty-lines</a>
+        <a class="contents" href="#_squeeze-ws">squeeze-ws</a>
+        <a class="contents" href="#_squeeze-lines">squeeze-lines</a>
+        <a class="contents" href="#_align-pointer">align-pointer</a>
+        <a class="contents" href="#_align-reference">align-reference</a>
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Formatting_Options">Formatting&nbsp;Options</a></p>
+        <a href="#_Formatting_Options">Formatting&nbsp;Options</a></p>
     <p class="contents2">
-        <a class="contents" href="#_break-closing-braces">break&#8209;closing&#8209;braces</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_break-elseifs">break&#8209;elseifs</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_break-one-line-headers">break&#8209;one&#8209;line&#8209;headers</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_add-braces">add&#8209;braces</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_add-one-line-braces">add&#8209;one&#8209;line&#8209;braces</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_remove-braces">remove&#8209;braces</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_break-return-type">break&#8209;return&#8209;type</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_attach-return-type">attach&#8209;return&#8209;type</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_keep-one-line-blocks">keep&#8209;one&#8209;line&#8209;blocks</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_keep-one-line-statements">keep&#8209;one&#8209;line&#8209;statements</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_convert-tabs">convert&#8209;tabs</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_close-templates">close&#8209;templates</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_remove-comment-prefix">remove&#8209;comment&#8209;prefix</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_max-code-length">max&#8209;code&#8209;length</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_max-code-length">break&#8209;after&#8209;logical</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_mode">mode</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_break-closing-braces">break-closing-braces</a>
+        <a class="contents" href="#_break-elseifs">break-elseifs</a>
+        <a class="contents" href="#_break-one-line-headers">break-one-line-headers</a>
+        <a class="contents" href="#_add-braces">add-braces</a>
+        <a class="contents" href="#_add-one-line-braces">add-one-line-braces</a>
+        <a class="contents" href="#_remove-braces">remove-braces</a>
+        <a class="contents" href="#_break-return-type">break-return-type</a>
+        <a class="contents" href="#_attach-return-type">attach-return-type</a>
+        <a class="contents" href="#_keep-one-line-blocks">keep-one-line-blocks</a>
+        <a class="contents" href="#_keep-one-line-statements">keep-one-line-statements</a>
+        <a class="contents" href="#_convert-tabs">convert-tabs</a>
+        <a class="contents" href="#_close-templates">close-templates</a>
+        <a class="contents" href="#_remove-comment-prefix">remove-comment-prefix</a>
+        <a class="contents" href="#_max-code-length">max-code-length</a>
+        <a class="contents" href="#_max-code-length">break-after-logical</a>
+        <a class="contents" href="#_mode">mode</a>
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Objective_C_Options">Objective&#8209;C&nbsp;Options</a></p>
+        <a href="#_Objective_C_Options"><span style="white-space: nowrap;">Objective-C</span>&nbsp;Options</a></p>
     <p class="contents2">
-        <a class="contents" href="#_pad-method-prefix">pad&#8209;method&#8209;prefix</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_unpad-method-prefix">unpad&#8209;method&#8209;prefix</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-return-type">pad&#8209;return&#8209;type</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_unpad-return-type">unpad&#8209;return&#8209;type</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-param-type">pad&#8209;param&#8209;type</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_unpad-param-type">unpad&#8209;param&#8209;type</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_align-method-colon">align&#8209;method&#8209;colon</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_pad-method-colon">pad&#8209;method&#8209;colon</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_pad-method-prefix">pad-method-prefix</a>
+        <a class="contents" href="#_unpad-method-prefix">unpad-method-prefix</a>
+        <a class="contents" href="#_pad-return-type">pad-return-type</a>
+        <a class="contents" href="#_unpad-return-type">unpad-return-type</a>
+        <a class="contents" href="#_pad-param-type">pad-param-type</a>
+        <a class="contents" href="#_unpad-param-type">unpad-param-type</a>
+        <a class="contents" href="#_align-method-colon">align-method-colon</a>
+        <a class="contents" href="#_pad-method-colon">pad-method-colon</a>
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Other_Options">Other&nbsp;Options</a>&nbsp;&nbsp;&nbsp;</p>
+        <a href="#_Other_Options">Other&nbsp;Options</a> </p>
     <p class="contents2">
-        <a class="contents" href="#_suffix">suffix</a>&nbsp;&nbsp;&nbsp; <a class="contents" href="#_suffix=none">suffix=none</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_recursive">recursive</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_dry-run">dry-run</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_exclude">exclude</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_ignore-exclude-errors">ignore&#8209;exclude&#8209;errors</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_ignore-exclude-errors-x">ignore&#8209;exclude&#8209;errors&#8209;x</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_errors-to-stdout">errors&#8209;to&#8209;stdout</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_preserve-date">preserve&#8209;date</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_verbose">verbose</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_formatted">formatted</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_quiet">quiet</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_lineend">lineend</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_suffix">suffix</a>  <a class="contents" href="#_suffix=none">suffix=none</a>
+        <a class="contents" href="#_recursive">recursive</a>
+        <a class="contents" href="#_dry-run">dry-run</a>
+        <a class="contents" href="#_exclude">exclude</a>
+        <a class="contents" href="#_ignore-exclude-errors">ignore-exclude-errors</a>
+        <a class="contents" href="#_ignore-exclude-errors-x">ignore-exclude-errors-x</a>
+        <a class="contents" href="#_errors-to-stdout">errors-to-stdout</a>
+        <a class="contents" href="#_preserve-date">preserve-date</a>
+        <a class="contents" href="#_verbose">verbose</a>
+        <a class="contents" href="#_formatted">formatted</a>
+        <a class="contents" href="#_quiet">quiet</a>
+        <a class="contents" href="#_lineend">lineend</a>
     </p>
     <p class="contents1">
-        <a class="contents" href="#_Command_Line_Only">Command&nbsp;Line&nbsp;Only</a></p>
+        <a  href="#_Command_Line_Only">Command&nbsp;Line&nbsp;Only</a></p>
     <p class="contents2">
-        <a class="contents" href="#_options">options</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_project">project</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_ascii">ascii</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_version">version</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_help">help</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_html">html</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_html=">html=</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_stdin=">stdin=</a>&nbsp;&nbsp;&nbsp;
-        <a class="contents" href="#_stdout=">stdout=</a>&nbsp;&nbsp;&nbsp;
+        <a class="contents" href="#_options">options</a>
+        <a class="contents" href="#_project">project</a>
+        <a class="contents" href="#_ascii">ascii</a>
+        <a class="contents" href="#_version">version</a>
+        <a class="contents" href="#_help">help</a>
+        <a class="contents" href="#_html">html</a>
+        <a class="contents" href="#_html=">html=</a>
+        <a class="contents" href="#_stdin=">stdin=</a>
+        <a class="contents" href="#_stdout=">stdout=</a>
     </p>
     <p>
         &nbsp;</p>
@@ -235,7 +246,7 @@
 
     <p>
         Artistic Style will determine the file type from the file extension. The extension ".java" indicates a Java file,
-        and ".cs" indicates a C# file. Everything else is a C type file (C, C++, C++/CLI, or Objective-C). If you are
+        and ".cs" indicates a C# file. Everything else is a C type file (C, C++, C++/CLI, or <span style="white-space: nowrap;">Objective-C</span>). If you are
         using a non-standard file extension for Java or C#, use one of the --mode= options.</p>
 
     <h4>Wildcards and Recursion</h4>
@@ -267,11 +278,11 @@
         these settings. If no translation is available it will default to English. There is an "ascii" option to use English
         instead of the system language.</p>
     <p>
-        The source code for the translations is at the end of ASLocalizer.cpp in the form of an English&#8209;Translation
+        The source code for the translations is at the end of ASLocalizer.cpp in the form of an English-Translation
         pair. If you make corrections to a translation, send the source as a bug report and it will be included in the
         next release.</p>
     <p>
-        To add a new language, add a new translation class to ASLocalizer.h. Add the English&#8209;Translation pair to
+        To add a new language, add a new translation class to ASLocalizer.h. Add the English-Translation pair to
         the constructor in ASLocalizer.cpp. Update the WinLangCode array and add the language code to the function setTranslationClass().
         The ASLocalizer.cpp program contains comments that give web pages for obtaining the LCIDs and language codes.
         Send the source code as a bug report and it will be included in the next release.</p>
@@ -282,10 +293,10 @@
         The names of special characters used in programming vary by region. The terminology used by Artistic Style,
         followed by other common names, is<strong>:</strong></p>
     <blockquote>
-        braces or curly braces { } &#8209; also called brackets, or curly brackets.<br />
-        parens or round brackets ( ) &#8209; also called parentheses, brackets, circle brackets, or soft brackets.<br />
-        square brackets [ ] &#8209; also called block parens, brackets, closed brackets, or hard brackets.<br />
-        angle brackets < > &#8209; also called brackets, pointy brackets, triangular brackets, diamond brackets, tuples,
+        braces or curly braces { } - also called brackets, or curly brackets.<br />
+        parens or round brackets ( ) - also called parentheses, brackets, circle brackets, or soft brackets.<br />
+        square brackets [ ] - also called block parens, brackets, closed brackets, or hard brackets.<br />
+        angle brackets < > - also called brackets, pointy brackets, triangular brackets, diamond brackets, tuples,
         or chevrons.
     </blockquote>
     <p>
@@ -303,12 +314,12 @@
         hanging indent format is used. If the "exec sql" statement is indented more than the following statements, the
         SQL will be aligned in a single column.</p>
     <p>
-        Unicode files encoded as UTF&#8209;16, both big and little endian, will be formatted. The files must begin with
-        a byte order mark (BOM) to be recognized. Files encoded as UTF&#8209;32 will be rejected. Some compilers do not
-        support these encodings. These files can be converted to UTF&#8209;8 encoding with the program "iconv". There
+        Unicode files encoded as UTF-16, both big and little endian, will be formatted. The files must begin with
+        a byte order mark (BOM) to be recognized. Files encoded as UTF-32 will be rejected. Some compilers do not
+        support these encodings. These files can be converted to UTF-8 encoding with the program "iconv". There
         are Linux and Windows versions available (the Windows version does not seem to work for all encodings). Visual
         Studio can convert the files from the "File &gt; Advanced Save Options" menu. There are other development environments
-        and text editors, such as SciTE, that can convert files to UTF&#8209;8.</p>
+        and text editors, such as SciTE, that can convert files to UTF-8.</p>
     <p>
         Embedded statements that are multiple-line and are NOT in a C-type format, such as Python, are usually mal-formatted
         (a C-type format has blocks enclosed by braces and statements terminated by a semi-colon). Macros that define
@@ -654,8 +665,8 @@ indent-switches     <span class="comment"># cannot do this on the command line</
         a function.</p>
     <p>
         Using the k&amp;r option may cause problems because of the &amp;. This can be resolved by enclosing the k&amp;r
-        in quotes (e.g. &#8209;&#8209;style="k&amp;r") or by using one of the alternates &#8209;&#8209;style=kr or
-         &#8209;&#8209;style=k/r.</p>
+        in quotes (e.g. --style="k&amp;r") or by using one of the alternates --style=kr or
+         --style=k/r.</p>
     <div class="code">
         <pre>int Foo(bool isBar)
 <span class="brace">{</span>
@@ -674,7 +685,7 @@ indent-switches     <span class="comment"># cannot do this on the command line</
         Stroustrup style uses linux braces. Opening braces are broken from function definitions only. The opening braces
         are attached to everything else, including namespaces, classes, arrays, structs, enums, and statements within
         a function.&nbsp; The closing headers are broken from closing braces (e.g. --break-closing-headers). This style
-        frequently is used with attach&#8209;closing&#8209;while, tabbed indents, and an indent of 5
+        frequently is used with attach-closing-while, tabbed indents, and an indent of 5
         spaces. </p>
     <div class="code">
         <pre>int Foo(bool isBar)
@@ -813,7 +824,7 @@ indent-switches     <span class="comment"># cannot do this on the command line</
         else, including arrays, structs, enums, and statements within a function. </p>
     <p>
         In the following example, braces have been added to the "return 0;" statement. The option
-        &#8209;&#8209;add&#8209;one&#8209;line&#8209;braces can also be used with this style.</p>
+        --add-one-line-braces can also be used with this style.</p>
     <div class="code">
         <pre>int Foo(bool isBar)
 <span class="brace">{</span>
@@ -867,7 +878,7 @@ indent-switches     <span class="comment"># cannot do this on the command line</
         <code class="title">--style=webkit / -A17</code><br />
         WebKit style uses linux braces. Opening braces are broken from function definitions only. The opening braces are
         attached to everything else, including namespaces, classes, arrays, structs, enums, and statements within a function.
-        This style frequently is used with attach&#8209;closing&#8209;while, and an indent of 4 spaces.
+        This style frequently is used with attach-closing-while, and an indent of 4 spaces.
     </p>
     <div class="code">
         <pre>int Foo(bool isBar)
@@ -907,7 +918,7 @@ indent-switches     <span class="comment"># cannot do this on the command line</
     <div class="code">
         <pre>int Foo(bool isBar) <span class="brace">{</span>
     if (isBar) <span class="brace">{
-</span>        bar()
+</span>        bar();
         return 1; <span class="brace">}
  </span>   else
         return 0; <span class="brace">}</span>
@@ -1157,7 +1168,7 @@ public:
         <code class="title">--indent-modifiers / -xG</code><br />
         Indent 'class ' and 'struct' access modifiers, 'public:', 'protected:'
         and 'private:', one half indent. The rest of the class is not indented. This option is effective
-        for C++ files only. If used with indent&#8209;classes this option will be ignored.</p>
+        for C++ files only. If used with indent-classes this option will be ignored.</p>
     <div class="code">
         <pre>class Foo
 <span class="brace">{</span>
@@ -1442,7 +1453,7 @@ error:
     <p id="_indent-col1-comments">
         <code class="title">--indent-col1-comments / -Y</code><br />
         Indent C++ comments beginning in column one. By default C++ comments beginning in column one are
-        assumed to be commented&#8209;out code and not indented. This option will allow the comments to be indented with
+        assumed to be commented-out code and not indented. This option will allow the comments to be indented with
         the code.</p>
     <div class="code">
         <pre>void Foo()\n"
@@ -1507,6 +1518,7 @@ if (a &lt; b
     </div>
     <p>
         &nbsp;</p>
+
     <p id="_max-continuation-indent">
         <code class="title">--max-continuation-indent=<span class="option">#</span> / -M<span class="option">#</span></code><br />
         Set the &nbsp;maximum of <span class="option">#</span> spaces to indent a continuation line. The
@@ -1534,6 +1546,38 @@ fooFunction(barArg1,
             barArg3);
 </pre>
     </div>
+
+<p id="_lambda_indent">
+    <code class="title">--lambda-indent</code><br />
+    This option improves indentation of C++ lambda functions. As it currently does not work well with complex lambda function bodies, this feature is not enabled by default.
+</p>
+
+<div class="code">
+    <pre>void abssort (float* x, unsigned n)
+{
+    std::sort (x, x + n,
+    [] (float a, float b) {
+        return (std::abs (a) < std::abs (b));
+    }
+              );
+}</pre>
+</div>
+
+<p class="code">
+    becomes:</p>
+
+<div class="code">
+    <pre>void abssort (float* x, unsigned n)
+{
+    std::sort (x, x + n,
+                [] (float a, float b) {
+                    return (std::abs (a) < std::abs (b));
+                }
+               );
+}</pre>
+</div>
+
+
     <p>
         &nbsp;</p>
     <hr />
@@ -1671,9 +1715,9 @@ isBar = false;
         <br />
         Insert space padding around the <strong>first</strong> paren in a series on the <strong>outside</strong>
         only. Parens that are empty will not be padded. Any end of line comments will remain in the original column,
-        if possible. This can be used with unpad-paren below to remove unwanted spaces. If used with pad&#8209;paren or
-        pad&#8209;paren&#8209;out, this option will be ignored. If used with pad&#8209;paren&#8209;in, the result will
-        be the pad&#8209;paren.</p>
+        if possible. This can be used with unpad-paren below to remove unwanted spaces. If used with pad-paren or
+        pad-paren-out, this option will be ignored. If used with pad-paren-in, the result will
+        be the pad-paren.</p>
     <div class="code">
         <pre>if (isFoo((a+2), b))
     bar(a, b);
@@ -1725,13 +1769,13 @@ isBar = false;
         <br />
         Remove extra space padding around parens on the inside and outside. Any end of line comments will remain
         in the original column, if possible. This option can be used in combination with the paren padding options
-        pad&#8209;paren, pad&#8209;paren&#8209;out, pad&#8209;paren&#8209;in,
-        and pad&#8209;header above. Only padding that has not been requested by other options will be
+        pad-paren, pad-paren-out, pad-paren-in,
+        and pad-header above. Only padding that has not been requested by other options will be
         removed.</p>
     <p>
         For example, if a source has parens padded on both the inside and outside, and you want inside only. You need
-        to use unpad-paren to remove the outside padding, and pad&#8209;paren&#8209;in to
-        retain the inside padding. Using only pad&#8209;paren&#8209;in> would not remove the outside
+        to use unpad-paren to remove the outside padding, and pad-paren-in to
+        retain the inside padding. Using only pad-paren-in> would not remove the outside
         padding.</p>
     <div class="code">
         <pre>if ( isFoo( ( a+2 ), b ) )
@@ -1743,6 +1787,76 @@ isBar = false;
     bar(a, b);
 </pre>
     </div>
+
+
+    <p id="_pad-empty-paren">
+        <code class="title">--pad-empty-paren / -xo </code>
+        <br />
+        Apply padding to empty pairs of parentheses; combine with other
+        parentheses padding options.
+    </p>
+    <div class="code">
+        <pre>if (isFoo())
+    bar(a, b);
+</pre>
+        <p class="code">
+            becomes:</p>
+        <pre>if ( isFoo () )
+    bar( a, b );
+</pre>
+    </div>
+    <p>
+        &nbsp;</p>
+
+    <p id="_pad-brackets">
+        <code class="title">--pad-brackets</code>
+        <br />
+        Insert space padding around square brackets on both the <strong>outside</strong> and the <strong>inside</strong>.
+    </p>
+    <div class="code">
+        <pre>a = b[a[1]];</pre>
+        <p class="code">
+            becomes:</p>
+        <pre>a = b [ a [ 1 ] ];</pre>
+    </div>
+
+    <p id="_pad-brackets-in">
+        <code class="title">--pad-brackets-in</code>
+        <br />
+        Insert space padding around square brackets the <strong>inside</strong> only.
+    </p>
+    <div class="code">
+        <pre>a = b[a[1]];</pre>
+        <p class="code">
+            becomes:</p>
+        <pre>a = b[ a[ 1 ] ];</pre>
+    </div>
+
+    <p id="_pad-brackets-out">
+        <code class="title">--pad-brackets-out</code>
+        <br />
+        Insert space padding around square brackets the <strong>outside</strong> only.
+    </p>
+    <div class="code">
+        <pre>a = b[a[1]];</pre>
+        <p class="code">
+            becomes:</p>
+        <pre>a = b [a [1]];</pre>
+    </div>
+
+
+    <p id="_unpad-brackets">
+        <code class="title">--unpad-brackets</code>
+        <br />
+        Remove padding around square brackets on both the <strong>outside</strong> and the <strong>inside</strong>.
+    </p>
+    <div class="code">
+        <pre>a = b [ a [ 1 ] ];</pre>
+        <p class="code">
+            becomes:</p>
+        <pre>a = b[a[1]];</pre>
+    </div>
+
     <p>
         &nbsp;</p>
     <p id="_delete-empty-lines">
@@ -1766,14 +1880,68 @@ isBar = false;
 <span class="brace">{</span>
     foo1 = 1;
     foo2 = 2;
-<span class="brace">}</span>
-</pre>
+<span class="brace">}</span></pre>
     </div>
     <p>
         &nbsp;</p>
     <p id="_fill-empty-lines">
         <code class="title">--fill-empty-lines / -E</code><br />
         Fill empty lines with the white space of the previous line.</p>
+
+        <p>
+            &nbsp;</p>
+        <p id="_squeeze-lines">
+            <code class="title">--squeeze-lines=#</code><br />
+            Remove superfluous empty lines exceeding the given number.</p>
+        <div class="code">
+            <pre>void Foo()
+<span class="brace">{</span>
+    foo1 = 1;
+<span class="brace">}</span>
+
+
+
+
+void Foo2()
+<span class="brace">{</span>
+    foo1 = 1;
+<span class="brace">}</span>
+    </pre>
+            <p class="code">
+                becomes:</p>
+            <pre>void Foo()
+<span class="brace">{</span>
+    foo1 = 1;
+<span class="brace">}</span>
+
+
+void Foo2()
+<span class="brace">{</span>
+    foo1 = 1;
+<span class="brace">}</span></pre>
+        </div>
+
+
+    <p>
+            &nbsp;</p>
+        <p id="_squeeze-ws">
+            <code class="title">--squeeze-ws</code><br />
+            Remove superfluous whitespace</p>
+        <div class="code">
+            <pre>void       Foo    ()
+<span class="brace">{</span>
+    foo1   =   1;
+<span class="brace">}</span>
+    </pre>
+            <p class="code">
+                becomes:</p>
+<pre>void Foo ()
+<span class="brace">{</span>
+    foo1 = 1;
+<span class="brace">}</span></pre>
+        </div>
+
+
     <p>
         &nbsp;</p>
     <p id="_align-pointer">
@@ -2005,11 +2173,11 @@ else
     <p>
         &nbsp;</p>
     <p id="_break-return-type">
-        <code class="title">--break-return-type&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; / -xB</code><br />
+        <code class="title">--break-return-type &nbsp;&nbsp; / -xB</code><br />
         <code class="title">--break-return-type-decl / -xD</code><br />
         Break the return type from the function name. The two options are for the function definitions (-xB), and the
         function declarations or signatures (-xD). If used with --attach-return-type, the result will be to break the
-        return type. This option has no effect on Objective-C functions.</p>
+        return type. This option has no effect on <span style="white-space: nowrap;">Objective-C</span> functions.</p>
     <div class="code">
         <pre>void Foo(bool isFoo);</pre>
         <p class="code">
@@ -2020,12 +2188,12 @@ Foo(bool isFoo);</pre>
     <p>
         &nbsp;</p>
     <p id="_attach-return-type">
-        <code class="title">--attach-return-type&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; / -xf</code><br />
+        <code class="title">--attach-return-type &nbsp;&nbsp; / -xf</code><br />
         <code class="title">--attach-return-type-decl / -xh</code><br />
         Attach the return type to the function name. The two options are for the function definitions (-xf), and the
         function declarations or signatures (-xh). They are intended to undo the --break-return-type options. If used
         with --break-return-type, the result will be to break the return type. This option has no effect on
-        Objective-C functions.</p>
+        <span style="white-space: nowrap;">Objective-C</span> functions.</p>
     <div class="code">
         <pre>void
 Foo(bool isFoo);</pre>
@@ -2110,19 +2278,19 @@ Foo(bool isFoo);</pre>
         <code class="title">--max-code-length=<span class="option">#</span>&nbsp;&nbsp; / -xC<span class="option">#</span>
             <br />
             --break-after-logical / -xL</code><br />
-        The option max&#8209;code&#8209;length will break a line if the code exceeds <span class="option">#</span>
+        The option max-code-length will break a line if the code exceeds <span class="option">#</span>
         characters. The valid values are <strong>50</strong> thru <strong>200</strong>. Lines without logical conditionals
         will break on a logical conditional (||, &amp;&amp;, ...), comma, paren, semicolon, or space.</p>
     <p>
-        Some code will not be broken, such as comments, quotes, and arrays. If used with keep&#8209;one&#8209;line&#8209;blocks
-        or add-one-line-braces the blocks will NOT be broken. If used with keep&#8209;one&#8209;line&#8209;statements
+        Some code will not be broken, such as comments, quotes, and arrays. If used with keep-one-line-blocks
+        or add-one-line-braces the blocks will NOT be broken. If used with keep-one-line-statements
         the statements will be broken at a semicolon if the line goes over the maximum length. If there is no available
         break point within the max code length, the line will be broken at the first available break point after the max
         code length.</p>
     <p>
         By default logical conditionals will be placed first in the new line. The option
-        <strong>break&#8209;after&#8209;logical</strong> will cause the logical conditionals to be placed last on the
-        previous line. This option has no effect without max&#8209;code&#8209;length.</p>
+        <strong>break-after-logical</strong> will cause the logical conditionals to be placed last on the
+        previous line. This option has no effect without max-code-length.</p>
     <div class="code">
         <pre>if (thisVariable1 == thatVariable1 || thisVariable2 == thatVariable2 || thisVariable3 == thatVariable3)
     bar();</pre>
@@ -2133,7 +2301,7 @@ Foo(bool isFoo);</pre>
         || thisVariable3 == thatVariable3)
     bar();</pre>
         <p class="code">
-            becomes (with break&#8209;after&#8209;logical):</p>
+            becomes (with break-after-logical):</p>
         <pre>if (thisVariable1 == thatVariable1 ||
         thisVariable2 == thatVariable2 ||
         thisVariable3 == thatVariable3)
@@ -2147,7 +2315,7 @@ Foo(bool isFoo);</pre>
         <code class="title">--mode=js</code><br />
         <code class="title">--mode=java</code><br />
         <code class="title">--mode=objc</code><br />
-        Indent a C type, C#, Javascript, Java or Objective-C file. C type files are C, C++, C++/CLI. The option is usually
+        Indent a C type, C#, Javascript, Java or <span style="white-space: nowrap;">Objective-C</span> file. C type files are C, C++, C++/CLI. The option is usually
         set from the file extension for each file. You can override the setting with this entry. It will be used for all
         files, regardless of the file extension. It allows the formatter to identify language specific syntax such as
         C++ classes, templates, and keywords.</p>
@@ -2157,18 +2325,18 @@ Foo(bool isFoo);</pre>
 
     <!--  * * * * * * * * * * * * *   Objective-C Options  * * * * * * * * * * * * *  -->
 
-    <h3 id="_Objective_C_Options">Objective&#8209;C Options</h3>
+    <h3 id="_Objective_C_Options"><span style="white-space: nowrap;">Objective-C</span> Options</h3>
 
     <p>
-        These options are effective for Objective&#8209;C files only. The standard paren padding options will still apply
-        to the Objective-C method prefix and return type unless overridden by the following options.</p>
+        These options are effective for <span style="white-space: nowrap;">Objective-C</span> files only. The standard paren padding options will still apply
+        to the <span style="white-space: nowrap;">Objective-C</span> method prefix and return type unless overridden by the following options.</p>
     <p>
-        Because of the longer indents sometimes needed for Objective&#8209;C, the option "max-continuation-indent" may
+        Because of the longer indents sometimes needed for <span style="white-space: nowrap;">Objective-C</span>, the option "max-continuation-indent" may
         need to be increased. If you are not getting the paren and square bracket alignment you want, try increasing
         this value. The option is described in the "Indentation Options" section.</p>
     <p id="_pad-method-prefix">
         <code class="title">--pad-method-prefix / -xQ</code><br />
-        Insert space padding <strong>after</strong> the '-' or '+' Objective&#8209;C method prefix. This will add
+        Insert space padding <strong>after</strong> the '-' or '+' <span style="white-space: nowrap;">Objective-C</span> method prefix. This will add
         exactly one space. Any additional spaces will be deleted.</p>
     <div class="code">
         <pre>-(void)foo1;
@@ -2182,8 +2350,8 @@ Foo(bool isFoo);</pre>
         &nbsp;</p>
     <p id="_unpad-method-prefix">
         <code class="title">--unpad-method-prefix / -xR</code><br />
-        Remove all space padding <strong>after</strong> the &#39;-&#39; or &#39;+&#39; Objective&#8209;C method prefix.&nbsp;
-        This option will be ignored if used with pad&#8209;method&#8209;prefix. This option  takes precedence over the
+        Remove all space padding <strong>after</strong> the &#39;-&#39; or &#39;+&#39; <span style="white-space: nowrap;">Objective-C</span> method prefix.&nbsp;
+        This option will be ignored if used with pad-method-prefix. This option  takes precedence over the
         pad paren outside option.</p>
     <div class="code">
         <pre>- (void) foo1;
@@ -2197,7 +2365,7 @@ Foo(bool isFoo);</pre>
         &nbsp;</p>
     <p id="_pad-return-type">
         <code class="title">--pad-return-type / -xq</code><br />
-        Insert space padding <strong>after</strong> the Objective&#8209;C return type. This will add exactly one
+        Insert space padding <strong>after</strong> the <span style="white-space: nowrap;">Objective-C</span> return type. This will add exactly one
         space. Any additional spaces will be deleted. </p>
     <div class="code">
         <pre>-(void)foo1;
@@ -2211,8 +2379,8 @@ Foo(bool isFoo);</pre>
         &nbsp;</p>
     <p id="_unpad-return-type">
         <code class="title">--unpad-return-type / -xr</code><br />
-        Remove all space padding <strong>after</strong> the Objective&#8209;C return type. This option
-        will be ignored if used with pad&#8209;return&#8209;type. This option  takes precedence over the pad paren
+        Remove all space padding <strong>after</strong> the <span style="white-space: nowrap;">Objective-C</span> return type. This option
+        will be ignored if used with pad-return-type. This option  takes precedence over the pad paren
         outside option. </p>
     <div class="code">
         <pre>-(void) foo1;
@@ -2226,7 +2394,7 @@ Foo(bool isFoo);</pre>
         &nbsp;</p>
     <p id="_pad-param-type">
         <code class="title">--pad-param-type / -xS</code><br />
-        Insert space padding around an Objective&#8209;C parameter type. This will add exactly
+        Insert space padding around an <span style="white-space: nowrap;">Objective-C</span> parameter type. This will add exactly
         one space. Any additional spaces will be deleted. This has precedence over the pad method colon option and
         will always cause space padding after a method colon.</p>
     <div class="code">
@@ -2241,7 +2409,7 @@ Foo(bool isFoo);</pre>
         &nbsp;</p>
     <p id="_unpad-param-type">
         <code class="title">--unpad-param-type / -xs</code><br />
-        Remove all space padding around an Objective&#8209;C parameter type. This option  takes precedence over the
+        Remove all space padding around an <span style="white-space: nowrap;">Objective-C</span> parameter type. This option  takes precedence over the
         pad paren outside option. The pad method colon option has precedence over the <strong>opening</strong> paren.
         The closing paren will always be unpadded.</p>
     <div class="code">
@@ -2261,7 +2429,7 @@ Foo(bool isFoo);</pre>
         &nbsp;</p>
     <p id="_align-method-colon">
         <code class="title">--align-method-colon / -xM</code><br />
-        Align the colons in Objective&#8209;C method declarations
+        Align the colons in <span style="white-space: nowrap;">Objective-C</span> method declarations
         and method calls. If this option is not declared, method definitions will be indented uniformly, and method calls
         will align with the first keyword.</p>
     <div class="code">
@@ -2299,11 +2467,11 @@ Foo(bool isFoo);</pre>
         &nbsp;</p>
     <p id="_pad-method-colon">
         <code class="title">--pad-method-colon=none&nbsp;&nbsp; / -xP0<br />
-            --pad-method-colon=all&nbsp;&nbsp;&nbsp; / -xP1<br />
+            --pad-method-colon=all  / -xP1<br />
             --pad-method-colon=after&nbsp; / -xP2<br />
             --pad-method-colon=before / -xP3
         </code><br />
-        Add or remove space padding before or after the colons in an Objective&#8209;C method call. These options will
+        Add or remove space padding before or after the colons in an <span style="white-space: nowrap;">Objective-C</span> method call. These options will
         pad exactly one space. Any additional spaces will be deleted. The space padding after the method colon can be
         overridden by pad-param-type.</p>
     <div class="code">
@@ -2363,7 +2531,7 @@ Foo(bool isFoo);</pre>
         required files.</p>
     <p>
         Wildcards are NOT allowed. There may be more than one exclude statement. The file path and name may be placed
-        in double quotes (e.g. &#8209;&#8209;exclude="foo&nbsp;bar.cpp").</p>
+        in double quotes (e.g. --exclude="foo&nbsp;bar.cpp").</p>
     <p id="_ignore-exclude-errors">
         <code class="title">--ignore-exclude-errors / -i</code><br />
         Allow processing to continue if there are errors in the "exclude=###" options.<br />
@@ -2410,7 +2578,7 @@ Foo(bool isFoo);</pre>
         will be ignored.</p>
     <p>
         &nbsp;</p>
-    <hr style="margin-left: -0.4in;" />
+    <hr  />
 
     <!--  * * * * * * * * * * * *  Command-Line Options  * * * * * * * * * * * *  -->
 
@@ -2486,17 +2654,13 @@ Foo(bool isFoo);</pre>
         Do not use this with "&gt;" redirection.</p>
     <p>
         &nbsp;</p>
-    <hr style="margin-left: -0.4in;" />
+    <hr  />
 
-    <p style="margin-left: -0.4in; text-align: center;">
+    <p >
         <a href="http://sourceforge.net/projects/astyle">
             <img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2319&type=16" alt="" />
         </a></p>
 
-    <p>
-        &nbsp;</p>
-    <p>
-        &nbsp;</p>
 
 </body>
 

AStyle/doc/development.html

@@ -18,7 +18,7 @@
 
     <p class="noindent">
         Artistic Style has compile options for creating a shared library (DLL) or static library for use with a Graphical
-        User Interface (GUI). The shared library can be called from a C++, Objective&#8209;C, C#, or Python program. There
+        User Interface (GUI). The shared library can be called from a C++, <span style="white-space: nowrap;">Objective-C</span>, C#, or Python program. There
         are also compile options for a Java Native Interface (JNI) that allows it to be called from a Java program. Information
         on compiling the various configurations of Artistic Style is in the Install Information.</p>
     <p class="noindent">
@@ -43,12 +43,12 @@
         as a shared or static library from a C++ program. It includes a C++ sample program that can be used to test the
         Artistic Style libraries.</p>
     <p>
-        <a href="https://astyle.sourceforge.net/develop/objc.html">Calling Artistic Style from an Objective-C Program</a> contains information on calling Artistic
-        Style as a shared or static library from an Objective-C program. It includes an Objective-C sample program that
+        <a href="https://astyle.sourceforge.net/develop/objc.html">Calling Artistic Style from an <span style="white-space: nowrap;">Objective-C</span> Program</a> contains information on calling Artistic
+        Style as a shared or static library from an <span style="white-space: nowrap;">Objective-C</span> program. It includes an <span style="white-space: nowrap;">Objective-C</span> sample program that
         can be used to test the Artistic Style shared libraries.</p>
     <p style="margin-left: 0.5in;">
-        <a href="https://astyle.sourceforge.net/develop/gnustep.html">Objective&#8209;C on Windows and Linux</a> contains information on compiling and running
-        Objective-C programs using GNUstep. It has instructions for compiling the Example program on Windows or
+        <a href="https://astyle.sourceforge.net/develop/gnustep.html"><span style="white-space: nowrap;">Objective-C</span> on Windows and Linux</a> contains information on compiling and running
+        <span style="white-space: nowrap;">Objective-C</span> programs using GNUstep. It has instructions for compiling the Example program on Windows or
         Linux.</p>
     <p>
         <a href="https://astyle.sourceforge.net/develop/jni.html">Calling Artistic Style as a Java Native Interface</a> contains information on calling Artistic
@@ -92,13 +92,13 @@
 
     <h4>
         <a href="https://sourceforge.net/projects/astyle/files/OldFiles/examples/example-objc.zip" target="_blank"
-            title="open new window">Objective&#8209;C Example</a>
+            title="open new window"><span style="white-space: nowrap;">Objective-C</span> Example</a>
     </h4>
 
     <p>
-        The example for Objective&#8209;C contains the methods to call Artistic Style from a static or shared library
-        using an Objective&#8209;C program. Compile Artistic Style as a static or shared library using the macro ASTYLE_LIB.
-        Copy the shared library to the same folder as the Objective&#8209;C Example executable. It will format files in
+        The example for <span style="white-space: nowrap;">Objective-C</span> contains the methods to call Artistic Style from a static or shared library
+        using an <span style="white-space: nowrap;">Objective-C</span> program. Compile Artistic Style as a static or shared library using the macro ASTYLE_LIB.
+        Copy the shared library to the same folder as the <span style="white-space: nowrap;">Objective-C</span> Example executable. It will format files in
         the test&#8209;data directory included in the download.</p>
 
     <h4>

AStyle/doc/index.html

@@ -14,11 +14,11 @@
 
     <!-- body text -->
 
-    <h1>Artistic Style 3.2</h1>
+    <h1>Artistic Style 3.4.9</h1>
 
     <h2>
         A Free, Fast, and Small Automatic Formatter<br />
-        for C, C++, C++/CLI, Objective C, C#, and Java Source Code
+        for C, C++, C++/CLI, <span style="white-space: nowrap;">Objective-C</span>, C#, and Java Source Code
     </h2>
 
     <center>
@@ -42,7 +42,7 @@
 
 
     <p class="noindent" style="margin-top: 2em">
-        Artistic Style is a source code indenter, formatter, and beautifier for the C, C++, C++/CLI, Objective&#8209;C,
+        Artistic Style is a source code indenter, formatter, and beautifier for the C, C++, C++/CLI, <span style="white-space: nowrap;">Objective-C</span>,
         C# and Java programming languages. Written in C++, it can be used from the command line or incorporated as
         a library in another program. Options can be entered from the command line or from an option file. The library
         version can be called from programs written in languages other that C++.</p>
@@ -121,7 +121,7 @@
         Artistic Style has compile options for creating a shared library (DLL) or static library for use with a Graphical
         User Interface (GUI). With the Java Development Kit (JDK) installed it can be compiled as a Java Native Interface
         (JNI) and called from a Java program. The Developer Information documents the calling procedure and has example
-        programs for C++, C++/CLI, Objective&#8209;C, Java, C#, and Python.</p>
+        programs for C++, C++/CLI, <span style="white-space: nowrap;">Objective-C</span>, Java, C#, and Python.</p>
 
     <h3>Bug Reports, Change Requests, Update Notifications</h3>
 

AStyle/doc/install.html

@@ -58,6 +58,9 @@
     <p class="contents1">
         <a class="contents" href="#_Compiler_Options">Compiler Options</a></p>
 
+    <p class="contents2">
+        <a class="contents" href="#_PIP">Python PIP</a></p>
+
     <h3 id="_Artistic_Style_Versions">Artistic Style Versions</h3>
 
     <p>
@@ -210,7 +213,7 @@ make install</pre>
     <h4 id="_Clang_Makefile">Clang Makefile</h4>
 
     <p>
-        Clang has a static analyzer that finds potential bugs in C/C++ and Objective-C programs. It can be run as a standalone
+        Clang has a static analyzer that finds potential bugs in C/C++ and <span style="white-space: nowrap;">Objective-C</span> programs. It can be run as a standalone
         tool from the command-line and runs in tandem with a build. There is a script file, analyze.sh, that will run
         the analysis on Artistic Style.</p>
     <p>
@@ -325,7 +328,7 @@ make install</pre>
         <li><strong>AStyleA</strong> builds the Artistic Style program as a Static Library (libastyle.a). This can be statically
             linked with an executable.</li>
         <li><strong>AStyleDylib</strong> builds the Artistic Style program as a Dynamic Library (libastyle.dylib). It can
-            be used with C/C++, Objective C, C#, and Python programs.</li>
+            be used with C/C++, <span style="white-space: nowrap;">Objective-C</span>, C#, and Python programs.</li>
         <li><strong>AStyleJava</strong> builds the Artistic Style program as a Dynamic Library (libastylej.dylib) that can
             be called from a Java program. The Java Development (JDK) is required for the project to compile. The Project
             Properties must have an include path to the JDK include directory. The output dylib can also be called from a
@@ -585,8 +588,14 @@ mingw32-make</pre>
         option that allows inline function expansion. Runtime Type Information (RTTI) is NOT needed and exceptions are
         NOT used. Use whole program optimization if your compiler supports it. There may be other options you can use
         depending on the compiler. </p>
-    <p>
-        &nbsp;</p>
+
+     <h3 id="_PIP">Python PIP</h3>
+
+     <p>
+        There are two projects which enable astyle installation using PIP: <a href="https://github.com/Freed-Wu/astyle-wheel/">astyle-wheel</a> and <a href="https://github.com/igrr/astyle_py">astyle_py (using WASM)</a>.<br>
+        These are useful to be included in git pre-commit hooks.
+     </p>
+
 
     <p style="margin-left: -0.4in; text-align: center;">
         <a href="http://sourceforge.net/projects/astyle">

AStyle/doc/news.html

@@ -14,6 +14,41 @@
 
     <h1>Artistic Style News</h1>
 
+    <h3>Artistic Style 3.4</h3>
+
+    <p>
+        A new option &quot;--indent-lambda&quot; was added to apply the lambda recognition only if applicable.
+        Currently complex lambda functions are not intended properly.
+    </p>
+
+    <p>
+        Some C# and C++ related formatting issues were fixed.
+    </p>
+
+    <p>
+        A new option to enable padding of empty pairs of parentheses was added: &quot;pad-empty-paren&quot;.
+        It can be combined with other parentheses padding options.<br>
+        The bracket padding options were enhanced by &quot;pad-brackets-in&quot; and &quot;pad-brackets-out&quot;.
+    </p>
+
+
+    <h3>Artistic Style 3.3</h3>
+
+    <p>
+        The source code has been refactored to no longer use the std namespace globally.
+    </p>
+    <p>
+        Some features of &quot;modern C++&quot; are now supported, ie. lambda function arguments and array initializers
+        with braces.
+    </p>
+    <p>
+        Two new options to remove superfluous whitespace and empty lines were added: &quot;squeeze-ws&quot; and
+        &quot;squeeze-lines=#&quot; (parameter value is the number of empty lines to keep).
+    </p>
+    <p>
+        Two new options to add or remove whitespace around square brackets were added: &quot;pad-brackets&quot; and &quot;unpad-brackets&quot;.
+    </p>
+
     <h3>Artistic Style 3.2 (March 2023)</h3>
 
     <p>
@@ -52,7 +87,7 @@
     <p>
         A new option, &quot;style=ratliff&quot;, has been added as an alternate for banner style.</p>
     <p>
-        Several changes have been made to Objective-C which will improve formatting in certain cases.</p>
+        Several changes have been made to <span style="white-space: nowrap;">Objective-C</span> which will improve formatting in certain cases.</p>
     <p>
         CMake can now be used to compile the AStyle builds. It is run from the top level folder instead of the
         &quot;build&quot; folder, and builds a Release configuration by default. The &quot;Install Information&quot;
@@ -316,24 +351,24 @@
         the indentation of a one line block. If you use Pico style with an indentation greater than 2, you may have a
         lot of changes made to the code.</p>
     <p>
-        New Objective-C options "pad-return-type" and &quot;unpad-return-type&quot; will add or remove space padding after
-        the Objective-C return type in a method definition. They are described in the "Objective-C" section of the
+        New <span style="white-space: nowrap;">Objective-C</span> options "pad-return-type" and &quot;unpad-return-type&quot; will add or remove space padding after
+        the <span style="white-space: nowrap;">Objective-C</span> return type in a method definition. They are described in the "<span style="white-space: nowrap;">Objective-C</span>" section of the
         documentation.</p>
     <p>
-        New Objective-C options "pad-param-type" and &quot;unpad-param-type&quot; will add or remove space padding after
-        the Objective-C parameter type in a method definition. They are described in the "Objective-C" section of the
+        New <span style="white-space: nowrap;">Objective-C</span> options "pad-param-type" and &quot;unpad-param-type&quot; will add or remove space padding after
+        the <span style="white-space: nowrap;">Objective-C</span> parameter type in a method definition. They are described in the "<span style="white-space: nowrap;">Objective-C</span>" section of the
         documentation.</p>
     <p>
-        The Objective-C &quot;align-method-colon&quot; option is now applied to Objective-C method calls in
+        The <span style="white-space: nowrap;">Objective-C</span> &quot;align-method-colon&quot; option is now applied to <span style="white-space: nowrap;">Objective-C</span> method calls in
         addition to method declarations and definitions. The method call colons will be aligned, if possible. If this
         option is not declared, the method calls will align on the first keyword. See the astyle documentation for an
         example.</p>
     <p>
-        The Objective-C &quot;align-method-colon&quot; has been changed for long keywords.
+        The <span style="white-space: nowrap;">Objective-C</span> &quot;align-method-colon&quot; has been changed for long keywords.
         For multi-line arguments when the first keyword is shorter than the others the colons are aligned on the
         longest line instead of the first line. The alignment includes room for the indentation. This aligns all colons
         after the first line for a better appearance. Arguments that do not have a short keyword in the first line will
-        remain the same. This style conforms to the Google Objective-C style.</p>
+        remain the same. This style conforms to the Google <span style="white-space: nowrap;">Objective-C</span> style.</p>
     <p>
         Processing for C++14 single-quote digit separators has been added.</p>
     <p>

AStyle/doc/newsArchives.html

@@ -23,13 +23,13 @@
         With a new Artistic Style release some unchanged source files will be formatted because of changes to Artistic
         Style. You may want to format your source before making program changes in order to bring it up to date.</p>
     <p>
-        A new programming language, Objective&#8209;C, has been added to Artistic Style. Four new options, "align&#8209;method&#8209;colon",
+        A new programming language, <span style="white-space: nowrap;">Objective-C</span>, has been added to Artistic Style. Four new options, "align&#8209;method&#8209;colon",
         "pad&#8209;method&#8209;colon=", "pad&#8209;method&#8209;prefix", and "unpad&#8209;method&#8209;prefix" have been
-        added to format the methods. The options are described in a new "Objective&#8209;C" section in the documentation.
-        These new options affect only Objective&#8209;C source code. They have no effect on the other programming
+        added to format the methods. The options are described in a new "<span style="white-space: nowrap;">Objective-C</span>" section in the documentation.
+        These new options affect only <span style="white-space: nowrap;">Objective-C</span> source code. They have no effect on the other programming
         languages.</p>
     <p>
-        Because of the longer continuation indents sometimes needed for Objective&#8209;C, the option "max-instatement-indent"
+        Because of the longer continuation indents sometimes needed for <span style="white-space: nowrap;">Objective-C</span>, the option "max-instatement-indent"
         may need to be increased. If you are not getting the paren and block paren alignment you want, try increasing
         this value. The default minimum is 40 and the maximum is 120.</p>
     <p>
@@ -87,11 +87,11 @@
         The "Links" page has two new sections for links mentioned in previous versions of Artistic Style. It links to
         free software and other information.</p>
     <p>
-        The "Developer Information" section has a new example and download for calling Artistic Style from an Objective&#8209;C
+        The "Developer Information" section has a new example and download for calling Artistic Style from an <span style="white-space: nowrap;">Objective-C</span>
         program. Since it is another "C" language the only thing needed is to link the program with a library build of
         Artistic Style. The example was developed on Windows and Linux using the GNUstep project. Since the example is
         a console program the problems with the GNUstep GUI have been avoided. It has not been tested on a Mac, but should
-        be close to working. The "Developer Information" section also has a new page for "Objective&#8209;C on Windows
+        be close to working. The "Developer Information" section also has a new page for "<span style="white-space: nowrap;">Objective-C</span> on Windows
         and Linux" which has information on compiling and running the example on those systems.</p>
     <p>
         The executable included in the Windows distribution was compiled with Visual Studio 2010 (platform toolset v100).
@@ -209,7 +209,7 @@
         This bug fix release is issued because of the length of time required for the some of the changes in the next
         release (2.03). Bugs with the breaking of "case" statements and a crash with pointer to pointer (**) in align-pointer=type
         have been fixed. The "case" statements that have been incorrectly broken will be fixed in this release. Pointers
-        and references are now processed for C# files. See the "Release Notes" for more information and additional 
+        and references are now processed for C# files. See the "Release Notes" for more information and additional
         changes.</p>
 
     <h4><strong>The following information is for the original 2.02 release.</strong></h4>
@@ -229,8 +229,8 @@
         must be input from the command line and not an option file. See the documentation for details.</p>
     <p>
         The translations were mostly done with an automated translation program, Google Translate, so they may not be
-        the best translation possible. The translations are at the end of ASLocalizer.cpp in the form of an 
-        English&#8209;Translation pair. If you correct a translation, send the source as a bug report and it will be 
+        the best translation possible. The translations are at the end of ASLocalizer.cpp in the form of an
+        English&#8209;Translation pair. If you correct a translation, send the source as a bug report and it will be
         included in the next release.</p>
     <p>
         To add a language, add a new translation class to ASLocalizer.h. Add the English&#8209;Translation pair to the
@@ -270,15 +270,15 @@
         of containing no uninformative lines. Like Pico, it is also a very compact style.</p>
     <p>
         The option "brackets=horstmann" has been removed. Instead use "style=horstmann" or "A9". The short option "g"
-        is now equivalent to the new "brackets=run-in". Run-in brackets are used for both Horstmann and Pico 
+        is now equivalent to the new "brackets=run-in". Run-in brackets are used for both Horstmann and Pico
         styles.</p>
     <p>
-        The option "indent-brackets" and short option "B" have been removed. Instead use "style=whitesmith" or 
+        The option "indent-brackets" and short option "B" have been removed. Instead use "style=whitesmith" or
         "style=banner".</p>
     <p>
         The option "indent-blocks" and short option "G" have been removed. Instead use "style=gnu".</p>
     <p>
-        Two new options, "style=break" and "style=attach", have been added for Allman and Java bracket styles 
+        Two new options, "style=break" and "style=attach", have been added for Allman and Java bracket styles
         respectively.</p>
 
     <h4>Other Changes</h4>
@@ -399,7 +399,7 @@
         is no change necessary to the input. Otherwise, check the documentation for the new codes.</p>
     <p>
         The --style=linux has been changed to ALWAYS use a minimum conditional indent of one-half the indent length. This
-        is in the style definition and cannot be changed. If you do not want this setting use the K&amp;R style 
+        is in the style definition and cannot be changed. If you do not want this setting use the K&amp;R style
         instead.</p>
     <p>
         The MFC macros BEGIN_DISPATCH_MAP, BEGIN_EVENT_MAP, and BEGIN_PROPPAGEIDS are now formatted.</p>
@@ -518,7 +518,7 @@
         should result in a noticeable speed improvement.</p>
     <p>
         Checks for the maximum in-statement indent have been fixed. The indent for some long continuation lines may be
-        decreased. If you want the previous indentation, increase the &#8209;&#8209;max&#8209;in&#8209;statement 
+        decreased. If you want the previous indentation, increase the &#8209;&#8209;max&#8209;in&#8209;statement
         option.</p>
     <p>
         Occasionally, someone will use Artistic Style to format a file encoded with UTF-16 or UTF-32 bit encoding. These
@@ -529,7 +529,7 @@
         of Unicode encodings", "Compatibility issues".</p>
     <p>
         The Artistic Style documentation has been changed to include a new "Padding Options" section. The padding options
-        were previously in the "Formatting Options" section. This was done to allow space for additional options in 
+        were previously in the "Formatting Options" section. This was done to allow space for additional options in
         GUIs.</p>
     <p>
         The Scripts page has a couple of new scripts, including a "clean" script in python.</p>
@@ -669,7 +669,7 @@
         and Emacs does not have the style. <strong>Artistic Style uses an extra indent for switch blocks and C++ class blocks
             for both Whitesmith and Banner styles.</strong> This provides the best appearance in defining the style. If
         a different format is wanted, use the individual options instead of the predefined style. You can try indent&#8209;brackets,
-        indent&#8209;classes, and indent&#8209;swiches on a class or switch block to see the results.</p>
+        indent&#8209;classes, and indent&#8209;switches on a class or switch block to see the results.</p>
     <p>
         The GNU style and indent&#8209;blocks option have been changed to indent only the blocks within a function body.
         The opening bracket for namespaces and classes is no longer indented. The opening bracket for functions remains
@@ -794,13 +794,13 @@
         The OpenVMS distribution is prepared by Jim Duff, an OpenVMS Systems Specialist living in Sydney, Australia. His
         website is eight&#8209;cubed.com.</p>
     <p>
-        Thanks to Eran Ifrah and Max Horn for their contributions. Travis Robinson wrote the original C# interface 
+        Thanks to Eran Ifrah and Max Horn for their contributions. Travis Robinson wrote the original C# interface
         program.</p>
 
     <h4>Developers</h4>
 
     <p>
-        There is a new page in the Developer Information that has an example of calling Artistic Style from a C# 
+        There is a new page in the Developer Information that has an example of calling Artistic Style from a C#
         program.</p>
     <p>
         There was an omission in the peekNextLine function added in the last release which causes it to bypass empty lines.
@@ -815,7 +815,7 @@
     <p>
         The predefined style options will now override all other options. The order of entry does not matter as in previous
         versions. This will be done even if astyle_main is not used by your system. This was done by moving the checks
-        from astyle_main to ASFormatter. The procedure is in the function fixOptionVariableConflicts in 
+        from astyle_main to ASFormatter. The procedure is in the function fixOptionVariableConflicts in
         ASFormatter.</p>
     <p>
         The predefined style options now define only the bracket placement and sometimes the spaces per tab. This will
@@ -824,7 +824,7 @@
         The conflicts will be resolved by the fixOptionVariableConflicts function which is called after all options have
         been processed. All you need to do is set the options selected by the user.</p>
     <p>
-        The Artistic Style for Windows program has been updated to support the current release. It is available at 
+        The Artistic Style for Windows program has been updated to support the current release. It is available at
         jimp03.zxq.net</p>
     <p>
         I apologize for the unplanned changes this may add to your system. But Artistic Style is starting to mature as
@@ -869,7 +869,7 @@
     <p>
         When processing directories recursively it is sometimes necessary to exclude certain files or directories. This
         can be done using a new exclude (&#8209;&#8209;exclude=file&#8209;or&#8209;directory) option. There is no short
-        option. Multiple exclude statements are allowed. The Other Options section of the documentation contains the 
+        option. Multiple exclude statements are allowed. The Other Options section of the documentation contains the
         details.</p>
     <p>
         It is always a good idea to create a backup for files that have been formatted. This can cause a problem in that
@@ -964,7 +964,7 @@
         There is now a distribution package for OpenVMS thanks to Jim Duff, an OpenVMS Systems Specialist living in Sydney
         Australia. His website is at eight-cubed.com.</p>
     <p>
-        Thanks to Norbert Holzki and Siemens AG, Medical Solutions, Forchheim, Germany for testing the array 
+        Thanks to Norbert Holzki and Siemens AG, Medical Solutions, Forchheim, Germany for testing the array
         formatting.</p>
     <p>
         Thanks to Sam Cooler for testing the Mac OS X version.</p>
@@ -996,7 +996,7 @@
     <p>
         There is a sample GUI program for Windows available at http://jimp03.zxq.net/. It uses the unmodified Artistic
         Style compiled for a GUI. The source code needs some work so it is not available for now. It should work under
-        Linux using WINE. Future enhancements and platform support will depend on the response to the sample 
+        Linux using WINE. Future enhancements and platform support will depend on the response to the sample
         program.</p>
     <p>
         To support the new Artistic Style preprocessor option there are new makefiles and project files. Windows users
@@ -1024,7 +1024,7 @@
         A new option, unpad=paren, was added. This will undo the pad=paren, pad=paren-out and pad=paren-in options. It
         can be used alone or with pad=paren-out or pad=paren-in. If used alone it will unpad all parens that have been
         previously padded. If used with a paren padding option, the paren padding option will take precedence and only
-        the unnecessary padding will be removed. This will enable the paren padding to be changed in one formatting 
+        the unnecessary padding will be removed. This will enable the paren padding to be changed in one formatting
         run.</p>
     <p>
         Padding to paren headers (e.g. "if", "for", "while") was reinstated. This was done in previous releases if pad=oper

AStyle/doc/notes.html

@@ -14,6 +14,97 @@
 
     <h1>Artistic Style Release Notes</h1>
 
+    <h3>Artistic Style 3.4.12 (February 2024)</h3>
+    <ul>
+        <li>added "--pad-brackets-in" and "--pad-brackets-out" options (https://gitlab.com/saalen/astyle/-/issues/33)</li>
+        <li>fixed indentation of initializer lists (https://gitlab.com/saalen/astyle/-/issues/28)</li>
+        <li>fixed crash with "--add-braces=nested" applied to if-else blocks (https://gitlab.com/saalen/astyle/-/issues/36)</li>
+    </ul>
+
+    <h3>Artistic Style 3.4.11 (January 2024)</h3>
+
+    <ul>
+        <li>added new option "--add-braces=nested" to add braces in nested single line statements (https://gitlab.com/saalen/astyle/-/issues/27)</li>
+        <li>fix indent after double template brackets (https://gitlab.com/saalen/astyle/-/issues/28)</li>
+        <li>fix indent after dot (https://gitlab.com/saalen/astyle/-/issues/28)</li>
+        <li>"--squeeze-lines=1" is no longer default with Linux builds (#559)</li>
+        <li>add experimental GHC mode (https://gitlab.com/saalen/astyle/-/issues/31)</li>
+        <li>fix indent after raw string (https://gitlab.com/saalen/astyle/-/issues/32)</li>
+    </ul>
+
+    <h3>Artistic Style 3.4.10 (October 2023)</h3>
+
+    <ul>
+        <li>fixed missing indent in function parameter list (https://gitlab.com/saalen/astyle/-/issues/16)</li>
+    </ul>
+
+    <h3>Artistic Style 3.4.9 (October 2023)</h3>
+
+    <ul>
+        <li>applied one wording for <span style="white-space: nowrap;">Objective-C</span> in the docs</li>
+        <li>fixed more CS regressions (https://gitlab.com/saalen/astyle/-/issues/16)</li>
+        <li>fixed inserting space with combined "--pad-oper" and "--align-pointer" options (#557)</li>
+    </ul>
+
+    <h3>Artistic Style 3.4.8 (September 2023)</h3>
+
+    <ul>
+        <li>fixed lambda broken brace after auto keyword (#554)</li>
+        <li>fixed line break after comment in asm block (#226)</li>
+        <li>fixed padding of multiply operator (#126)</li>
+        <li>fixed indentation of method calls (#434)</li>
+        <li>fixed empty line after closing while block (https://gitlab.com/saalen/astyle/-/issues/18)</li>
+        <li>added outer padding for empty parens pairs (https://gitlab.com/saalen/astyle/-/issues/19) </li>
+        <li>fixed more CS regressions (https://gitlab.com/saalen/astyle/-/issues/16)</li>
+    </ul>
+
+    <h3>Artistic Style 3.4.6 (August 2023)</h3>
+
+    <ul>
+        <li>added VS2022 project files (https://gitlab.com/saalen/astyle/-/merge_requests/3)</li>
+        <li>fixed CS regressions (https://gitlab.com/saalen/astyle/-/issues/16)</li>
+        <li>added CS coalesce assignment operator (https://gitlab.com/saalen/astyle/-/issues/17)</li>
+    </ul>
+
+    <h3>Artistic Style 3.4.1 (August 2023)</h3>
+
+    <ul>
+        <li>fixed padding of &amp; following a comma (#552)</li>
+        <li>fixed indent of function declarations following access modifiers (#504)</li>
+        <li>fixed indent of C# allocation blocks (#464)</li>
+        <li>fixed indentation of comments after CS interpolation quotes (https://gitlab.com/saalen/astyle/-/issues/16)</li>
+    </ul>
+
+    <h3>Artistic Style 3.4 (June 2023)</h3>
+
+    <ul>
+        <li>fixed formatting of CS interpolation literals (https://gitlab.com/saalen/astyle/-/issues/8).</li>
+        <li>fixed false lambda recognition (https://gitlab.com/saalen/astyle/-/issues/11)</li>
+        <li>fixed indentation of member declarations (https://gitlab.com/saalen/astyle/-/issues/10)</li>
+        <li>fixed indentation of struct assignments (https://gitlab.com/saalen/astyle/-/issues/12)</li>
+        <li>added new option "--indent-lambda" to enable new lambda recognition (https://gitlab.com/saalen/astyle/-/issues/7)</li>
+        <li>added link to astyle Python distribution projects (https://gitlab.com/saalen/astyle/-/issues/6)</li>
+    </ul>
+
+    <h3>Artistic Style 3.3 (May 2023)</h3>
+
+    <ul>
+        <li>added new option "--squeeze-ws" to remove superfluous whitespace (experimental)</li>
+        <li>added new option "--squeeze-lines" to remove superfluous empty lines (experimental, #19, #22, #43, #72, #84, #93, #105, #517)</li>
+        <li>added new options "--pad-brackets" and  "--unpad-brackets" to add or remove whitespace around square brackets (experimental)</li>
+        <li>fixed indent of lambda bodies in fct calls (#121)</li>
+        <li>fixed indent of struct names including &quot;struct&quot; (#526)</li>
+        <li>fixed indent of C++11 initializer lists (#516)</li>
+        <li>fixed padding of pointers separated by comma (#537)</li>
+        <li>refactored namespace std usage</li>
+    </ul>
+
+    <h3>Artistic Style 3.2.1 (March 2023)</h3>
+
+    <ul>
+    <li>fixed struct recognition related to SF #534 (https://gitlab.com/saalen/astyle/-/issues/1)</li>
+    </ul>
+
     <h3>Artistic Style 3.2 (March 2023)</h3>
 
     <ul>
@@ -83,12 +174,12 @@
         <li>Fix indentation of compound literals in an argument list (#456).</li>
         <li>Fix indentation of trailing return type method following a constructor (#463).</li>
         <li>Fix space padding of closing brace before a dot (#468).</li>
-        <li>Fix Objective-C to allow for &quot;Extern C&quot; statements in the source files (#443, 444, 446).</li>
-        <li>Fix Objective-C to allow for method definitions without a specified return type (#447).</li>
-        <li>Fix Objective-C to allow for method definitions with multiple param types.</li>
-        <li>Fix Objective-C to replace tabbed padding with a space.</li>
-        <li>Fix Objective-C formatting of line-end comments with &quot;unpad-return-type&quot;.</li>
-        <li>Fix Objective-C &quot;align-method-colon&quot; to ignore ternary (?) operators.</li>
+        <li>Fix <span style="white-space: nowrap;">Objective-C</span> to allow for &quot;Extern C&quot; statements in the source files (#443, 444, 446).</li>
+        <li>Fix <span style="white-space: nowrap;">Objective-C</span> to allow for method definitions without a specified return type (#447).</li>
+        <li>Fix <span style="white-space: nowrap;">Objective-C</span> to allow for method definitions with multiple param types.</li>
+        <li>Fix <span style="white-space: nowrap;">Objective-C</span> to replace tabbed padding with a space.</li>
+        <li>Fix <span style="white-space: nowrap;">Objective-C</span> formatting of line-end comments with &quot;unpad-return-type&quot;.</li>
+        <li>Fix <span style="white-space: nowrap;">Objective-C</span> &quot;align-method-colon&quot; to ignore ternary (?) operators.</li>
         <li>Fix C# base class constructor indentation (#459).</li>
         <li>Fix C# indentation of method declaration containing a colon (#465)</li>
         <li>Fix C/C++ to allow &quot;interface&quot; as a non-keyword (#445).</li>
@@ -160,13 +251,13 @@
         <li>Add new option &quot;indent-continuation&quot;.</li>
         <li>Add new option &quot;pad-comma&quot; (#100).</li>
         <li>Add removing spaces before a comma (#100).</li>
-        <li>Add new Objective&#8209;C options "pad-return-type" (-xq) and "unpad-return-type" (-xr).</li>
-        <li>Add new Objective&#8209;C options "pad-param-type" (-xS) and "unpad-param-type" (-xs).</li>
+        <li>Add new <span style="white-space: nowrap;">Objective-C</span> options "pad-return-type" (-xq) and "unpad-return-type" (-xr).</li>
+        <li>Add new <span style="white-space: nowrap;">Objective-C</span> options "pad-param-type" (-xS) and "unpad-param-type" (-xs).</li>
         <li>Add formatting of C++14 single-quote digit separators (#337).</li>
         <li>Add indentation for CORBA IDL module statement (#414).</li>
         <li>Add translations for Bulgarian, Estonian, Greek, Hungarian, Norwegian, and Romanian.</li>
         <li>Remove lineend option from formatCinToCout function.</li>
-        <li>Improve align-method-colon and apply to Objective&#8209;C method calls.</li>
+        <li>Improve align-method-colon and apply to <span style="white-space: nowrap;">Objective-C</span> method calls.</li>
         <li>Improve recognition of header guards in preprocessor statements.</li>
         <li>Improve recognition of C++11 uniform initializer brackets (#381, 411, 415).</li>
         <li>Improve the processing of quoted strings and verbatim strings.</li>
@@ -191,8 +282,8 @@
         <li>Fix C# to recognize &quot;using&quot; as a header.</li>
         <li>Fix C# to always recognize &quot;forever&quot; as a header.</li>
         <li>Fix Pico style not always computing the indentation for one line blocks.</li>
-        <li>Fix indentation of Objective-C @interface statement (#333).</li>
-        <li>Fix assert error when Objective-C &quot;@&quot; is followed by whitespace.</li>
+        <li>Fix indentation of <span style="white-space: nowrap;">Objective-C</span> @interface statement (#333).</li>
+        <li>Fix assert error when <span style="white-space: nowrap;">Objective-C</span> &quot;@&quot; is followed by whitespace.</li>
         <li>Fix end of line comments for &quot;pad-method-prefix&quot; and &quot;unpad-method-prefix&quot;.</li>
         <li>Fix end of line comments for &quot;pad-method-colon&quot;.</li>
         <li>Refactoring:
@@ -287,8 +378,8 @@
     </ul>
 
     <p>
-        <strong>Previous releases are available in the <a href="http://astyle.sourceforge.net/notesArchives.html">Release
-            Notes Archives</a>.</strong></p>
+        <strong>Previous releases are available in the <a href="http://astyle.sourceforge.net/notesArchives.html">Release Notes Archives</a>.</strong>
+    </p>
 
     <p style="margin-left: -0.4in; text-align: center;">
         <a href="http://sourceforge.net/projects/astyle">

AStyle/doc/notesArchives.html

@@ -20,7 +20,7 @@
     <h3>Artistic Style 2.04&nbsp; (November 2013)</h3>
 
     <ul>
-        <li>Add new programming language Objective&#8209;C.</li>
+        <li>Add new programming language <span style="white-space: nowrap;">Objective-C</span>.</li>
         <li>Add new bracket style option "style=google" (-A14). </li>
         <li>Add new option "indent-preproc-cond" (xw) to indent preprocessor conditional statements (#118). </li>
         <li>Add new bracket modify options "attach-namespaces", "attach-classes", "attach-inlines", and "attach-extern-c".
@@ -28,9 +28,9 @@
         <li>Add new option "indent-modifiers" (-xG) to indent class access modifiers one-half indent (#130). </li>
         <li>Add new option "remove-brackets" (-xj) to remove brackets from single line conditional statements.</li>
         <li>Add new option "remove-comment-prefix" (-xp) to remove the leading '*' from multi-line comments. </li>
-        <li>Add new option "align-method-colon" (-xM) to align Objective&#8209;C method colons. </li>
-        <li>Add new option "pad-method-colon=#" (-xP#) to space pad Objective&#8209;C method colons. </li>
-        <li>Add new options "pad-method-prefix" (-xQ), and "unpad-method-prefix" (-xR) to pad the Objective&#8209;C "-" and
+        <li>Add new option "align-method-colon" (-xM) to align <span style="white-space: nowrap;">Objective-C</span> method colons. </li>
+        <li>Add new option "pad-method-colon=#" (-xP#) to space pad <span style="white-space: nowrap;">Objective-C</span> method colons. </li>
+        <li>Add new options "pad-method-prefix" (-xQ), and "unpad-method-prefix" (-xR) to pad the <span style="white-space: nowrap;">Objective-C</span> "-" and
             "+" method prefix. </li>
         <li>Add new dll entry point AStyleMainUtf16 for processing C# UTF-16 strings. </li>
         <li>Add formatting of C++11 raw string literals (#222). </li>
@@ -39,7 +39,7 @@
         <li>Improve recognition and formatting of pointers and references (#174 and other changes). </li>
         <li>Improve the recognition of block-opening brackets.</li>
         <li>Improve code using a static code analyzer (#195).</li>
-        <li>Change "max-code-length" to include Objective&#8209;C methods.</li>
+        <li>Change "max-code-length" to include <span style="white-space: nowrap;">Objective-C</span> methods.</li>
         <li>Change "indent-elseifs" and "break-blocks" to look ahead only if in command-type brackets (speed improvement).
         </li>
         <li>Fix linux bracket styles to break the opening bracket in inline function definitions (#185). </li>
@@ -876,7 +876,7 @@
         <li>Compilation under G++ 3.0 now works properly.</li>
         <li>Bug fix: Opening brackets that appear at the beginning of a line immediately after an empty line comment are now
             handled properly, and not appended as part of the line comment.</li>
-        <li>Bug fix: Brackets inside comments are now not mis-indented within the comment.</li>
+        <li>Bug fix: Brackets inside comments are properly indented within the comment.</li>
     </ul>
 
     <h3>Artistic Style 1.14.1 (2 June 2001)</h3>
@@ -1015,13 +1015,13 @@
     <h3>Artistic Style 1.11.1 (3 September 1999)</h3>
 
     <ul>
-        <li>Fixed a bug that inserted an empty line at the begining of source files.</li>
+        <li>Fixed a bug that inserted an empty line at the beginning of source files.</li>
     </ul>
 
     <h3>Artistic Style 1.11.0 (3 September 1999)</h3>
 
     <ul>
-        <li>Astyle now filters out line-feeds ('\r') before begining to parse lines. This should take care of bizarre formatting
+        <li>Astyle now filters out line-feeds ('\r') before beginning to parse lines. This should take care of bizarre formatting
             that existed when moving source files from Windows (which breaks lines with a linefeed AND newline ("\r\n") to
             unix (which breaks lines only with newlines).</li>
         <li>The "struct", "static" and "synchronized" keywords are now finally handled correctly in both the contexts of block
@@ -1088,7 +1088,7 @@
             for similarity with the new option above.</li>
         <li>Changed the short option name of the option '-<strong>-errors-to-standard-output</strong>' from '<strong>-o</strong>'
             to '<strong>-X</strong>'.</li>
-        <li>Up to now, Artistic Style always inserted a minimal indent of <strong>t</strong>wice the current selected indent
+        <li>Up to now, Artistic Style always inserted a minimal indent of <strong>twice</strong> the current selected indent
             size inside multi-line conditional headers ('if', 'while' ...), so that it would be clear where the headers end
             and the code after them begins. The current version adds the option '<strong>--min-conditional-indent=#</strong>'
             (or '<strong>-m#</strong>') that sets the absolute minimal indent between conditional headers and their multiple-line
@@ -1347,4 +1347,3 @@
 </body>
 
 </html>
-

AStyle/doc/styles.css

@@ -16,8 +16,8 @@
 
 body { background-color: white; margin: 5em 15em 5em 2em; font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; }
 
-h1 { color: mediumblue; text-align: center; font-style: italic; margin-top: 3em;  }
-h2 { color: mediumblue; text-align: center; font-size: larger; margin-top: 2em;  }
+h1 { color: mediumblue; font-style: italic; margin-top: 3em;  }
+h2 { color: mediumblue; font-size: larger; margin-top: 2em;  }
 h3 { color: mediumblue; margin-top: 2em;  }
 h4 { color: mediumblue; margin-top: 2em; }
 h5 { text-transform: uppercase }

AStyle/man/astyle.1

@@ -1,4 +1,4 @@
-.TH astyle 1 "2023-02-23" "Andre Simon" "user documentation"
+.TH astyle 1 "2024-01-19" "Andre Simon" "user documentation"
 
 .SH NAME
 astyle - C syntax indenter and formatter
@@ -9,7 +9,7 @@ astyle - C syntax indenter and formatter
 
 .SH DESCRIPTION
 .B astyle
-provides a variety of options to apply a consistent coding style to C, C++, Java or Objective C source code files.
+provides a variety of options to apply a consistent coding style to C, C++, Java or Objective-C source code files.
 .PP
 When indenting a specific file, the resulting indented file RETAINS
 the original file-name. The original pre-indented file is renamed,
@@ -239,6 +239,23 @@ Insert space padding after paren headers (e.g. 'if', 'for'...).
 Remove unnecessary space padding around parenthesis. This
 can be used in combination with the 'pad' options above.
 
+.IP "--pad-empty-paren OR -xo"
+Apply padding to empty pairs of parentheses; combine with other
+parenthesis padding options.
+
+.IP "--pad-brackets"
+Insert space padding around square brackets on both the outside
+and the inside.
+
+.IP "--pad-brackets-in"
+Insert space padding around square brackets the inside only.
+
+.IP "--pad-brackets-out"
+Insert space padding around square brackets the outside only.
+
+.IP "--unpad-brackets"
+Remove unnecessary space padding around square brackets.
+
 .IP "--delete-empty-lines OR -xe"
 Delete empty lines within a function or method.
 It will NOT delete lines added by the break-blocks options.
@@ -262,6 +279,12 @@ Attach a reference operator (&) to either
 the operator type (left), middle, or operator name (right).
 If not set, follow pointer alignment.
 
+.IP "--squeeze-lines=#"
+Remove superfluous empty lines exceeding the given number.
+
+.IP "--squeeze-ws"
+Remove superfluous whitespace.
+
 .SH  Formatting Options
 
 .IP "--break-closing-braces OR -y"
@@ -276,6 +299,7 @@ Break one line headers (e.g. 'if', 'while', 'else', ...) from a
 statement residing on the same line.
 
 .IP "--add-braces OR -j"
+.IP "--add-braces=nested (experimental)"
 Add braces to unbraced one line conditional statements.
 
 .IP "--add-one-line-braces OR -J"
@@ -336,6 +360,9 @@ Indent an Objective-C source file.
 .IP "--mode=js"
 Indent a JavaScript source file (experimental).
 
+.IP "--mode=ghc"
+Indent a GHC source file (experimental).
+
 .SH  Objective-C Options
 
 .IP "--pad-method-prefix OR -xQ"
@@ -504,6 +531,6 @@ astyle  --style=allman  --recursive  /home/project/*.cpp,*.h
 astyle --style=allman < OriginalSourceFile > BeautifiedSourceFile
 
 .SH AUTHORS
-Andre Simon <a.simon@mailbox.org>
+Andre Simon <as@andre-simon.de>
 .SH SEE ALSO
 More information at https://sourceforge.net/p/astyle/.

AStyle/sh-completion/astyle.bash

@@ -4,7 +4,7 @@ _astyle() {
     args=("${COMP_WORDS[@]}")
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="--style --indent --attach-namespaces --attach-classes --attach-inlines --attach-extern-c --attach-closing-while --indent-classes --indent-modifiers --indent-switches --indent-cases --indent-namespaces --indent-after-parens --indent-continuation --indent-labels --indent-preproc-block --indent-preproc-cond --indent-preproc-define --indent-col1-comments --min-conditional-indent --max-continuation-indent --break-blocks --pad-oper --pad-comma --pad-paren --pad-paren-out --pad-first-paren-out --pad-paren-in --pad-header --unpad-paren --delete-empty-lines --fill-empty-lines --align-pointer --align-reference --break-closing-braces --break-elseifs --break-one-line-headers --add-braces --add-one-line-braces --remove-braces --break-return-type --attach-return-type-decl --keep-one-line-blocks --keep-one-line-statements --convert-tabs --close-templates --remove-comment-prefix --max-code-length --break-after-logical mode --pad-method-prefix --unpad-method-prefix --pad-return-type --unpad-return-type --pad-param-type --unpad-param-type --align-method-colon --pad-method-colon --suffix --recursive --dry-run --exclude --ignore-exclude-errors --ignore-exclude-errors-x --errors-to-stdout --preserve-date --verbose --formatted --quiet --lineend --options --project --ascii --version --help --html --stdin --stdout"
+    opts="--style --indent --attach-namespaces --attach-classes --attach-inlines --attach-extern-c --attach-closing-while --indent-classes --indent-modifiers --indent-switches --indent-cases --indent-namespaces --indent-after-parens --indent-continuation --indent-labels --indent-preproc-block --indent-preproc-cond --indent-preproc-define --indent-col1-comments --min-conditional-indent --max-continuation-indent --break-blocks --pad-oper --pad-comma --pad-paren --pad-paren-out --pad-first-paren-out --pad-paren-in --pad-header --unpad-paren --pad-empty-paren --pad-brackets --unpad-brackets --delete-empty-lines --fill-empty-lines --align-pointer --align-reference --break-closing-braces --break-elseifs --break-one-line-headers --add-braces --add-one-line-braces --remove-braces --break-return-type --attach-return-type-decl --keep-one-line-blocks --keep-one-line-statements --convert-tabs --close-templates --remove-comment-prefix --max-code-length --break-after-logical mode --pad-method-prefix --unpad-method-prefix --pad-return-type --unpad-return-type --pad-param-type --unpad-param-type --align-method-colon --pad-method-colon --suffix --recursive --dry-run --exclude --ignore-exclude-errors --ignore-exclude-errors-x --errors-to-stdout --preserve-date --verbose --formatted --quiet --lineend --options --project --ascii --version --help --html --stdin --stdout --squeeze-lines --squeeze-ws"
 
     case "$prev" in
         --style)
@@ -79,6 +79,10 @@ _astyle() {
             COMPREPLY=($(compgen -f -- "$cur"))
             return 0
             ;;
+        --squeeze-lines)
+            COMPREPLY=($(compgen -f -- "$cur"))
+            return 0
+            ;;
     esac
 
     if [[ "$cur" = -* ]]; then

AStyle/sh-completion/astyle.fish

@@ -29,6 +29,9 @@ complete -c astyle -l pad-first-paren-out -d 'Insert space padding around first
 complete -c astyle -l pad-paren-in -d 'Insert space padding around parenthesis on the inside only'
 complete -c astyle -l pad-header -d 'Insert space padding after paren headers (e.g'
 complete -c astyle -l unpad-paren -d 'Remove unnecessary space padding around parenthesis'
+complete -c astyle -l pad-empty-paren -d 'Apply padding to empty pairs of parentheses'
+complete -c astyle -l pad-brackets -d 'Insert space padding around square brackets on both the outside and the inside (experimental)'
+complete -c astyle -l unpad-brackets -d 'Remove unnecessary space padding around square brackets (experimental)'
 complete -c astyle -l delete-empty-lines -d 'Delete empty lines within a function or method'
 complete -c astyle -l fill-empty-lines -d 'Fill empty lines with the white space of their previous lines'
 complete -c astyle -l align-pointer -xa 'type middle name' -d 'Attach a pointer or reference operator (*, &, or ^) to either the operator type (left), middle, or operator name (right)'
@@ -77,3 +80,5 @@ complete -c astyle -l help -d 'Print help message'
 complete -c astyle -l html -d 'Open the HTML help file astyle.html in the default browser'
 complete -c astyle -l stdin -r -d 'Use the file path as input to single file formatting'
 complete -c astyle -l stdout -r -d 'Use the file path as output from single file formatting'
+complete -c astyle -l squeeze-lines -r -d 'Remove superfluous empty lines exceeding the given number'
+complete -c astyle -l squeeze-ws -d 'Remove superfluous whitespace'

AStyle/sh-completion/astyle.zsh

@@ -32,6 +32,9 @@ _astyle() {
     "--pad-paren-in[Insert space padding around parenthesis on the inside only]"
     "--pad-header[Insert space padding after paren headers (e.g]"
     "--unpad-paren[Remove unnecessary space padding around parenthesis]"
+    "--pad-empty-paren[Apply padding to empty pairs of parentheses]"
+    "--pad-brackets[Insert space padding around square brackets on both the outside and the inside (experimental)]"
+    "--unpad-brackets[Remove unnecessary space padding around square brackets (experimental)]"
     "--delete-empty-lines[Delete empty lines within a function or method]"
     "--fill-empty-lines[Fill empty lines with the white space of their previous lines]"
     "--align-pointer[Attach a pointer or reference operator (*, &, or ^) to either the operator type (left), middle, or operator name (right)]: :(type middle name)"
@@ -80,6 +83,8 @@ _astyle() {
     "--html[Open the HTML help file astyle.html in the default browser]"
     "--stdin[Use the file path as input to single file formatting]: :_files"
     "--stdout[Use the file path as output from single file formatting]: :_files"
+    "--squeeze-lines[Remove superfluous empty lines exceeding the given number]: :_files"
+    "--squeeze-ws[Remove superfluous whitespace]"
   )
   _arguments -s -S \
     $options \

AStyle/sh-completion/gen-completions

@@ -34,7 +34,6 @@ parser:flag "--attach-extern-c"
 parser:flag "--attach-closing-while"
    :description "Attach closing while of do-while to the closing brace"
 
-
 parser:flag "--indent-classes"
    :description "Indent 'class' blocks so that the entire block is indented"
 
@@ -108,6 +107,18 @@ parser:flag "--pad-header"
 parser:flag "--unpad-paren"
    :description "Remove unnecessary space padding around parenthesis"
 
+parser:flag "--pad-brackets"
+   :description "Insert space padding around square brackets on both the outside and the inside."
+
+parser:flag "--pad-brackets-in"
+   :description "Insert space padding around square brackets on the inside only."
+
+parser:flag "--pad-brackets-out"
+   :description "Insert space padding around square brackets on the outside only."
+
+parser:flag "--unpad-brackets"
+   :description "Remove unnecessary space padding around square brackets (experimental)."
+
 parser:flag "--delete-empty-lines"
    :description "Delete empty lines within a function or method"
 
@@ -257,6 +268,15 @@ parser:option "--stdin"
 parser:option "--stdout"
    :description "Use the file path as output from single file formatting"
 
+parser:option "--squeeze-lines"
+   :description "Remove superfluous empty lines exceeding the given number"
+
+parser:flag "--squeeze-ws"
+   :description "Remove superfluous whitespace"
+
+parser:flag "--indent-lambda"
+   :description "Indent C++ lambda functions (experimental, broken for complex fct bodies)"
+
 local p = argparse "gen-completions"
 p:argument "shell"
    :choices {"bash", "zsh", "fish"}

AStyle/src/ASEnhancer.cpp

@@ -34,7 +34,7 @@ void ASEnhancer::init(int  _fileType,
                       bool _preprocBlockIndent,
                       bool _preprocDefineIndent,
                       bool _emptyLineFill,
-                      vector<const pair<const string, const string>* >* _indentableMacros)
+                      std::vector<const std::pair<const std::string, const std::string>* >* _indentableMacros)
 {
 	// formatting variables from ASFormatter and ASBeautifier
 	ASBase::init(_fileType);
@@ -84,7 +84,7 @@ void ASEnhancer::init(int  _fileType,
  *
  * @param line       the original formatted line will be updated if necessary.
  */
-void ASEnhancer::enhance(string& line, bool isInNamespace, bool isInPreprocessor, bool isInSQL)
+void ASEnhancer::enhance(std::string& line, bool isInNamespace, bool isInPreprocessor, bool isInSQL)
 {
 	shouldUnindentLine = true;
 	shouldUnindentComment = false;
@@ -125,7 +125,7 @@ void ASEnhancer::enhance(string& line, bool isInNamespace, bool isInPreprocessor
 	if (isInDeclareSection)
 	{
 		size_t firstText = line.find_first_not_of(" \t");
-		if (firstText == string::npos || line[firstText] != '#')
+		if (firstText == std::string::npos || line[firstText] != '#')
 			indentLine(line, 1);
 	}
 
@@ -135,7 +135,7 @@ void ASEnhancer::enhance(string& line, bool isInNamespace, bool isInPreprocessor
 	            || (namespaceIndent && isInNamespace)))
 	{
 		size_t firstText = line.find_first_not_of(" \t");
-		if (firstText == string::npos || line[firstText] != '#')
+		if (firstText == std::string::npos || line[firstText] != '#')
 			indentLine(line, 1);
 	}
 
@@ -150,7 +150,7 @@ void ASEnhancer::enhance(string& line, bool isInNamespace, bool isInPreprocessor
  *
  * @param line          a reference to the line that will be converted.
  */
-void ASEnhancer::convertForceTabIndentToSpaces(string& line) const
+void ASEnhancer::convertForceTabIndentToSpaces(std::string& line) const
 {
 	// replace tab indents with spaces
 	for (size_t i = 0; i < line.length(); i++)
@@ -171,7 +171,7 @@ void ASEnhancer::convertForceTabIndentToSpaces(string& line) const
  *
  * @param line          a reference to the line that will be converted.
  */
-void ASEnhancer::convertSpaceIndentToForceTab(string& line) const
+void ASEnhancer::convertSpaceIndentToForceTab(std::string& line) const
 {
 	assert(tabLength > 0);
 
@@ -188,7 +188,7 @@ void ASEnhancer::convertSpaceIndentToForceTab(string& line) const
  * @param caseIndex     the line index of the case statement.
  * @return              the line index of the colon.
  */
-size_t ASEnhancer::findCaseColon(const string& line, size_t caseIndex) const
+size_t ASEnhancer::findCaseColon(const std::string& line, size_t caseIndex) const
 {
 	size_t i = caseIndex;
 	bool isInQuote_ = false;
@@ -236,7 +236,7 @@ size_t ASEnhancer::findCaseColon(const string& line, size_t caseIndex) const
  * @param indent        the number of tabsets to insert.
  * @return              the number of characters inserted.
  */
-int ASEnhancer::indentLine(string& line, int indent) const
+int ASEnhancer::indentLine(std::string& line, int indent) const
 {
 	if (line.length() == 0
 	        && !emptyLineFill)
@@ -276,15 +276,15 @@ int ASEnhancer::indentLine(string& line, int indent) const
  * @param index         the current line index.
  * @return              true if a hit.
  */
-bool ASEnhancer::isBeginDeclareSectionSQL(const string& line, size_t index) const
+bool ASEnhancer::isBeginDeclareSectionSQL(const std::string& line, size_t index) const
 {
-	string word;
+	std::string word;
 	size_t hits = 0;
 	size_t i;
 	for (i = index; i < line.length(); i++)
 	{
 		i = line.find_first_not_of(" \t", i);
-		if (i == string::npos)
+		if (i == std::string::npos)
 			return false;
 		if (line[i] == ';')
 			break;
@@ -325,15 +325,15 @@ bool ASEnhancer::isBeginDeclareSectionSQL(const string& line, size_t index) cons
  * @param index         the current line index.
  * @return              true if a hit.
  */
-bool ASEnhancer::isEndDeclareSectionSQL(const string& line, size_t index) const
+bool ASEnhancer::isEndDeclareSectionSQL(const std::string& line, size_t index) const
 {
-	string word;
+	std::string word;
 	size_t hits = 0;
 	size_t i;
 	for (i = index; i < line.length(); i++)
 	{
 		i = line.find_first_not_of(" \t", i);
-		if (i == string::npos)
+		if (i == std::string::npos)
 			return false;
 		if (line[i] == ';')
 			break;
@@ -374,7 +374,7 @@ bool ASEnhancer::isEndDeclareSectionSQL(const string& line, size_t index) const
  * @return     false = one-line brace has not been reached.
  *             true  = one-line brace has been reached.
  */
-bool ASEnhancer::isOneLineBlockReached(const string& line, int startChar) const
+bool ASEnhancer::isOneLineBlockReached(const std::string& line, int startChar) const
 {
 	assert(line[startChar] == '{');
 
@@ -446,7 +446,7 @@ bool ASEnhancer::isOneLineBlockReached(const string& line, int startChar) const
  * parse characters in the current line to determine if an indent
  * or unindent is needed.
  */
-void ASEnhancer::parseCurrentLine(string& line, bool isInPreprocessor, bool isInSQL)
+void ASEnhancer::parseCurrentLine(std::string& line, bool isInPreprocessor, bool isInSQL)
 {
 	bool isSpecialChar = false;			// is a backslash escape character
 
@@ -516,7 +516,7 @@ void ASEnhancer::parseCurrentLine(string& line, bool isInPreprocessor, bool isIn
 				shouldUnindentComment = true;
 			isInComment = true;
 			size_t commentEnd = line.find("*/", i);
-			if (commentEnd == string::npos)
+			if (commentEnd == std::string::npos)
 				i = line.length() - 1;
 			else
 				i = commentEnd - 1;
@@ -537,7 +537,7 @@ void ASEnhancer::parseCurrentLine(string& line, bool isInPreprocessor, bool isIn
 			if (sw.switchBraceCount == 1 && sw.unindentCase)
 				shouldUnindentComment = true;
 			size_t commentEnd = line.find("*/", i);
-			if (commentEnd == string::npos)
+			if (commentEnd == std::string::npos)
 				i = line.length() - 1;
 			else
 				i = commentEnd - 1;
@@ -555,7 +555,7 @@ void ASEnhancer::parseCurrentLine(string& line, bool isInPreprocessor, bool isIn
 		// check for preprocessor within an event table
 		if (isInEventTable && line[i] == '#' && preprocBlockIndent)
 		{
-			string preproc;
+			std::string preproc;
 			preproc = line.substr(i + 1);
 			if (preproc.substr(0, 2) == "if") // #if, #ifdef, #ifndef)
 				eventPreprocDepth += 1;
@@ -619,7 +619,7 @@ void ASEnhancer::parseCurrentLine(string& line, bool isInPreprocessor, bool isIn
 			// bypass the entire word
 			if (isPotentialKeyword)
 			{
-				string name = getCurrentWord(line, i);
+				std::string name = getCurrentWord(line, i);
 				i += name.length() - 1;
 			}
 			continue;
@@ -637,7 +637,7 @@ void ASEnhancer::parseCurrentLine(string& line, bool isInPreprocessor, bool isIn
  * @param index         the current line index.
  * @return              the new line index.
  */
-size_t ASEnhancer::processSwitchBlock(string& line, size_t index)
+size_t ASEnhancer::processSwitchBlock(std::string& line, size_t index)
 {
 	size_t i = index;
 	bool isPotentialKeyword = isCharPotentialHeader(line, i);
@@ -712,7 +712,7 @@ size_t ASEnhancer::processSwitchBlock(string& line, size_t index)
 	}
 	if (isPotentialKeyword)
 	{
-		string name = getCurrentWord(line, i);          // bypass the entire name
+		std::string name = getCurrentWord(line, i);          // bypass the entire name
 		i += name.length() - 1;
 	}
 	return i;
@@ -726,11 +726,11 @@ size_t ASEnhancer::processSwitchBlock(string& line, size_t index)
  * @param unindent      the number of tabsets to erase.
  * @return              the number of characters erased.
  */
-int ASEnhancer::unindentLine(string& line, int unindent) const
+int ASEnhancer::unindentLine(std::string& line, int unindent) const
 {
 	size_t whitespace = line.find_first_not_of(" \t");
 
-	if (whitespace == string::npos)         // if line is blank
+	if (whitespace == std::string::npos)         // if line is blank
 		whitespace = line.length();         // must remove padding, if any
 
 	if (whitespace == 0)

AStyle/src/ASLocalizer.cpp

@@ -183,7 +183,7 @@ void ASLocalizer::setLanguageFromLCID(size_t lcid)
 
 #endif	// _WIN32
 
-string ASLocalizer::getLanguageID() const
+std::string ASLocalizer::getLanguageID() const
 // Returns the language ID in m_langID.
 {
 	return m_langID;
@@ -217,13 +217,13 @@ void ASLocalizer::setLanguageFromName(const char* langID)
 //      de_DE.iso88591@euro
 {
 	// the constants describing the format of lang_LANG locale string
-	string langStr = langID;
+	std::string langStr = langID;
 	m_langID = langStr.substr(0, 2);
 
 	// need the sublang for chinese
 	if (m_langID == "zh" && langStr[2] == '_')
 	{
-		string subLang = langStr.substr(3, 2);
+		std::string subLang = langStr.substr(3, 2);
 		if (subLang == "CN" || subLang == "SG")
 			m_subLangID = "CHS";
 		else
@@ -236,7 +236,7 @@ const char* ASLocalizer::settext(const char* textIn) const
 // Call the settext class and return the value.
 {
 	assert(m_translationClass);
-	const string stringIn = textIn;
+	const std::string stringIn = textIn;
 	return m_translationClass->translate(stringIn).c_str();
 }
 
@@ -311,22 +311,22 @@ Translation::Translation()
 	m_translationVector.reserve(translationElements);
 }
 
-void Translation::addPair(const string& english, const wstring& translated)
+void Translation::addPair(const std::string& english, const std::wstring& translated)
 // Add a string pair to the translation vector.
 {
-	pair<string, wstring> entry(english, translated);
+	std::pair<std::string, std::wstring> entry(english, translated);
 	m_translationVector.emplace_back(entry);
 	assert(m_translationVector.size() <= translationElements);
 }
 
-string Translation::convertToMultiByte(const wstring& wideStr) const
+std::string Translation::convertToMultiByte(const std::wstring& wideStr) const
 // Convert wchar_t to a multibyte string using the currently assigned locale.
 // Return an empty string if an error occurs.
 {
 	static bool msgDisplayed = false;
 	// get length of the output excluding the nullptr and validate the parameters
 	size_t mbLen = wcstombs(nullptr, wideStr.c_str(), 0);
-	if (mbLen == string::npos)
+	if (mbLen == std::string::npos)
 	{
 		if (!msgDisplayed)
 		{
@@ -336,7 +336,7 @@ string Translation::convertToMultiByte(const wstring& wideStr) const
 		return "";
 	}
 	// convert the characters
-	char* mbStr = new (nothrow) char[mbLen + 1];
+	char* mbStr = new (std::nothrow) char[mbLen + 1];
 	if (mbStr == nullptr)
 	{
 		if (!msgDisplayed)
@@ -348,16 +348,16 @@ string Translation::convertToMultiByte(const wstring& wideStr) const
 	}
 	wcstombs(mbStr, wideStr.c_str(), mbLen + 1);
 	// return the string
-	string mbTranslation = mbStr;
+	std::string mbTranslation = mbStr;
 	delete[] mbStr;
 	return mbTranslation;
 }
 
-string Translation::getTranslationString(size_t i) const
+std::string Translation::getTranslationString(size_t i) const
 // Return the translation ascii value. Used for testing.
 {
 	if (i >= m_translationVector.size())
-		return string();
+		return std::string();
 	return m_translationVector[i].first;
 }
 
@@ -367,10 +367,10 @@ size_t Translation::getTranslationVectorSize() const
 	return m_translationVector.size();
 }
 
-bool Translation::getWideTranslation(const string& stringIn, wstring& wideOut) const
+bool Translation::getWideTranslation(const std::string& stringIn, std::wstring& wideOut) const
 // Get the wide translation string. Used for testing.
 {
-	for (const pair<string, wstring>& translation : m_translationVector)
+	for (const std::pair<std::string, std::wstring>& translation : m_translationVector)
 	{
 		if (translation.first == stringIn)
 		{
@@ -383,13 +383,13 @@ bool Translation::getWideTranslation(const string& stringIn, wstring& wideOut) c
 	return false;
 }
 
-string& Translation::translate(const string& stringIn) const
+std::string& Translation::translate(const std::string& stringIn) const
 // Translate a string.
 // Return a mutable string so the method can have a "const" designation.
 // This allows "settext" to be called from a "const" method.
 {
 	m_mbTranslation.clear();
-	for (const pair<string, wstring>& translation : m_translationVector)
+	for (const std::pair<std::string, std::wstring>& translation : m_translationVector)
 	{
 		if (translation.first == stringIn)
 		{

AStyle/src/ASLocalizer.h

@@ -19,8 +19,6 @@
 
 namespace astyle {
 
-using namespace std;
-
 #ifndef ASTYLE_LIB
 
 //-----------------------------------------------------------------------------
@@ -35,7 +33,7 @@ class ASLocalizer
 public:		// functions
 	ASLocalizer();
 	virtual ~ASLocalizer();
-	string getLanguageID() const;
+	std::string getLanguageID() const;
 	const Translation* getTranslationClass() const;
 #ifdef _WIN32
 	void setLanguageFromLCID(size_t lcid);
@@ -48,8 +46,8 @@ private:	// functions
 
 private:	// variables
 	Translation* m_translationClass;// pointer to a polymorphic Translation class
-	string m_langID;				// language identifier from the locale
-	string m_subLangID;				// sub language identifier, if needed
+	std::string m_langID;				// language identifier from the locale
+	std::string m_subLangID;				// sub language identifier, if needed
 #ifdef _WIN32
 	size_t m_lcid;					// LCID of the user locale (Windows only)
 	size_t m_codepage;				// active codepage, 65001 = utf-8
@@ -63,36 +61,36 @@ private:	// variables
 class Translation
 // This base class is inherited by the language translation classes.
 // Polymorphism is used to call the correct language translator.
-// This class contains the translation vector and settext translation method.
-// The language vector is built by the language sub classes.
+// This class contains the translation std::vector and settext translation method.
+// The language std::vector is built by the language sub classes.
 // NOTE: This class must have virtual methods for typeid() to work.
 //       typeid() is used by AStyleTestI18n_Localizer.cpp.
 {
 public:
 	Translation();
 	virtual ~Translation() = default;
-	string convertToMultiByte(const wstring& wideStr) const;
-	string getTranslationString(size_t i) const;
+	std::string convertToMultiByte(const std::wstring& wideStr) const;
+	std::string getTranslationString(size_t i) const;
 	size_t getTranslationVectorSize() const;
-	bool getWideTranslation(const string& stringIn, wstring& wideOut) const;
-	string& translate(const string& stringIn) const;
+	bool getWideTranslation(const std::string& stringIn, std::wstring& wideOut) const;
+	std::string& translate(const std::string& stringIn) const;
 
 protected:
-	void addPair(const string& english, const wstring& translated);
+	void addPair(const std::string& english, const std::wstring& translated);
 	// variables
-	vector<pair<string, wstring> > m_translationVector;
+	std::vector<std::pair<std::string, std::wstring> > m_translationVector;
 
 private:
 	// the number of translation pairs added a constructor
 	static const size_t translationElements = 30;	// need static for vs2013
-	// the translated string
-	mutable string m_mbTranslation;
+	// the translated std::string
+	mutable std::string m_mbTranslation;
 };
 
 //----------------------------------------------------------------------------
 // Translation classes
 // One class for each language.
-// These classes have only a constructor which builds the language vector.
+// These classes have only a constructor which builds the language std::vector.
 //----------------------------------------------------------------------------
 
 class Bulgarian : public Translation

AStyle/src/ASResource.cpp

@@ -16,159 +16,161 @@
 
 namespace astyle {
 //
-const string ASResource::_AS_EXCEPT = string("__except");
-const string ASResource::_AS_FINALLY = string("__finally");
-const string ASResource::_AS_TRY = string("__try");
-const string ASResource::AS_ADD = string("add");
-const string ASResource::AS_AUTO = string("auto");
-const string ASResource::AS_AUTORELEASEPOOL = string("autoreleasepool");
-const string ASResource::AS_CASE = string("case");
-const string ASResource::AS_CATCH = string("catch");
-const string ASResource::AS_CLASS = string("class");
-const string ASResource::AS_CONST = string("const");
-const string ASResource::AS_CONST_CAST = string("const_cast");
-const string ASResource::AS_DEFAULT = string("default");
-const string ASResource::AS_DELEGATE = string("delegate");
-const string ASResource::AS_DELETE = string("delete");
-const string ASResource::AS_DO = string("do");
-const string ASResource::AS_DYNAMIC_CAST = string("dynamic_cast");
-const string ASResource::AS_ELSE = string("else");
-const string ASResource::AS_END = string("end");
-const string ASResource::AS_ENUM = string("enum");
-const string ASResource::AS_EXTERN = string("extern");
-const string ASResource::AS_FINAL = string("final");
-const string ASResource::AS_FINALLY = string("finally");
-const string ASResource::AS_FIXED = string("fixed");
-const string ASResource::AS_FOR = string("for");
-const string ASResource::AS_FOREACH = string("foreach");
-const string ASResource::AS_FOREVER = string("forever");
-const string ASResource::AS_GET = string("get");
-const string ASResource::AS_IF = string("if");
-const string ASResource::AS_INTERFACE = string("interface");
-const string ASResource::AS_INTERRUPT = string("interrupt");
-const string ASResource::AS_LET = string("let");
-const string ASResource::AS_LOCK = string("lock");
-const string ASResource::AS_MODULE = string("module");	// CORBA IDL module definition
-const string ASResource::AS_NAMESPACE = string("namespace");
-const string ASResource::AS_NEW = string("new");
-const string ASResource::AS_NOEXCEPT = string("noexcept");
-const string ASResource::AS_NS_DURING = string("NS_DURING");
-const string ASResource::AS_NS_HANDLER = string("NS_HANDLER");
-const string ASResource::AS_OPERATOR = string("operator");
-const string ASResource::AS_OVERRIDE = string("override");
-const string ASResource::AS_PRIVATE = string("private");
-const string ASResource::AS_PROTECTED = string("protected");
-const string ASResource::AS_PUBLIC = string("public");
-const string ASResource::AS_QFOREACH = string("Q_FOREACH");
-const string ASResource::AS_QFOREVER = string("Q_FOREVER");
-const string ASResource::AS_REINTERPRET_CAST = string("reinterpret_cast");
-const string ASResource::AS_REMOVE = string("remove");
-const string ASResource::AS_SEALED = string("sealed");
-const string ASResource::AS_SELECTOR = string("selector");
-const string ASResource::AS_SET = string("set");
-const string ASResource::AS_STATIC = string("static");
-const string ASResource::AS_STATIC_CAST = string("static_cast");
-const string ASResource::AS_STRUCT = string("struct");
-const string ASResource::AS_TYPEDEF_STRUCT = string("typedef struct");
-const string ASResource::AS_SWITCH = string("switch");
-const string ASResource::AS_SYNCHRONIZED = string("synchronized");
-const string ASResource::AS_TEMPLATE = string("template");
-const string ASResource::AS_THROW = string("throw");
-const string ASResource::AS_THROWS = string("throws");
-const string ASResource::AS_TRY = string("try");
-const string ASResource::AS_UNCHECKED = string("unchecked");
-const string ASResource::AS_UNION = string("union");
-const string ASResource::AS_UNSAFE = string("unsafe");
-const string ASResource::AS_USING = string("using");
-const string ASResource::AS_VOLATILE = string("volatile");
-const string ASResource::AS_WHERE = string("where");
-const string ASResource::AS_WHILE = string("while");
+const std::string ASResource::_AS_EXCEPT = std::string("__except");
+const std::string ASResource::_AS_FINALLY = std::string("__finally");
+const std::string ASResource::_AS_TRY = std::string("__try");
+const std::string ASResource::AS_ADD = std::string("add");
+const std::string ASResource::AS_AUTO = std::string("auto");
+const std::string ASResource::AS_AUTORELEASEPOOL = std::string("autoreleasepool");
+const std::string ASResource::AS_CASE = std::string("case");
+const std::string ASResource::AS_CATCH = std::string("catch");
+const std::string ASResource::AS_CLASS = std::string("class");
+const std::string ASResource::AS_CONST = std::string("const");
+const std::string ASResource::AS_CONST_CAST = std::string("const_cast");
+const std::string ASResource::AS_DEFAULT = std::string("default");
+const std::string ASResource::AS_DELEGATE = std::string("delegate");
+const std::string ASResource::AS_DELETE = std::string("delete");
+const std::string ASResource::AS_DO = std::string("do");
+const std::string ASResource::AS_DYNAMIC_CAST = std::string("dynamic_cast");
+const std::string ASResource::AS_ELSE = std::string("else");
+const std::string ASResource::AS_END = std::string("end");
+const std::string ASResource::AS_ENUM = std::string("enum");
+const std::string ASResource::AS_EXTERN = std::string("extern");
+const std::string ASResource::AS_FINAL = std::string("final");
+const std::string ASResource::AS_FINALLY = std::string("finally");
+const std::string ASResource::AS_FIXED = std::string("fixed");
+const std::string ASResource::AS_FOR = std::string("for");
+const std::string ASResource::AS_FOREACH = std::string("foreach");
+const std::string ASResource::AS_FOREVER = std::string("forever");
+const std::string ASResource::AS_GET = std::string("get");
+const std::string ASResource::AS_IF = std::string("if");
+const std::string ASResource::AS_INTERFACE = std::string("interface");
+const std::string ASResource::AS_INTERRUPT = std::string("interrupt");
+const std::string ASResource::AS_LET = std::string("let");
+const std::string ASResource::AS_LOCK = std::string("lock");
+const std::string ASResource::AS_MODULE = std::string("module");	// CORBA IDL module definition
+const std::string ASResource::AS_NAMESPACE = std::string("namespace");
+const std::string ASResource::AS_NEW = std::string("new");
+const std::string ASResource::AS_NOEXCEPT = std::string("noexcept");
+const std::string ASResource::AS_NS_DURING = std::string("NS_DURING");
+const std::string ASResource::AS_NS_HANDLER = std::string("NS_HANDLER");
+const std::string ASResource::AS_OPERATOR = std::string("operator");
+const std::string ASResource::AS_OVERRIDE = std::string("override");
+const std::string ASResource::AS_PRIVATE = std::string("private");
+const std::string ASResource::AS_PROTECTED = std::string("protected");
+const std::string ASResource::AS_PUBLIC = std::string("public");
+const std::string ASResource::AS_QFOREACH = std::string("Q_FOREACH");
+const std::string ASResource::AS_QFOREVER = std::string("Q_FOREVER");
+const std::string ASResource::AS_REINTERPRET_CAST = std::string("reinterpret_cast");
+const std::string ASResource::AS_REMOVE = std::string("remove");
+const std::string ASResource::AS_SEALED = std::string("sealed");
+const std::string ASResource::AS_SELECTOR = std::string("selector");
+const std::string ASResource::AS_SET = std::string("set");
+const std::string ASResource::AS_STATIC = std::string("static");
+const std::string ASResource::AS_STATIC_CAST = std::string("static_cast");
+const std::string ASResource::AS_STRUCT = std::string("struct");
+const std::string ASResource::AS_TYPEDEF_STRUCT = std::string("typedef struct");
+const std::string ASResource::AS_SWITCH = std::string("switch");
+const std::string ASResource::AS_SYNCHRONIZED = std::string("synchronized");
+const std::string ASResource::AS_TEMPLATE = std::string("template");
+const std::string ASResource::AS_THROW = std::string("throw");
+const std::string ASResource::AS_THROWS = std::string("throws");
+const std::string ASResource::AS_TRY = std::string("try");
+const std::string ASResource::AS_UNCHECKED = std::string("unchecked");
+const std::string ASResource::AS_UNION = std::string("union");
+const std::string ASResource::AS_UNSAFE = std::string("unsafe");
+const std::string ASResource::AS_USING = std::string("using");
+const std::string ASResource::AS_VOLATILE = std::string("volatile");
+const std::string ASResource::AS_WHERE = std::string("where");
+const std::string ASResource::AS_WHILE = std::string("while");
 
-const string ASResource::AS_ASM = string("asm");
-const string ASResource::AS__ASM__ = string("__asm__");
-const string ASResource::AS_MS_ASM = string("_asm");
-const string ASResource::AS_MS__ASM = string("__asm");
+const std::string ASResource::AS_ASM = std::string("asm");
+const std::string ASResource::AS__ASM__ = std::string("__asm__");
+const std::string ASResource::AS_MS_ASM = std::string("_asm");
+const std::string ASResource::AS_MS__ASM = std::string("__asm");
 
-const string ASResource::AS_BAR_DEFINE = string("#define");
-const string ASResource::AS_BAR_INCLUDE = string("#include");
-const string ASResource::AS_BAR_IF = string("#if");
-const string ASResource::AS_BAR_EL = string("#el");
-const string ASResource::AS_BAR_ENDIF = string("#endif");
+const std::string ASResource::AS_BAR_DEFINE = std::string("#define");
+const std::string ASResource::AS_BAR_INCLUDE = std::string("#include");
+const std::string ASResource::AS_BAR_IF = std::string("#if");
+const std::string ASResource::AS_BAR_EL = std::string("#el");
+const std::string ASResource::AS_BAR_ENDIF = std::string("#endif");
 
-const string ASResource::AS_OPEN_PAREN = string("(");
-const string ASResource::AS_CLOSE_PAREN = string(")");
-const string ASResource::AS_OPEN_BRACE = string("{");
-const string ASResource::AS_CLOSE_BRACE = string("}");
-const string ASResource::AS_OPEN_LINE_COMMENT = string("//");
-const string ASResource::AS_OPEN_COMMENT = string("/*");
-const string ASResource::AS_CLOSE_COMMENT = string("*/");
+const std::string ASResource::AS_OPEN_PAREN = std::string("(");
+const std::string ASResource::AS_CLOSE_PAREN = std::string(")");
+const std::string ASResource::AS_OPEN_BRACE = std::string("{");
+const std::string ASResource::AS_CLOSE_BRACE = std::string("}");
+const std::string ASResource::AS_OPEN_LINE_COMMENT = std::string("//");
+const std::string ASResource::AS_OPEN_COMMENT = std::string("/*");
+const std::string ASResource::AS_CLOSE_COMMENT = std::string("*/");
 
-const string ASResource::AS_ASSIGN = string("=");
-const string ASResource::AS_PLUS_ASSIGN = string("+=");
-const string ASResource::AS_MINUS_ASSIGN = string("-=");
-const string ASResource::AS_MULT_ASSIGN = string("*=");
-const string ASResource::AS_DIV_ASSIGN = string("/=");
-const string ASResource::AS_MOD_ASSIGN = string("%=");
-const string ASResource::AS_OR_ASSIGN = string("|=");
-const string ASResource::AS_AND_ASSIGN = string("&=");
-const string ASResource::AS_XOR_ASSIGN = string("^=");
-const string ASResource::AS_GR_GR_ASSIGN = string(">>=");
-const string ASResource::AS_LS_LS_ASSIGN = string("<<=");
-const string ASResource::AS_GR_GR_GR_ASSIGN = string(">>>=");
-const string ASResource::AS_LS_LS_LS_ASSIGN = string("<<<=");
-const string ASResource::AS_GCC_MIN_ASSIGN = string("<?");
-const string ASResource::AS_GCC_MAX_ASSIGN = string(">?");
+const std::string ASResource::AS_ASSIGN = std::string("=");
+const std::string ASResource::AS_PLUS_ASSIGN = std::string("+=");
+const std::string ASResource::AS_MINUS_ASSIGN = std::string("-=");
+const std::string ASResource::AS_MULT_ASSIGN = std::string("*=");
+const std::string ASResource::AS_DIV_ASSIGN = std::string("/=");
+const std::string ASResource::AS_MOD_ASSIGN = std::string("%=");
+const std::string ASResource::AS_OR_ASSIGN = std::string("|=");
+const std::string ASResource::AS_AND_ASSIGN = std::string("&=");
+const std::string ASResource::AS_XOR_ASSIGN = std::string("^=");
+const std::string ASResource::AS_GR_GR_ASSIGN = std::string(">>=");
+const std::string ASResource::AS_LS_LS_ASSIGN = std::string("<<=");
+const std::string ASResource::AS_GR_GR_GR_ASSIGN = std::string(">>>=");
+const std::string ASResource::AS_LS_LS_LS_ASSIGN = std::string("<<<=");
+const std::string ASResource::AS_GCC_MIN_ASSIGN = std::string("<?");
+const std::string ASResource::AS_GCC_MAX_ASSIGN = std::string(">?");
 
-const string ASResource::AS_RETURN = string("return");
-const string ASResource::AS_CIN = string("cin");
-const string ASResource::AS_COUT = string("cout");
-const string ASResource::AS_CERR = string("cerr");
+const std::string ASResource::AS_RETURN = std::string("return");
+const std::string ASResource::AS_CIN = std::string("cin");
+const std::string ASResource::AS_COUT = std::string("cout");
+const std::string ASResource::AS_CERR = std::string("cerr");
 
-const string ASResource::AS_EQUAL = string("==");
-const string ASResource::AS_PLUS_PLUS = string("++");
-const string ASResource::AS_MINUS_MINUS = string("--");
-const string ASResource::AS_NOT_EQUAL = string("!=");
-const string ASResource::AS_GR_EQUAL = string(">=");
-const string ASResource::AS_GR_GR = string(">>");
-const string ASResource::AS_GR_GR_GR = string(">>>");
-const string ASResource::AS_LS_EQUAL = string("<=");
-const string ASResource::AS_LS_LS = string("<<");
-const string ASResource::AS_LS_LS_LS = string("<<<");
-const string ASResource::AS_QUESTION_QUESTION = string("??");
-const string ASResource::AS_LAMBDA = string("=>");            // C# lambda expression arrow
-const string ASResource::AS_ARROW = string("->");
-const string ASResource::AS_AND = string("&&");
-const string ASResource::AS_OR = string("||");
-const string ASResource::AS_SCOPE_RESOLUTION = string("::");
-const string ASResource::AS_SPACESHIP = string("<=>");
-const string ASResource::AS_EQUAL_JS = string("===");
+const std::string ASResource::AS_EQUAL = std::string("==");
+const std::string ASResource::AS_PLUS_PLUS = std::string("++");
+const std::string ASResource::AS_MINUS_MINUS = std::string("--");
+const std::string ASResource::AS_NOT_EQUAL = std::string("!=");
+const std::string ASResource::AS_GR_EQUAL = std::string(">=");
+const std::string ASResource::AS_GR_GR = std::string(">>");
+const std::string ASResource::AS_GR_GR_GR = std::string(">>>");
+const std::string ASResource::AS_LS_EQUAL = std::string("<=");
+const std::string ASResource::AS_LS_LS = std::string("<<");
+const std::string ASResource::AS_LS_LS_LS = std::string("<<<");
+const std::string ASResource::AS_QUESTION_QUESTION = std::string("??");
+const std::string ASResource::AS_LAMBDA = std::string("=>");            // C# lambda expression arrow
+const std::string ASResource::AS_ARROW = std::string("->");
+const std::string ASResource::AS_AND = std::string("&&");
+const std::string ASResource::AS_OR = std::string("||");
+const std::string ASResource::AS_SCOPE_RESOLUTION = std::string("::");
+const std::string ASResource::AS_SPACESHIP = std::string("<=>");
+const std::string ASResource::AS_EQUAL_JS = std::string("===");
+const std::string ASResource::AS_COALESCE_CS = std::string("?" "?="); // Avoid trigraph
 
-const string ASResource::AS_PLUS = string("+");
-const string ASResource::AS_MINUS = string("-");
-const string ASResource::AS_MULT = string("*");
-const string ASResource::AS_DIV = string("/");
-const string ASResource::AS_MOD = string("%");
-const string ASResource::AS_GR = string(">");
-const string ASResource::AS_LS = string("<");
-const string ASResource::AS_NOT = string("!");
-const string ASResource::AS_BIT_OR = string("|");
-const string ASResource::AS_BIT_AND = string("&");
-const string ASResource::AS_BIT_NOT = string("~");
-const string ASResource::AS_BIT_XOR = string("^");
-const string ASResource::AS_QUESTION = string("?");
-const string ASResource::AS_COLON = string(":");
-const string ASResource::AS_COMMA = string(",");
-const string ASResource::AS_SEMICOLON = string(";");
+const std::string ASResource::AS_PLUS = std::string("+");
+const std::string ASResource::AS_MINUS = std::string("-");
+const std::string ASResource::AS_MULT = std::string("*");
+const std::string ASResource::AS_DIV = std::string("/");
+const std::string ASResource::AS_MOD = std::string("%");
+const std::string ASResource::AS_GR = std::string(">");
+const std::string ASResource::AS_LS = std::string("<");
+const std::string ASResource::AS_NOT = std::string("!");
+const std::string ASResource::AS_BIT_OR = std::string("|");
+const std::string ASResource::AS_BIT_AND = std::string("&");
+const std::string ASResource::AS_BIT_NOT = std::string("~");
+const std::string ASResource::AS_BIT_XOR = std::string("^");
+const std::string ASResource::AS_QUESTION = std::string("?");
+const std::string ASResource::AS_COLON = std::string(":");
+const std::string ASResource::AS_COMMA = std::string(",");
+const std::string ASResource::AS_DOT = std::string(".");
+const std::string ASResource::AS_SEMICOLON = std::string(";");
 
 
 /**
  * Sort comparison function.
  * Compares the length of the value of pointers in the vectors.
- * The LONGEST strings will be first in the vector.
+ * The LONGEST std::strings will be first in the vector.
  *
- * @param a and b, the string pointers to be compared.
+ * @param a and b, the std::string pointers to be compared.
  */
-bool sortOnLength(const string* a, const string* b)
+bool sortOnLength(const std::string* a, const std::string* b)
 {
 	return (*a).length() > (*b).length();
 }
@@ -177,9 +179,9 @@ bool sortOnLength(const string* a, const string* b)
  * Sort comparison function.
  * Compares the value of pointers in the vectors.
  *
- * @param a and b, the string pointers to be compared.
+ * @param a and b, the std::string pointers to be compared.
  */
-bool sortOnName(const string* a, const string* b)
+bool sortOnName(const std::string* a, const std::string* b)
 {
 	return *a < *b;
 }
@@ -190,7 +192,7 @@ bool sortOnName(const string* a, const string* b)
  *
  * @param assignmentOperators   a reference to the vector to be built.
  */
-void ASResource::buildAssignmentOperators(vector<const string*>* assignmentOperators)
+void ASResource::buildAssignmentOperators(std::vector<const std::string*>* assignmentOperators)
 {
 	const size_t elements = 15;
 	assignmentOperators->reserve(elements);
@@ -223,7 +225,7 @@ void ASResource::buildAssignmentOperators(vector<const string*>* assignmentOpera
  *
  * @param castOperators     a reference to the vector to be built.
  */
-void ASResource::buildCastOperators(vector<const string*>* castOperators)
+void ASResource::buildCastOperators(std::vector<const std::string*>* castOperators)
 {
 	const size_t elements = 5;
 	castOperators->reserve(elements);
@@ -243,7 +245,7 @@ void ASResource::buildCastOperators(vector<const string*>* castOperators)
  *
  * @param headers       a reference to the vector to be built.
  */
-void ASResource::buildHeaders(vector<const string*>* headers, int fileType, bool beautifier)
+void ASResource::buildHeaders(std::vector<const std::string*>* headers, int fileType, bool beautifier)
 {
 	const size_t elements = 25;
 	headers->reserve(elements);
@@ -310,11 +312,9 @@ void ASResource::buildHeaders(vector<const string*>* headers, int fileType, bool
  *
  * @param indentableHeaders     a reference to the vector to be built.
  */
-void ASResource::buildIndentableHeaders(vector<const string*>* indentableHeaders)
+void ASResource::buildIndentableHeaders(std::vector<const std::string*>* indentableHeaders)
 {
 	indentableHeaders->emplace_back(&AS_RETURN);
-
-//	sort(indentableHeaders->begin(), indentableHeaders->end(), sortOnName);
 }
 
 /**
@@ -323,13 +323,13 @@ void ASResource::buildIndentableHeaders(vector<const string*>* indentableHeaders
 *
 * @param indentableMacros       a reference to the vector to be built.
 */
-void ASResource::buildIndentableMacros(vector<const pair<const string, const string>* >* indentableMacros)
+void ASResource::buildIndentableMacros(std::vector<const std::pair<const std::string, const std::string>* >* indentableMacros)
 {
 	const size_t elements = 10;
 	indentableMacros->reserve(elements);
 
 	// the pairs must be retained in memory because of pair pointers
-	using macro_pair = pair<const string, const string>;
+	using macro_pair = std::pair<const std::string, const std::string>;
 	static const macro_pair macros[] =
 	{
 		// wxWidgets
@@ -354,9 +354,9 @@ void ASResource::buildIndentableMacros(vector<const pair<const string, const str
  *
  * @param nonAssignmentOperators       a reference to the vector to be built.
  */
-void ASResource::buildNonAssignmentOperators(vector<const string*>* nonAssignmentOperators)
+void ASResource::buildNonAssignmentOperators(std::vector<const std::string*>* nonAssignmentOperators)
 {
-	const size_t elements = 15;
+	const size_t elements = 16;
 	nonAssignmentOperators->reserve(elements);
 
 	nonAssignmentOperators->emplace_back(&AS_EQUAL);
@@ -373,6 +373,7 @@ void ASResource::buildNonAssignmentOperators(vector<const string*>* nonAssignmen
 	nonAssignmentOperators->emplace_back(&AS_AND);
 	nonAssignmentOperators->emplace_back(&AS_OR);
 	nonAssignmentOperators->emplace_back(&AS_LAMBDA);
+	nonAssignmentOperators->emplace_back(&AS_DOT);
 
 	assert(nonAssignmentOperators->size() < elements);
 	sort(nonAssignmentOperators->begin(), nonAssignmentOperators->end(), sortOnLength);
@@ -383,9 +384,9 @@ void ASResource::buildNonAssignmentOperators(vector<const string*>* nonAssignmen
  * Used by BOTH ASFormatter.cpp and ASBeautifier.cpp.
  * NOTE: Non-paren headers should also be included in the headers vector.
  *
- * @param nonParenHeaders       a reference to the vector to be built.
+ * @param nonParenHeaders       a reference to the std::vector to be built.
  */
-void ASResource::buildNonParenHeaders(vector<const string*>* nonParenHeaders, int fileType, bool beautifier)
+void ASResource::buildNonParenHeaders(std::vector<const std::string*>* nonParenHeaders, int fileType, bool beautifier)
 {
 	const size_t elements = 20;
 	nonParenHeaders->reserve(elements);
@@ -440,7 +441,7 @@ void ASResource::buildNonParenHeaders(vector<const string*>* nonParenHeaders, in
  *
  * @param operators             a reference to the vector to be built.
  */
-void ASResource::buildOperators(vector<const string*>* operators, int fileType)
+void ASResource::buildOperators(std::vector<const std::string*>* operators, int fileType)
 {
 	const size_t elements = 50;
 	operators->reserve(elements);
@@ -498,6 +499,10 @@ void ASResource::buildOperators(vector<const string*>* operators, int fileType)
 	{
 		operators->emplace_back(&AS_EQUAL_JS);
 	}
+	if (fileType == SHARP_TYPE)
+    {
+    	operators->emplace_back(&AS_COALESCE_CS);
+    }
 	assert(operators->size() < elements);
 	sort(operators->begin(), operators->end(), sortOnLength);
 }
@@ -509,7 +514,7 @@ void ASResource::buildOperators(vector<const string*>* operators, int fileType)
  *
  * @param preBlockStatements        a reference to the vector to be built.
  */
-void ASResource::buildPreBlockStatements(vector<const string*>* preBlockStatements, int fileType)
+void ASResource::buildPreBlockStatements(std::vector<const std::string*>* preBlockStatements, int fileType)
 {
 	const size_t elements = 10;
 	preBlockStatements->reserve(elements);
@@ -549,7 +554,7 @@ void ASResource::buildPreBlockStatements(vector<const string*>* preBlockStatemen
  * the closing paren and the opening brace.
  * e.g. in "void foo() const {}", "const" is a preCommandHeader.
  */
-void ASResource::buildPreCommandHeaders(vector<const string*>* preCommandHeaders, int fileType)
+void ASResource::buildPreCommandHeaders(std::vector<const std::string*>* preCommandHeaders, int fileType)
 {
 	const size_t elements = 10;
 	preCommandHeaders->reserve(elements);
@@ -592,7 +597,7 @@ void ASResource::buildPreCommandHeaders(vector<const string*>* preCommandHeaders
  *
  * @param preDefinitionHeaders      a reference to the vector to be built.
  */
-void ASResource::buildPreDefinitionHeaders(vector<const string*>* preDefinitionHeaders, int fileType)
+void ASResource::buildPreDefinitionHeaders(std::vector<const std::string*>* preDefinitionHeaders, int fileType)
 {
 	const size_t elements = 10;
 	preDefinitionHeaders->reserve(elements);
@@ -626,15 +631,15 @@ void ASResource::buildPreDefinitionHeaders(vector<const string*>* preDefinitionH
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 // check if a specific line position contains a header.
-const string* ASBase::findHeader(const string& line, int i,
-                                 const vector<const string*>* possibleHeaders) const
+const std::string* ASBase::findHeader(const std::string& line, int i,
+                                      const std::vector<const std::string*>* possibleHeaders) const
 {
 	assert(isCharPotentialHeader(line, i));
 	// check the word
 	size_t maxHeaders = possibleHeaders->size();
 	for (size_t p = 0; p < maxHeaders; p++)
 	{
-		const string* header = (*possibleHeaders)[p];
+		const std::string* header = (*possibleHeaders)[p];
 		const size_t wordEnd = i + header->length();
 		if (wordEnd > line.length())
 			continue;
@@ -658,7 +663,7 @@ const string* ASBase::findHeader(const string& line, int i,
 		if ((header == &AS_GET
 		        || header == &AS_SET
 		        || header == &AS_DEFAULT)
-		        && (peekChar == ';' || peekChar == '(' || peekChar == '='))
+		        && (peekChar == '.' || peekChar == ';' || peekChar == '(' || peekChar == '='))
 			break;
 		return header;
 	}
@@ -666,7 +671,7 @@ const string* ASBase::findHeader(const string& line, int i,
 }
 
 // check if a specific line position contains a keyword.
-bool ASBase::findKeyword(const string& line, int i, const string& keyword) const
+bool ASBase::findKeyword(const std::string& line, int i, const std::string& keyword) const
 {
 	assert(isCharPotentialHeader(line, i));
 	// check the word
@@ -678,19 +683,25 @@ bool ASBase::findKeyword(const string& line, int i, const string& keyword) const
 		return false;
 	// check that this is not part of a longer word
 	if (wordEnd == line.length())
+	{
+		//std::cerr << "findKeyword t1 \n";
 		return true;
+	}
+
 	if (isLegalNameChar(line[wordEnd]))
 		return false;
 	// is not a keyword if part of a definition
 	const char peekChar = peekNextChar(line, (int) wordEnd - 1);
 	if (peekChar == ',' || peekChar == ')')
 		return false;
+
+	//std::cerr << "findKeyword t2 \n";
 	return true;
 }
 
 // check if a specific line position contains an operator.
-const string* ASBase::findOperator(const string& line, int i,
-                                   const vector<const string*>* possibleOperators) const
+const std::string* ASBase::findOperator(const std::string& line, int i,
+                                        const std::vector<const std::string*>* possibleOperators) const
 {
 	assert(isCharPotentialOperator(line[i]));
 	// find the operator in the vector
@@ -710,14 +721,16 @@ const string* ASBase::findOperator(const string& line, int i,
 
 // get the current word on a line
 // index must point to the beginning of the word
-string ASBase::getCurrentWord(const string& line, size_t index) const
+std::string ASBase::getCurrentWord(const std::string& line, size_t index) const
 {
-	assert(isCharPotentialHeader(line, index));
+	//assert(isCharPotentialHeader(line, index));
 	size_t lineLength = line.length();
 	size_t i;
 	for (i = index; i < lineLength; i++)
 	{
-		if (!isLegalNameChar(line[i]))
+		if (!isLegalNameChar(line[i])
+			|| ( (isCStyle() || isJavaStyle()) && i > index && line[i]=='.')
+			)
 			break;
 	}
 	return line.substr(index, i - index);
@@ -731,13 +744,14 @@ bool ASBase::isLegalNameChar(char ch) const
 	if ((unsigned char) ch > 127)
 		return false;
 	return (isalnum((unsigned char) ch)
-	        || ch == '.' || ch == '_'
+            || ch == '_'
+            || (!isSharpStyle() && ch == '.' )
 	        || (isJavaStyle() && ch == '$')
 	        || (isSharpStyle() && ch == '@'));  // may be used as a prefix
 }
 
 // check if a specific character can be part of a header
-bool ASBase::isCharPotentialHeader(const string& line, size_t i) const
+bool ASBase::isCharPotentialHeader(const std::string& line, size_t i) const
 {
 	assert(!isWhiteSpace(line[i]));
 	char prevCh = ' ';
@@ -773,7 +787,7 @@ bool ASBase::isDigit(char ch) const
 }
 
 // check if a specific character is a digit separator
-bool ASBase::isDigitSeparator(const string& line, int i) const
+bool ASBase::isDigitSeparator(const std::string& line, int i) const
 {
 	assert(line[i] == '\'');
 	// casting to (unsigned char) eliminates negative characters
@@ -786,11 +800,11 @@ bool ASBase::isDigitSeparator(const string& line, int i) const
 }
 
 // peek at the next unread character.
-char ASBase::peekNextChar(const string& line, int i) const
+char ASBase::peekNextChar(const std::string& line, int i) const
 {
 	char ch = ' ';
 	size_t peekNum = line.find_first_not_of(" \t", i + 1);
-	if (peekNum == string::npos)
+	if (peekNum == std::string::npos)
 		return ch;
 	ch = line[peekNum];
 	return ch;

AStyle/src/astyle.h

@@ -52,19 +52,19 @@
 	#pragma clang diagnostic ignored "-Wshorten-64-to-32"
 #endif
 
+#define ASTYLE_VERSION "3.4.12"
+
 //-----------------------------------------------------------------------------
 // astyle namespace
 //-----------------------------------------------------------------------------
 
 namespace astyle {
-//
-using namespace std;
 
 //----------------------------------------------------------------------------
 // definitions
 //----------------------------------------------------------------------------
 
-enum FileType { C_TYPE = 0, JAVA_TYPE = 1, SHARP_TYPE = 2, JS_TYPE = 3, OBJC_TYPE = 4, INVALID_TYPE = -1 };
+enum FileType { C_TYPE = 0, JAVA_TYPE = 1, SHARP_TYPE = 2, JS_TYPE = 3, OBJC_TYPE = 4, GHC_TYPE = 5, INVALID_TYPE = -1 };
 
 /* The enums below are not recognized by 'vectors' in Microsoft Visual C++
    V5 when they are part of a namespace!!!  Use Visual C++ V6 or higher.
@@ -188,13 +188,13 @@ class ASSourceIterator
 public:
 	ASSourceIterator() = default;
 	virtual ~ASSourceIterator() = default;
-	virtual streamoff getPeekStart() const = 0;
+	virtual std::streamoff getPeekStart() const = 0;
 	virtual int getStreamLength() const = 0;
 	virtual bool hasMoreLines() const = 0;
-	virtual string nextLine(bool emptyLineWasDeleted) = 0;
-	virtual string peekNextLine() = 0;
+	virtual std::string nextLine(bool emptyLineWasDeleted) = 0;
+	virtual std::string peekNextLine() = 0;
 	virtual void peekReset() = 0;
-	virtual streamoff tellg() = 0;
+	virtual std::streamoff tellg() = 0;
 };
 
 //-----------------------------------------------------------------------------
@@ -220,7 +220,7 @@ public:
 	bool hasMoreLines() const
 	{ return sourceIterator->hasMoreLines(); }
 
-	string peekNextLine()
+	std::string peekNextLine()
 	{ needReset = true; return sourceIterator->peekNextLine(); }
 };
 
@@ -232,61 +232,61 @@ public:
 class ASResource
 {
 public:
-	void buildAssignmentOperators(vector<const string*>* assignmentOperators);
-	void buildCastOperators(vector<const string*>* castOperators);
-	void buildHeaders(vector<const string*>* headers, int fileType, bool beautifier = false);
-	void buildIndentableMacros(vector<const pair<const string, const string>* >* indentableMacros);
-	void buildIndentableHeaders(vector<const string*>* indentableHeaders);
-	void buildNonAssignmentOperators(vector<const string*>* nonAssignmentOperators);
-	void buildNonParenHeaders(vector<const string*>* nonParenHeaders, int fileType, bool beautifier = false);
-	void buildOperators(vector<const string*>* operators, int fileType);
-	void buildPreBlockStatements(vector<const string*>* preBlockStatements, int fileType);
-	void buildPreCommandHeaders(vector<const string*>* preCommandHeaders, int fileType);
-	void buildPreDefinitionHeaders(vector<const string*>* preDefinitionHeaders, int fileType);
+	void buildAssignmentOperators(std::vector<const std::string*>* assignmentOperators);
+	void buildCastOperators(std::vector<const std::string*>* castOperators);
+	void buildHeaders(std::vector<const std::string*>* headers, int fileType, bool beautifier = false);
+	void buildIndentableMacros(std::vector<const std::pair<const std::string, const std::string>* >* indentableMacros);
+	void buildIndentableHeaders(std::vector<const std::string*>* indentableHeaders);
+	void buildNonAssignmentOperators(std::vector<const std::string*>* nonAssignmentOperators);
+	void buildNonParenHeaders(std::vector<const std::string*>* nonParenHeaders, int fileType, bool beautifier = false);
+	void buildOperators(std::vector<const std::string*>* operators, int fileType);
+	void buildPreBlockStatements(std::vector<const std::string*>* preBlockStatements, int fileType);
+	void buildPreCommandHeaders(std::vector<const std::string*>* preCommandHeaders, int fileType);
+	void buildPreDefinitionHeaders(std::vector<const std::string*>* preDefinitionHeaders, int fileType);
 
 public:
-	static const string AS_IF, AS_ELSE;
-	static const string AS_DO, AS_WHILE;
-	static const string AS_FOR;
-	static const string AS_SWITCH, AS_CASE, AS_DEFAULT;
-	static const string AS_TRY, AS_CATCH, AS_THROW, AS_THROWS, AS_FINALLY, AS_USING;
-	static const string _AS_TRY, _AS_FINALLY, _AS_EXCEPT;
-	static const string AS_PUBLIC, AS_PROTECTED, AS_PRIVATE;
-	static const string AS_CLASS, AS_STRUCT, AS_TYPEDEF_STRUCT, AS_UNION, AS_INTERFACE, AS_NAMESPACE;
-	static const string AS_MODULE;
-	static const string AS_END;
-	static const string AS_SELECTOR;
-	static const string AS_EXTERN, AS_ENUM;
-	static const string AS_FINAL, AS_OVERRIDE;
-	static const string AS_STATIC, AS_CONST, AS_SEALED, AS_VOLATILE, AS_NEW, AS_DELETE;
-	static const string AS_NOEXCEPT, AS_INTERRUPT, AS_AUTORELEASEPOOL;
-	static const string AS_WHERE, AS_LET, AS_SYNCHRONIZED;
-	static const string AS_OPERATOR, AS_TEMPLATE;
-	static const string AS_OPEN_PAREN, AS_CLOSE_PAREN;
-	static const string AS_OPEN_BRACE, AS_CLOSE_BRACE;
-	static const string AS_OPEN_LINE_COMMENT, AS_OPEN_COMMENT, AS_CLOSE_COMMENT;
-	static const string AS_BAR_DEFINE, AS_BAR_INCLUDE, AS_BAR_IF, AS_BAR_EL, AS_BAR_ENDIF;
-	static const string AS_AUTO, AS_RETURN;
-	static const string AS_CIN, AS_COUT, AS_CERR;
-	static const string AS_ASSIGN, AS_PLUS_ASSIGN, AS_MINUS_ASSIGN, AS_MULT_ASSIGN;
-	static const string AS_DIV_ASSIGN, AS_MOD_ASSIGN, AS_XOR_ASSIGN, AS_OR_ASSIGN, AS_AND_ASSIGN;
-	static const string AS_GR_GR_ASSIGN, AS_LS_LS_ASSIGN, AS_GR_GR_GR_ASSIGN, AS_LS_LS_LS_ASSIGN;
-	static const string AS_GCC_MIN_ASSIGN, AS_GCC_MAX_ASSIGN, AS_SPACESHIP, AS_EQUAL_JS;
-	static const string AS_EQUAL, AS_PLUS_PLUS, AS_MINUS_MINUS, AS_NOT_EQUAL, AS_GR_EQUAL;
-	static const string AS_LS_EQUAL, AS_LS_LS_LS, AS_LS_LS, AS_GR_GR_GR, AS_GR_GR;
-	static const string AS_QUESTION_QUESTION, AS_LAMBDA;
-	static const string AS_ARROW, AS_AND, AS_OR;
-	static const string AS_SCOPE_RESOLUTION;
-	static const string AS_PLUS, AS_MINUS, AS_MULT, AS_DIV, AS_MOD, AS_GR, AS_LS;
-	static const string AS_NOT, AS_BIT_XOR, AS_BIT_OR, AS_BIT_AND, AS_BIT_NOT;
-	static const string AS_QUESTION, AS_COLON, AS_SEMICOLON, AS_COMMA;
-	static const string AS_ASM, AS__ASM__, AS_MS_ASM, AS_MS__ASM;
-	static const string AS_QFOREACH, AS_QFOREVER, AS_FOREVER;
-	static const string AS_FOREACH, AS_LOCK, AS_UNSAFE, AS_FIXED;
-	static const string AS_GET, AS_SET, AS_ADD, AS_REMOVE;
-	static const string AS_DELEGATE, AS_UNCHECKED;
-	static const string AS_CONST_CAST, AS_DYNAMIC_CAST, AS_REINTERPRET_CAST, AS_STATIC_CAST;
-	static const string AS_NS_DURING, AS_NS_HANDLER;
+	static const std::string AS_IF, AS_ELSE;
+	static const std::string AS_DO, AS_WHILE;
+	static const std::string AS_FOR;
+	static const std::string AS_SWITCH, AS_CASE, AS_DEFAULT;
+	static const std::string AS_TRY, AS_CATCH, AS_THROW, AS_THROWS, AS_FINALLY, AS_USING;
+	static const std::string _AS_TRY, _AS_FINALLY, _AS_EXCEPT;
+	static const std::string AS_PUBLIC, AS_PROTECTED, AS_PRIVATE;
+	static const std::string AS_CLASS, AS_STRUCT, AS_TYPEDEF_STRUCT, AS_UNION, AS_INTERFACE, AS_NAMESPACE;
+	static const std::string AS_MODULE;
+	static const std::string AS_END;
+	static const std::string AS_SELECTOR;
+	static const std::string AS_EXTERN, AS_ENUM;
+	static const std::string AS_FINAL, AS_OVERRIDE;
+	static const std::string AS_STATIC, AS_CONST, AS_SEALED, AS_VOLATILE, AS_NEW, AS_DELETE;
+	static const std::string AS_NOEXCEPT, AS_INTERRUPT, AS_AUTORELEASEPOOL;
+	static const std::string AS_WHERE, AS_LET, AS_SYNCHRONIZED;
+	static const std::string AS_OPERATOR, AS_TEMPLATE;
+	static const std::string AS_OPEN_PAREN, AS_CLOSE_PAREN;
+	static const std::string AS_OPEN_BRACE, AS_CLOSE_BRACE;
+	static const std::string AS_OPEN_LINE_COMMENT, AS_OPEN_COMMENT, AS_CLOSE_COMMENT;
+	static const std::string AS_BAR_DEFINE, AS_BAR_INCLUDE, AS_BAR_IF, AS_BAR_EL, AS_BAR_ENDIF;
+	static const std::string AS_AUTO, AS_RETURN;
+	static const std::string AS_CIN, AS_COUT, AS_CERR, AS_MAPPING;
+	static const std::string AS_ASSIGN, AS_PLUS_ASSIGN, AS_MINUS_ASSIGN, AS_MULT_ASSIGN;
+	static const std::string AS_DIV_ASSIGN, AS_MOD_ASSIGN, AS_XOR_ASSIGN, AS_OR_ASSIGN, AS_AND_ASSIGN;
+	static const std::string AS_GR_GR_ASSIGN, AS_LS_LS_ASSIGN, AS_GR_GR_GR_ASSIGN, AS_LS_LS_LS_ASSIGN;
+	static const std::string AS_GCC_MIN_ASSIGN, AS_GCC_MAX_ASSIGN, AS_SPACESHIP, AS_EQUAL_JS, AS_COALESCE_CS;
+	static const std::string AS_EQUAL, AS_PLUS_PLUS, AS_MINUS_MINUS, AS_NOT_EQUAL, AS_GR_EQUAL;
+	static const std::string AS_LS_EQUAL, AS_LS_LS_LS, AS_LS_LS, AS_GR_GR_GR, AS_GR_GR;
+	static const std::string AS_QUESTION_QUESTION, AS_LAMBDA;
+	static const std::string AS_ARROW, AS_AND, AS_OR;
+	static const std::string AS_SCOPE_RESOLUTION;
+	static const std::string AS_PLUS, AS_MINUS, AS_MULT, AS_DIV, AS_MOD, AS_GR, AS_LS;
+	static const std::string AS_NOT, AS_BIT_XOR, AS_BIT_OR, AS_BIT_AND, AS_BIT_NOT;
+	static const std::string AS_QUESTION, AS_COLON, AS_SEMICOLON, AS_COMMA, AS_DOT;
+	static const std::string AS_ASM, AS__ASM__, AS_MS_ASM, AS_MS__ASM;
+	static const std::string AS_QFOREACH, AS_QFOREVER, AS_FOREVER;
+	static const std::string AS_FOREACH, AS_LOCK, AS_UNSAFE, AS_FIXED;
+	static const std::string AS_GET, AS_SET, AS_ADD, AS_REMOVE;
+	static const std::string AS_DELEGATE, AS_UNCHECKED;
+	static const std::string AS_CONST_CAST, AS_DYNAMIC_CAST, AS_REINTERPRET_CAST, AS_STATIC_CAST;
+	static const std::string AS_NS_DURING, AS_NS_HANDLER;
 };  // Class ASResource
 
 //-----------------------------------------------------------------------------
@@ -305,27 +305,28 @@ protected:
 
 protected:  // inline functions
 	void init(int fileTypeArg) { baseFileType = fileTypeArg; }
-	bool isCStyle() const { return baseFileType == C_TYPE || baseFileType == OBJC_TYPE; }
+	bool isCStyle() const { return baseFileType == C_TYPE || baseFileType == OBJC_TYPE || baseFileType == GHC_TYPE; }
 	bool isJavaStyle() const { return baseFileType == JAVA_TYPE; }
 	bool isSharpStyle() const { return baseFileType == SHARP_TYPE; }
 	bool isJSStyle() const { return baseFileType == JS_TYPE; }
 	bool isObjCStyle() const { return baseFileType == OBJC_TYPE; }
+	bool isGHCStyle() const { return baseFileType == GHC_TYPE; }
 
 	bool isWhiteSpace(char ch) const { return (ch == ' ' || ch == '\t'); }
 
 protected:  // functions definitions are at the end of ASResource.cpp
-	const string* findHeader(const string& line, int i,
-	                         const vector<const string*>* possibleHeaders) const;
-	bool findKeyword(const string& line, int i, const string& keyword) const;
-	const string* findOperator(const string& line, int i,
-	                           const vector<const string*>* possibleOperators) const;
-	string getCurrentWord(const string& line, size_t index) const;
+	const std::string* findHeader(const std::string& line, int i,
+	                              const std::vector<const std::string*>* possibleHeaders) const;
+	bool findKeyword(const std::string& line, int i, const std::string& keyword) const;
+	const std::string* findOperator(const std::string& line, int i,
+	                                const std::vector<const std::string*>* possibleOperators) const;
+	std::string getCurrentWord(const std::string& line, size_t index) const;
 	bool isDigit(char ch) const;
 	bool isLegalNameChar(char ch) const;
-	bool isCharPotentialHeader(const string& line, size_t i) const;
+	bool isCharPotentialHeader(const std::string& line, size_t i) const;
 	bool isCharPotentialOperator(char ch) const;
-	bool isDigitSeparator(const string& line, int i) const;
-	char peekNextChar(const string& line, int i) const;
+	bool isDigitSeparator(const std::string& line, int i) const;
+	char peekNextChar(const std::string& line, int i) const;
 
 };  // Class ASBase
 
@@ -344,7 +345,7 @@ public:
 	ASBeautifier& operator=(ASBeautifier&&)      = delete;
 	virtual void init(ASSourceIterator* iter);
 
-	virtual string beautify(const string& originalLine);
+	virtual std::string beautify(const std::string& originalLine);
 	void setCaseIndent(bool state);
 	void setClassIndent(bool state);
 	void setContinuationIndentation(int indent = 1);
@@ -355,7 +356,10 @@ public:
 	void setAfterParenIndent(bool state);
 	void setJavaStyle();
 	void setJSStyle();
-    void setObjCStyle();
+	void setObjCStyle();
+	void setSharpStyle();
+	void setGHCStyle();
+
 
 	void setLabelIndent(bool state);
 	void setMaxContinuationIndentLength(int max);
@@ -366,18 +370,19 @@ public:
 	void setModifierIndent(bool state);
 	void setNamespaceIndent(bool state);
 	void setAlignMethodColon(bool state);
-	void setSharpStyle();
 	void setSpaceIndentation(int length = 4);
 	void setSwitchIndent(bool state);
 	void setTabIndentation(int length = 4, bool forceTabs = false);
 	void setPreprocDefineIndent(bool state);
 	void setPreprocConditionalIndent(bool state);
+	void setSqueezeWhitespace(bool state);
+	void setLambdaIndentation(bool state);
 	int  getBeautifierFileType() const;
 	int  getFileType() const;
 	int  getIndentLength() const;
 	int  getTabLength() const;
-	string getIndentString() const;
-	string getNextWord(const string& line, size_t currPos) const;
+	std::string getIndentString() const;
+	std::string getNextWord(const std::string& line, size_t currPos) const;
 	bool getAlignMethodColon() const;
 	bool getBraceIndent() const;
 	bool getBlockIndent() const;
@@ -393,14 +398,14 @@ public:
 
 protected:
 	void deleteBeautifierVectors();
-	int  getNextProgramCharDistance(const string& line, int i) const;
-	int  indexOf(const vector<const string*>& container, const string* element) const;
+	int  getNextProgramCharDistance(const std::string& line, int i) const;
+	int  indexOf(const std::vector<const std::string*>& container, const std::string* element) const;
 	void setBlockIndent(bool state);
 	void setBraceIndent(bool state);
 	void setBraceIndentVtk(bool state);
-	string extractPreprocessorStatement(const string& line) const;
-	string trim(const string& str) const;
-	string rtrim(const string& str) const;
+	std::string extractPreprocessorStatement(const std::string& line) const;
+	std::string trim(const std::string& str) const;
+	std::string rtrim(const std::string& str) const;
 
 	// variables set by ASFormatter - must be updated in activeBeautifierStack
 	int  inLineNumber;
@@ -417,77 +422,80 @@ protected:
 	bool isInBeautifySQL;
 	bool isInIndentableStruct;
 	bool isInIndentablePreproc;
+	bool lambdaIndicator;
+
 
 private:  // functions
-	void adjustObjCMethodDefinitionIndentation(const string& line_);
-	void adjustObjCMethodCallIndentation(const string& line_);
+	void adjustObjCMethodDefinitionIndentation(const std::string& line_);
+	void adjustObjCMethodCallIndentation(const std::string& line_);
 	void adjustParsedLineIndentation(size_t iPrelim, bool isInExtraHeaderIndent);
-	void computePreliminaryIndentation();
-	void parseCurrentLine(const string& line);
+	void computePreliminaryIndentation(const std::string& line);
+	void parseCurrentLine(const std::string& line);
 	void popLastContinuationIndent();
-	void processPreprocessor(const string& preproc, const string& line);
-	void registerContinuationIndent(const string& line, int i, int spaceIndentCount_,
+	void processPreprocessor(const std::string& preproc, const std::string& line);
+	void registerContinuationIndent(const std::string& line, int i, int spaceIndentCount_,
 	                                int tabIncrementIn, int minIndent, bool updateParenStack);
-	void registerContinuationIndentColon(const string& line, int i, int tabIncrementIn);
+	void registerContinuationIndentColon(const std::string& line, int i, int tabIncrementIn);
 	void initVectors();
-	void initTempStacksContainer(vector<vector<const string*>*>*& container,
-	                             vector<vector<const string*>*>* value);
+	void initTempStacksContainer(std::vector<std::vector<const std::string*>*>*& container,
+	                             std::vector<std::vector<const std::string*>*>* value);
 	void clearObjCMethodDefinitionAlignment();
-	void deleteBeautifierContainer(vector<ASBeautifier*>*& container);
-	void deleteTempStacksContainer(vector<vector<const string*>*>*& container);
+	void deleteBeautifierContainer(std::vector<ASBeautifier*>*& container);
+	void deleteTempStacksContainer(std::vector<std::vector<const std::string*>*>*& container);
 	int  adjustIndentCountForBreakElseIfComments() const;
-	int  computeObjCColonAlignment(const string& line, int colonAlignPosition) const;
+	int  computeObjCColonAlignment(const std::string& line, int colonAlignPosition) const;
 	int  convertTabToSpaces(int i, int tabIncrementIn) const;
-	int  findObjCColonAlignment(const string& line) const;
-	int  getContinuationIndentAssign(const string& line, size_t currPos) const;
-	int  getContinuationIndentComma(const string& line, size_t currPos) const;
-	int  getObjCFollowingKeyword(const string& line, int bracePos) const;
-	bool isIndentedPreprocessor(const string& line, size_t currPos) const;
-	bool isLineEndComment(const string& line, int startPos) const;
-	bool isPreprocessorConditionalCplusplus(const string& line) const;
-	bool isInPreprocessorUnterminatedComment(const string& line);
+	int  findObjCColonAlignment(const std::string& line) const;
+	int  getContinuationIndentAssign(const std::string& line, size_t currPos) const;
+	int  getContinuationIndentComma(const std::string& line, size_t currPos) const;
+	int  getObjCFollowingKeyword(const std::string& line, int bracePos) const;
+	bool isIndentedPreprocessor(const std::string& line, size_t currPos) const;
+	bool isLineEndComment(const std::string& line, int startPos) const;
+	bool isPreprocessorConditionalCplusplus(const std::string& line) const;
+	bool isInPreprocessorUnterminatedComment(const std::string& line);
 	bool isTopLevel() const;
-	bool statementEndsWithComma(const string& line, int index) const;
-	const string& getIndentedLineReturn(const string& newLine, const string& originalLine) const;
-	string getIndentedSpaceEquivalent(const string& line_) const;
-	string preLineWS(int lineIndentCount, int lineSpaceIndentCount) const;
+	bool statementEndsWithComma(const std::string& line, int index) const;
+	const std::string& getIndentedLineReturn(const std::string& newLine, const std::string& originalLine) const;
+	std::string getIndentedSpaceEquivalent(const std::string& line_) const;
+	std::string preLineWS(int lineIndentCount, int lineSpaceIndentCount) const;
 	template<typename T> void deleteContainer(T& container);
 	template<typename T> void initContainer(T& container, T value);
-	vector<vector<const string*>*>* copyTempStacks(const ASBeautifier& other) const;
-	pair<int, int> computePreprocessorIndent();
+	std::vector<std::vector<const std::string*>*>* copyTempStacks(const ASBeautifier& other) const;
+	std::pair<int, int> computePreprocessorIndent();
 
 private:  // variables
 	int beautifierFileType;
-	vector<const string*>* headers;
-	vector<const string*>* nonParenHeaders;
-	vector<const string*>* preBlockStatements;
-	vector<const string*>* preCommandHeaders;
-	vector<const string*>* assignmentOperators;
-	vector<const string*>* nonAssignmentOperators;
-	vector<const string*>* indentableHeaders;
+	std::vector<const std::string*>* headers;
+	std::vector<const std::string*>* nonParenHeaders;
+	std::vector<const std::string*>* preBlockStatements;
+	std::vector<const std::string*>* preCommandHeaders;
+	std::vector<const std::string*>* assignmentOperators;
+	std::vector<const std::string*>* nonAssignmentOperators;
+	std::vector<const std::string*>* indentableHeaders;
 
-	vector<ASBeautifier*>* waitingBeautifierStack;
-	vector<ASBeautifier*>* activeBeautifierStack;
-	vector<size_t>* waitingBeautifierStackLengthStack;
-	vector<size_t>* activeBeautifierStackLengthStack;
-	vector<const string*>* headerStack;
-	vector<vector<const string*>* >* tempStacks;
-	vector<int>* parenDepthStack;
-	vector<bool>* blockStatementStack;
-	vector<bool>* parenStatementStack;
-	vector<bool>* braceBlockStateStack;
-	vector<int>* continuationIndentStack;
-	vector<size_t>* continuationIndentStackSizeStack;
-	vector<int>* parenIndentStack;
-	vector<pair<int, int> >* preprocIndentStack;
+	std::vector<ASBeautifier*>* waitingBeautifierStack;
+	std::vector<ASBeautifier*>* activeBeautifierStack;
+	std::vector<size_t>* waitingBeautifierStackLengthStack;
+	std::vector<size_t>* activeBeautifierStackLengthStack;
+	std::vector<const std::string*>* headerStack;
+	std::vector<std::vector<const std::string*>* >* tempStacks;
+	std::vector<int>* parenDepthStack;
+	std::vector<bool>* blockStatementStack;
+	std::vector<bool>* parenStatementStack;
+	std::vector<bool>* braceBlockStateStack;
+	std::vector<int>* continuationIndentStack;
+	std::vector<size_t>* continuationIndentStackSizeStack;
+	std::vector<int>* parenIndentStack;
+	std::vector<std::pair<int, int> >* preprocIndentStack;
+	std::vector<std::pair<size_t, size_t> > squeezeWSStack;
 
 	ASSourceIterator* sourceIterator;
-	const string* currentHeader;
-	const string* previousLastLineHeader;
-	const string* probationHeader;
-	const string* lastLineHeader;
-	string indentString;
-	string verbatimDelimiter;
+	const std::string* currentHeader;
+	const std::string* previousLastLineHeader;
+	const std::string* probationHeader;
+	const std::string* lastLineHeader;
+	std::string indentString;
+	std::string verbatimDelimiter;
 	bool isInQuote;
 	bool isInVerbatimQuote;
 	bool haveLineContinuationChar;
@@ -554,6 +562,12 @@ private:  // variables
 	bool foundPreCommandMacro;
 	bool shouldAlignMethodColon;
 	bool shouldIndentPreprocConditional;
+	bool squeezeWhitespace;
+	bool attemptLambdaIndentation;
+
+	bool isInAssignment;
+	bool isInInitializerList;
+
 	int  indentCount;
 	int  spaceIndentCount;
 	int  spaceIndentObjCMethodAlignment;
@@ -593,20 +607,20 @@ class ASEnhancer : protected ASBase
 public:  // functions
 	ASEnhancer() = default;
 	void init(int, int, int, bool, bool, bool, bool, bool, bool, bool,
-	          vector<const pair<const string, const string>* >*);
-	void enhance(string& line, bool isInNamespace, bool isInPreprocessor, bool isInSQL);
+	          std::vector<const std::pair<const std::string, const std::string>* >*);
+	void enhance(std::string& line, bool isInNamespace, bool isInPreprocessor, bool isInSQL);
 
 private:  // functions
-	void   convertForceTabIndentToSpaces(string&  line) const;
-	void   convertSpaceIndentToForceTab(string& line) const;
-	size_t findCaseColon(const string&  line, size_t caseIndex) const;
-	int    indentLine(string&  line, int indent) const;
-	bool   isBeginDeclareSectionSQL(const string&  line, size_t index) const;
-	bool   isEndDeclareSectionSQL(const string&  line, size_t index) const;
-	bool   isOneLineBlockReached(const string& line, int startChar) const;
-	void   parseCurrentLine(string& line, bool isInPreprocessor, bool isInSQL);
-	size_t processSwitchBlock(string&  line, size_t index);
-	int    unindentLine(string&  line, int unindent) const;
+	void   convertForceTabIndentToSpaces(std::string&  line) const;
+	void   convertSpaceIndentToForceTab(std::string& line) const;
+	size_t findCaseColon(const std::string&  line, size_t caseIndex) const;
+	int    indentLine(std::string&  line, int indent) const;
+	bool   isBeginDeclareSectionSQL(const std::string&  line, size_t index) const;
+	bool   isEndDeclareSectionSQL(const std::string&  line, size_t index) const;
+	bool   isOneLineBlockReached(const std::string& line, int startChar) const;
+	void   parseCurrentLine(std::string& line, bool isInPreprocessor, bool isInSQL);
+	size_t processSwitchBlock(std::string&  line, size_t index);
+	int    unindentLine(std::string&  line, int unindent) const;
 
 private:
 	// options from command line or options file
@@ -645,12 +659,12 @@ private:
 	};
 
 	SwitchVariables sw;                      // switch variables struct
-	vector<SwitchVariables> switchStack;     // stack vector of switch variables
+	std::vector<SwitchVariables> switchStack;     // stack std::vector of switch variables
 
 	// event table variables
 	bool nextLineIsEventIndent;             // begin event table indent is reached
 	bool isInEventTable;                    // need to indent an event table
-	vector<const pair<const string, const string>* >* indentableMacros;
+	std::vector<const std::pair<const std::string, const std::string>* >* indentableMacros;
 
 	// SQL variables
 	bool nextLineIsDeclareIndent;           // begin declare section indent is reached
@@ -674,11 +688,11 @@ public:	// functions
 	void init(ASSourceIterator* si) override;
 
 	bool hasMoreLines() const;
-	string nextLine();
+	std::string nextLine();
 	LineEndFormat getLineEndFormat() const;
 	bool getIsLineReady() const;
 	void setFormattingStyle(FormatStyle style);
-	void setAddBracesMode(bool state);
+	void setAddBracesMode(int state);
 	void setAddOneLineBracesMode(bool state);
 	void setRemoveBracesMode(bool state);
 	void setAttachClass(bool state);
@@ -715,9 +729,17 @@ public:	// functions
 	void setOperatorPaddingMode(bool state);
 	void setParensOutsidePaddingMode(bool state);
 	void setParensFirstPaddingMode(bool state);
+
+	void setEmptyParensPaddingMode(bool state);
+
 	void setParensInsidePaddingMode(bool state);
 	void setParensHeaderPaddingMode(bool state);
 	void setParensUnPaddingMode(bool state);
+
+	void setBracketsOutsidePaddingMode(bool state);
+	void setBracketsInsidePaddingMode(bool state);
+	void setBracketsUnPaddingMode(bool state);
+
 	void setPointerAlignment(PointerAlign alignment);
 	void setPreprocBlockIndent(bool state);
 	void setReferenceAlignment(ReferenceAlign alignment);
@@ -734,7 +756,7 @@ public:	// functions
 	void setAddOneLineBracketsMode(bool state);
 	void setRemoveBracketsMode(bool state);
 	void setBreakClosingHeaderBracketsMode(bool state);
-
+	void setSqueezeEmptyLinesNumber(int);
 
 private:  // functions
 	template<typename T> void deleteContainer(T& container);
@@ -742,8 +764,8 @@ private:  // functions
 	char peekNextChar() const;
 	BraceType getBraceType();
 	bool adjustChecksumIn(int adjustment);
-	bool computeChecksumIn(const string& currentLine_);
-	bool computeChecksumOut(const string& beautifiedLine);
+	bool computeChecksumIn(const std::string& currentLine_);
+	bool computeChecksumOut(const std::string& beautifiedLine);
 	bool addBracesToStatement();
 	bool removeBracesFromStatement();
 	bool commentAndHeaderFollows();
@@ -756,25 +778,25 @@ private:  // functions
 	bool isBeforeMultipleLineEndComments(int startPos) const;
 	bool isBraceType(BraceType a, BraceType b) const;
 	bool isClassInitializer() const;
-	bool isClosingHeader(const string* header) const;
+	bool isClosingHeader(const std::string* header) const;
 	bool isCurrentBraceBroken() const;
 	bool isDereferenceOrAddressOf() const;
-	bool isExecSQL(const string& line, size_t index) const;
-	bool isEmptyLine(const string& line) const;
+	bool isExecSQL(const std::string& line, size_t index) const;
+	bool isEmptyLine(const std::string& line) const;
 	bool isExternC() const;
 	bool isMultiStatementLine() const;
 	bool isNextWordSharpNonParenHeader(int startChar) const;
 	bool isNonInStatementArrayBrace() const;
-	bool isNumericVariable(const string& word) const;
+	bool isNumericVariable(const std::string& word) const;
 	bool isOkToSplitFormattedLine();
 	bool isPointerOrReference() const;
 	bool isPointerOrReferenceCentered() const;
-	bool isPointerOrReferenceVariable(const string& word) const;
-	bool isPointerToPointer(const string& line, int currPos) const;
-	bool isSharpStyleWithParen(const string* header) const;
-	bool isStructAccessModified(const string& firstLine, size_t index) const;
-	bool isIndentablePreprocessorBlock(const string& firstLine, size_t index);
-	bool isNDefPreprocStatement(const string& nextLine_, const string& preproc) const;
+	bool isPointerOrReferenceVariable(const std::string& word) const;
+	bool isPointerToPointer(const std::string& line, int currPos) const;
+	bool isSharpStyleWithParen(const std::string* header) const;
+	bool isStructAccessModified(const std::string& firstLine, size_t index) const;
+	bool isIndentablePreprocessorBlock(const std::string& firstLine, size_t index);
+	bool isNDefPreprocStatement(const std::string& nextLine_, const std::string& preproc) const;
 	bool isUnaryOperator() const;
 	bool isUniformInitializerBrace() const;
 	bool isImmediatelyPostCast() const;
@@ -787,24 +809,24 @@ private:  // functions
 	int  findObjCColonAlignment() const;
 	int  getCurrentLineCommentAdjustment();
 	int  getNextLineCommentAdjustment();
-	int  isOneLineBlockReached(const string& line, int startChar) const;
+	int  isOneLineBlockReached(const std::string& line, int startChar) const;
 	void adjustComments();
 	void appendChar(char ch, bool canBreakLine);
 	void appendCharInsideComments();
 	void appendClosingHeader();
-	void appendOperator(const string& sequence, bool canBreakLine = true);
-	void appendSequence(const string& sequence, bool canBreakLine = true);
+	void appendOperator(const std::string& sequence, bool canBreakLine = true);
+	void appendSequence(const std::string& sequence, bool canBreakLine = true);
 	void appendSpacePad();
 	void appendSpaceAfter();
 	void breakLine(bool isSplitLine = false);
 	void buildLanguageVectors();
 	void updateFormattedLineSplitPoints(char appendedChar);
-	void updateFormattedLineSplitPointsOperator(const string& sequence);
+	void updateFormattedLineSplitPointsOperator(const std::string& sequence);
 	void checkIfTemplateOpener();
 	void clearFormattedLineSplitPoints();
 	void convertTabToSpaces();
-	void deleteContainer(vector<BraceType>*& container);
-	void findReturnTypeSplitPoint(const string& firstLine);
+	void deleteContainer(std::vector<BraceType>*& container);
+	void findReturnTypeSplitPoint(const std::string& firstLine);
 	void formatArrayRunIn();
 	void formatRunIn();
 	void formatArrayBraces(BraceType braceType, bool isOpeningArrayBrace);
@@ -825,14 +847,14 @@ private:  // functions
 	void fixOptionVariableConflicts();
 	void goForward(int i);
 	void isLineBreakBeforeClosingHeader();
-	void initContainer(vector<BraceType>*& container, vector<BraceType>* value);
+	void initContainer(std::vector<BraceType>*& container, std::vector<BraceType>* value);
 	void initNewLine();
 	void padObjCMethodColon();
 	void padObjCMethodPrefix();
 	void padObjCParamType();
 	void padObjCReturnType();
-	void padOperators(const string* newOperator);
-	void padParens();
+	void padOperators(const std::string* newOperator);
+	void padParensOrBrackets(char openDelim, char closeDelim, bool shouldPadParensOutside, bool shouldPadParensInside, bool shouldUnPadParens, bool shouldPadFirstParen);
 	void processPreprocessor();
 	void resetEndOfStatement();
 	void setAttachClosingBraceMode(bool state);
@@ -841,45 +863,46 @@ private:  // functions
 	void trimContinuationLine();
 	void updateFormattedLineSplitPointsPointerOrReference(size_t index);
 	size_t findFormattedLineSplitPoint() const;
-	size_t findNextChar(const string& line, char searchChar, int searchStart = 0) const;
-	const string* checkForHeaderFollowingComment(const string& firstLine) const;
-	const string* getFollowingOperator() const;
-	string getPreviousWord(const string& line, int currPos) const;
-	string peekNextText(const string& firstLine,
-	                    bool endOnEmptyLine = false,
-	                    const shared_ptr<ASPeekStream>& streamArg = nullptr) const;
+	size_t findNextChar(const std::string& line, char searchChar, int searchStart = 0) const;
+	const std::string* checkForHeaderFollowingComment(const std::string& firstLine) const;
+	const std::string* getFollowingOperator() const;
+	std::string getPreviousWord(const std::string& line, int currPos) const;
+	std::string peekNextText(const std::string& firstLine,
+	                         bool endOnEmptyLine = false,
+	                         const std::shared_ptr<ASPeekStream>& streamArg = nullptr) const;
 
 private:  // variables
 	int formatterFileType;
-	vector<const string*>* headers;
-	vector<const string*>* nonParenHeaders;
-	vector<const string*>* preDefinitionHeaders;
-	vector<const string*>* preCommandHeaders;
-	vector<const string*>* operators;
-	vector<const string*>* assignmentOperators;
-	vector<const string*>* castOperators;
-	vector<const pair<const string, const string>* >* indentableMacros;	// for ASEnhancer
+	std::vector<const std::string*>* headers;
+	std::vector<const std::string*>* nonParenHeaders;
+	std::vector<const std::string*>* preDefinitionHeaders;
+	std::vector<const std::string*>* preCommandHeaders;
+	std::vector<const std::string*>* operators;
+	std::vector<const std::string*>* assignmentOperators;
+	std::vector<const std::string*>* castOperators;
+	std::vector<const std::pair<const std::string, const std::string>* >* indentableMacros;	// for ASEnhancer
 
 	ASSourceIterator* sourceIterator;
 	ASEnhancer* enhancer;
 
-	vector<const string*>* preBraceHeaderStack;
-	vector<BraceType>* braceTypeStack;
-	vector<int>* parenStack;
-	vector<bool>* structStack;
-	vector<bool>* questionMarkStack;
+	std::vector<const std::string*>* preBraceHeaderStack;
+	std::vector<BraceType>* braceTypeStack;
+	std::vector<int>* parenStack;
+	std::vector<bool>* structStack;
+	std::vector<bool>* questionMarkStack;
 
-	string currentLine;
-	string formattedLine;
-	string readyFormattedLine;
-	string verbatimDelimiter;
-	const string* currentHeader;
+	std::string currentLine;
+	std::string formattedLine;
+	std::string readyFormattedLine;
+	std::string verbatimDelimiter;
+	const std::string* currentHeader;
+	const std::string* previousHeader;
 	char currentChar;
 	char previousChar;
 	char previousNonWSChar;
 	char previousCommandChar;
 	char quoteChar;
-	streamoff preprocBlockEnd;
+	std::streamoff preprocBlockEnd;
 	int  charNum;
 	int  runInIndentChars;
 	int  nextLineSpacePadNum;
@@ -889,6 +912,11 @@ private:  // variables
 	int  tabIncrementIn;
 	int  templateDepth;
 	int  squareBracketCount;
+	int  parenthesesCount;
+	int  closingBracesCount;
+	size_t  squeezeEmptyLineNum;
+	size_t  squeezeEmptyLineCount;
+
 	size_t checksumIn;
 	size_t checksumOut;
 	size_t currentLineFirstBraceNum;	// first brace location on currentLine
@@ -926,6 +954,8 @@ private:  // variables
 	bool shouldPadOperators;
 	bool shouldPadParensOutside;
 	bool shouldPadFirstParen;
+
+	bool shouldPadEmptyParens;
 	bool shouldPadParensInside;
 	bool shouldPadHeader;
 	bool shouldStripCommentPrefix;
@@ -980,7 +1010,7 @@ private:  // variables
 	bool isFormattingModeOff;
 	bool isInEnum;
 	bool isInStruct;
-    bool isInContinuedPreProc;
+	bool isInContinuedPreProc;
 	bool isInExecSQL;
 	bool isInAsm;
 	bool isInAsmOneLine;
@@ -1018,7 +1048,7 @@ private:  // variables
 	bool shouldBreakClosingHeaderBraces;
 	bool shouldBreakElseIfs;
 	bool shouldBreakLineAfterLogical;
-	bool shouldAddBraces;
+	int  shouldAddBraces;
 	bool shouldAddOneLineBraces;
 	bool shouldRemoveBraces;
 	bool shouldPadMethodColon;
@@ -1034,6 +1064,9 @@ private:  // variables
 	bool shouldBreakReturnTypeDecl;
 	bool shouldAttachReturnType;
 	bool shouldAttachReturnTypeDecl;
+	bool shouldPadBracketsOutside;
+	bool shouldPadBracketsInside;
+	bool shouldUnPadBrackets;
 	bool needHeaderOpeningBrace;
 	bool shouldBreakLineAtNextChar;
 	bool shouldKeepLineUnbroken;
@@ -1067,9 +1100,12 @@ private:  // variables
 	bool isFirstPreprocConditional;
 	bool processedFirstConditional;
 	bool isJavaStaticConstructor;
+	bool isInAllocator;
+	bool isInMultlineStatement;
+	int isInExplicitBlock;
 
 private:  // inline functions
-	// append the CURRENT character (curentChar) to the current formatted line.
+	// append the CURRENT character (currentChar) to the current formatted line.
 	void appendCurrentChar(bool canBreakLine = true)
 	{ appendChar(currentChar, canBreakLine); }
 
@@ -1078,11 +1114,11 @@ private:  // inline functions
 	{ return currentLine.compare(charNum, strlen(sequence), sequence) == 0; }
 
 	// call ASBase::findHeader for the current character
-	const string* findHeader(const vector<const string*>* headers_)
+	const std::string* findHeader(const std::vector<const std::string*>* headers_)
 	{ return ASBase::findHeader(currentLine, charNum, headers_); }
 
 	// call ASBase::findOperator for the current character
-	const string* findOperator(const vector<const string*>* operators_)
+	const std::string* findOperator(const std::vector<const std::string*>* operators_)
 	{ return ASBase::findOperator(currentLine, charNum, operators_); }
 };  // Class ASFormatter
 
@@ -1090,8 +1126,8 @@ private:  // inline functions
 // astyle namespace global declarations
 //-----------------------------------------------------------------------------
 // sort comparison functions for ASResource
-bool sortOnLength(const string* a, const string* b);
-bool sortOnName(const string* a, const string* b);
+bool sortOnLength(const std::string* a, const std::string* b);
+bool sortOnName(const std::string* a, const std::string* b);
 
 }   // namespace astyle
 

AStyle/src/astyle_main.h

@@ -110,29 +110,29 @@ public:	// function declarations
 	~ASStreamIterator() override;
 	bool getLineEndChange(int lineEndFormat) const;
 	int  getStreamLength() const override;
-	string nextLine(bool emptyLineWasDeleted) override;
-	string peekNextLine() override;
+	std::string nextLine(bool emptyLineWasDeleted) override;
+	std::string peekNextLine() override;
 	void peekReset() override;
 	void saveLastInputLine();
-	streamoff tellg() override;
+	std::streamoff tellg() override;
 
 private:
 	T* inStream;            // pointer to the input stream
-	string buffer;          // current input line
-	string prevBuffer;      // previous input line
-	string outputEOL;       // next output end of line char
+	std::string buffer;          // current input line
+	std::string prevBuffer;      // previous input line
+	std::string outputEOL;       // next output end of line char
 	int eolWindows;         // number of Windows line endings, CRLF
 	int eolLinux;           // number of Linux line endings, LF
 	int eolMacOld;          // number of old Mac line endings. CR
-	streamoff streamLength; // length of the input file stream
-	streamoff peekStart;    // starting position for peekNextLine
+	std::streamoff streamLength; // length of the input file stream
+	std::streamoff peekStart;    // starting position for peekNextLine
 	bool prevLineDeleted;   // the previous input line was deleted
 
 public:	// inline functions
-	bool compareToInputBuffer(const string& nextLine_) const
+	bool compareToInputBuffer(const std::string& nextLine_) const
 	{ return (nextLine_ == prevBuffer); }
-	const string& getOutputEOL() const { return outputEOL; }
-	streamoff getPeekStart() const override { return peekStart; }
+	const std::string& getOutputEOL() const { return outputEOL; }
+	std::streamoff getPeekStart() const override { return peekStart; }
 	bool hasMoreLines() const override { return !inStream->eof(); }
 };
 
@@ -179,28 +179,28 @@ public:
 #else
 	ASOptions(ASFormatter& formatterArg, ASConsole& consoleArg);
 #endif
-	string getOptionErrors() const;
-	void importOptions(stringstream& in, vector<string>& optionsVector);
-	bool parseOptions(vector<string>& optionsVector, const string& errorInfo);
+	std::string getOptionErrors() const;
+	void importOptions(std::stringstream& in, std::vector<std::string>& optionsVector);
+	bool parseOptions(std::vector<std::string>& optionsVector, const std::string& errorInfo);
 
 private:
 	// variables
 	ASFormatter& formatter;
-	stringstream optionErrors;		// option error messages
+	std::stringstream optionErrors;		// option error messages
 #ifndef ASTYLE_LIB
 	ASConsole& console;				// DO NOT USE for ASTYLE_LIB
 #endif
 
 	// functions
-	string getParam(const string& arg, const char* op);
-	string getParam(const string& arg, const char* op1, const char* op2);
-	bool isOption(const string& arg, const char* op);
-	bool isOption(const string& arg, const char* op1, const char* op2);
-	void isOptionError(const string& arg, const string& errorInfo);
-	bool isParamOption(const string& arg, const char* option);
-	bool isParamOption(const string& arg, const char* option1, const char* option2);
-	void parseOption(const string& arg, const string& errorInfo);
-	bool parseOptionContinued(const string& arg, const string& errorInfo);
+	std::string getParam(const std::string& arg, const char* op);
+	std::string getParam(const std::string& arg, const char* op1, const char* op2);
+	bool isOption(const std::string& arg, const char* op);
+	bool isOption(const std::string& arg, const char* op1, const char* op2);
+	void isOptionError(const std::string& arg, const std::string& errorInfo);
+	bool isParamOption(const std::string& arg, const char* option);
+	bool isParamOption(const std::string& arg, const char* option1, const char* option2);
+	void parseOption(const std::string& arg, const std::string& errorInfo);
+	bool parseOptionContinued(const std::string& arg, const std::string& errorInfo);
 };
 
 #ifndef	ASTYLE_LIB
@@ -215,7 +215,7 @@ private:    // variables
 	ASFormatter& formatter;             // reference to the ASFormatter object
 	ASEncoding encode;                  // file encoding conversion
 	ASLocalizer localizer;              // language translation
-	ostream* errorStream;               // direct error messages to cerr or cout
+	std::ostream* errorStream;               // direct error messages to cerr or std::cout
 	// command line options
 	bool isRecursive;                   // recursive option
 	bool isDryRun;                      // dry-run option
@@ -237,38 +237,38 @@ private:    // variables
 	bool lineEndsMixed;                 // output has mixed line ends
 	int  linesOut;                      // number of output lines
 
-	string outputEOL;                   // current line end
-	string prevEOL;                     // previous line end
-	string astyleExePath;               // absolute executable path and name from argv[0]
-	string optionFileName;              // file path and name of the options file
-	string origSuffix;                  // suffix= option
-	string projectOptionFileName;       // file path and name of the project options file
-	string stdPathIn;                   // path to input from stdin=
-	string stdPathOut;                  // path to output from stdout=
-	string targetDirectory;             // path to the directory being processed
-	string targetFilename;              // file name being processed
+	std::string outputEOL;                   // current line end
+	std::string prevEOL;                     // previous line end
+	std::string astyleExePath;               // absolute executable path and name from argv[0]
+	std::string optionFileName;              // file path and name of the options file
+	std::string origSuffix;                  // suffix= option
+	std::string projectOptionFileName;       // file path and name of the project options file
+	std::string stdPathIn;                   // path to input from stdin=
+	std::string stdPathOut;                  // path to output from stdout=
+	std::string targetDirectory;             // path to the directory being processed
+	std::string targetFilename;              // file name being processed
 
-	vector<string> excludeVector;       // exclude from wildcard hits
-	vector<bool>   excludeHitsVector;   // exclude flags for error reporting
-	vector<string> fileNameVector;      // file paths and names from the command line
-	vector<string> optionsVector;       // options from the command line
-	vector<string> projectOptionsVector;// project options from the project options file
-	vector<string> fileOptionsVector;   // options from the options file
-	vector<string> fileName;            // files to be processed including path
+	std::vector<std::string> excludeVector;       // exclude from wildcard hits
+	std::vector<bool>   excludeHitsVector;   // exclude flags for error reporting
+	std::vector<std::string> fileNameVector;      // file paths and names from the command line
+	std::vector<std::string> optionsVector;       // options from the command line
+	std::vector<std::string> projectOptionsVector;// project options from the project options file
+	std::vector<std::string> fileOptionsVector;   // options from the options file
+	std::vector<std::string> fileName;            // files to be processed including path
 
 public:     // functions
 	explicit ASConsole(ASFormatter& formatterArg);
 	ASConsole(const ASConsole&)            = delete;
 	ASConsole& operator=(ASConsole const&) = delete;
-	void convertLineEnds(ostringstream& out, int lineEnd);
+	void convertLineEnds(std::ostringstream& out, int lineEnd);
 	FileEncoding detectEncoding(const char* data, size_t dataSize) const;
 	void error() const;
 	void error(const char* why, const char* what) const;
 	void formatCinToCout();
-	vector<string> getArgvOptions(int argc, char** argv);
+	std::vector<std::string> getArgvOptions(int argc, char** argv);
 	bool fileExists(const char* file) const;
 	bool fileNameVectorIsEmpty() const;
-	ostream* getErrorStream() const;
+	std::ostream* getErrorStream() const;
 	bool getFilesAreIdentical() const;
 	int  getFilesFormatted() const;
 	bool getIgnoreExcludeErrors() const;
@@ -281,19 +281,19 @@ public:     // functions
 	bool getLineEndsMixed() const;
 	bool getNoBackup() const;
 	bool getPreserveDate() const;
-	string getLanguageID() const;
-	string getNumberFormat(int num, size_t lcid = 0) const;
-	string getNumberFormat(int num, const char* groupingArg, const char* separator) const;
-	string getOptionFileName() const;
-	string getOrigSuffix() const;
-	string getProjectOptionFileName() const;
-	string getStdPathIn() const;
-	string getStdPathOut() const;
-	void getTargetFilenames(string& targetFilename_, vector<string>& targetFilenameVector) const;
+	std::string getLanguageID() const;
+	std::string getNumberFormat(int num, size_t lcid = 0) const;
+	std::string getNumberFormat(int num, const char* groupingArg, const char* separator) const;
+	std::string getOptionFileName() const;
+	std::string getOrigSuffix() const;
+	std::string getProjectOptionFileName() const;
+	std::string getStdPathIn() const;
+	std::string getStdPathOut() const;
+	void getTargetFilenames(std::string& targetFilename_, std::vector<std::string>& targetFilenameVector) const;
 	void processFiles();
-	void processOptions(const vector<string>& argvOptions);
+	void processOptions(const std::vector<std::string>& argvOptions);
 	void setBypassBrowserOpen(bool state);
-	void setErrorStream(ostream* errStreamPtr);
+	void setErrorStream(std::ostream* errStreamPtr);
 	void setIgnoreExcludeErrors(bool state);
 	void setIgnoreExcludeErrorsAndDisplay(bool state);
 	void setIsDryRun(bool state);
@@ -302,54 +302,54 @@ public:     // functions
 	void setIsRecursive(bool state);
 	void setIsVerbose(bool state);
 	void setNoBackup(bool state);
-	void setOptionFileName(const string& name);
-	void setOrigSuffix(const string& suffix);
+	void setOptionFileName(const std::string& name);
+	void setOrigSuffix(const std::string& suffix);
 	void setPreserveDate(bool state);
-	void setProjectOptionFileName(const string& optfilepath);
-	void setStdPathIn(const string& path);
-	void setStdPathOut(const string& path);
-	void standardizePath(string& path, bool removeBeginningSeparator = false) const;
-	bool stringEndsWith(const string& str, const string& suffix) const;
-	void updateExcludeVector(const string& suffixParam);
-	vector<string> getExcludeVector() const;
-	vector<bool>   getExcludeHitsVector() const;
-	vector<string> getFileNameVector() const;
-	vector<string> getOptionsVector() const;
-	vector<string> getProjectOptionsVector() const;
-	vector<string> getFileOptionsVector() const;
-	vector<string> getFileName() const;
+	void setProjectOptionFileName(const std::string& optfilepath);
+	void setStdPathIn(const std::string& path);
+	void setStdPathOut(const std::string& path);
+	void standardizePath(std::string& path, bool removeBeginningSeparator = false) const;
+	bool stringEndsWith(const std::string& str, const std::string& suffix) const;
+	void updateExcludeVector(const std::string& suffixParam);
+	std::vector<std::string> getExcludeVector() const;
+	std::vector<bool>   getExcludeHitsVector() const;
+	std::vector<std::string> getFileNameVector() const;
+	std::vector<std::string> getOptionsVector() const;
+	std::vector<std::string> getProjectOptionsVector() const;
+	std::vector<std::string> getFileOptionsVector() const;
+	std::vector<std::string> getFileName() const;
 
 private:	// functions
-	void correctMixedLineEnds(ostringstream& out);
-	void formatFile(const string& fileName_);
-	string getParentDirectory(const string& absPath) const;
-	string findProjectOptionFilePath(const string& fileName_) const;
-	string getCurrentDirectory(const string& fileName_) const;
-	void getFileNames(const string& directory, const vector<string>& wildcards);
-	void getFilePaths(const string& filePath);
-	string getFullPathName(const string& relativePath) const;
-	string getHtmlInstallPrefix() const;
-	string getParam(const string& arg, const char* op);
-	bool isHomeOrInvalidAbsPath(const string& absPath) const;
+	void correctMixedLineEnds(std::ostringstream& out);
+	void formatFile(const std::string& fileName_);
+	std::string getParentDirectory(const std::string& absPath) const;
+	std::string findProjectOptionFilePath(const std::string& fileName_) const;
+	std::string getCurrentDirectory(const std::string& fileName_) const;
+	void getFileNames(const std::string& directory, const std::vector<std::string>& wildcards);
+	void getFilePaths(const std::string& filePath);
+	std::string getFullPathName(const std::string& relativePath) const;
+	std::string getHtmlInstallPrefix() const;
+	std::string getParam(const std::string& arg, const char* op);
+	bool isHomeOrInvalidAbsPath(const std::string& absPath) const;
 	void initializeOutputEOL(LineEndFormat lineEndFormat);
-	bool isOption(const string& arg, const char* op);
-	bool isOption(const string& arg, const char* a, const char* b);
-	bool isParamOption(const string& arg, const char* option);
-	bool isPathExclued(const string& subPath);
+	bool isOption(const std::string& arg, const char* op);
+	bool isOption(const std::string& arg, const char* a, const char* b);
+	bool isParamOption(const std::string& arg, const char* option);
+	bool isPathExclued(const std::string& subPath);
 	void launchDefaultBrowser(const char* filePathIn = nullptr) const;
 	void printHelp() const;
-	void printMsg(const char* msg, const string& data) const;
+	void printMsg(const char* msg, const std::string& data) const;
 	void printSeparatingLine() const;
 	void printVerboseHeader() const;
 	void printVerboseStats(clock_t startTime) const;
-	FileEncoding readFile(const string& fileName_, stringstream& in) const;
+	FileEncoding readFile(const std::string& fileName_, std::stringstream& in) const;
 	void removeFile(const char* fileName_, const char* errMsg) const;
 	void renameFile(const char* oldFileName, const char* newFileName, const char* errMsg) const;
-	void setOutputEOL(LineEndFormat lineEndFormat, const string& currentEOL);
+	void setOutputEOL(LineEndFormat lineEndFormat, const std::string& currentEOL);
 	void sleep(int seconds) const;
 	int  waitForRemove(const char* newFileName) const;
 	int  wildcmp(const char* wild, const char* data) const;
-	void writeFile(const string& fileName_, FileEncoding encoding, ostringstream& out) const;
+	void writeFile(const std::string& fileName_, FileEncoding encoding, std::ostringstream& out) const;
 #ifdef _WIN32
 	void displayLastError();
 #endif

AStyleDev/doc/gnustep.html

@@ -14,27 +14,27 @@
 
     <h1>Artistic Style Developer Information</h1>
 
-    <h2 class="large">Objective&#8209;C on Windows and Linux</h2>
+    <h2 class="large"><span style="white-space: nowrap;">Objective-C</span> on Windows and Linux</h2>
 
     <p>
         &nbsp;</p>
     <p class="noindent">
-        The best platform for developing Objective&#8209;C is Mac OS. But Objective&#8209;C programs can also be compiled
-        and run on Windows or Linux by using GNUstep and an Objective&#8209;C compiler. GNUstep is an object-oriented
-        library that provides the programmer with a range of libraries and utilities for building Objective&#8209;C
+        The best platform for developing <span style="white-space: nowrap;">Objective-C</span> is Mac OS. But <span style="white-space: nowrap;">Objective-C</span> programs can also be compiled
+        and run on Windows or Linux by using GNUstep and an <span style="white-space: nowrap;">Objective-C</span> compiler. GNUstep is an object-oriented
+        library that provides the programmer with a range of libraries and utilities for building <span style="white-space: nowrap;">Objective-C</span>
         applications. GNUstep is generally compatible with recent developments of the MacOS (Cocoa) API.</p>
     <p class="noindent">
-        Objective&#8209;C development environments are not readily available on Windows or Linux.
-        CodeBlocks can be used if additional options are set and an Objective-C compiler is used.. The Example program
+        <span style="white-space: nowrap;">Objective-C</span> development environments are not readily available on Windows or Linux.
+        CodeBlocks can be used if additional options are set and an <span style="white-space: nowrap;">Objective-C</span> compiler is used.. The Example program
         can also be compiled by using a text editor with compile capability such as SciTE. Or it may be compiled from
         the command line. Or scripts can be written using Python, Batch, Bash, or other scripting languages. Compile options
         for each platform are included in the following descriptions.</p>
 
-    <h3>Objective&#8209;C on Windows</h3>
+    <h3><span style="white-space: nowrap;">Objective-C</span> on Windows</h3>
 
     <p>
-        Objective&#8209;C on Windows requires the GNUstep packages and the MinGW compiler. Installing MinGW is optional
-        since it is included with GNUstep. If MinGW is installed separately be sure to include the Objective&#8209;C compiler
+        <span style="white-space: nowrap;">Objective-C</span> on Windows requires the GNUstep packages and the MinGW compiler. Installing MinGW is optional
+        since it is included with GNUstep. If MinGW is installed separately be sure to include the <span style="white-space: nowrap;">Objective-C</span> compiler
         package. The GNUstep installation packages are available at the <a href="http://www.gnustep.org/experience/Windows.html">
             GNUstep Windows Installer</a> page. For development you will need GNUstep MSYS, GNUstep Core, and GNUstep
         Devel. GNUstep Cairo is optional. For now, it is best to use the "stable" packages.</p>
@@ -48,7 +48,7 @@
         the menu display will be separate from the application window. This can be changed by running the "System Preferences"
         program and selecting Themes &gt; WinUXThem. Most applications will then display a window with a menu at the top
         as in Windows. <a href="http://www.gnustep.it/enrico/gworkspace/">GWorkspace</a> is a fairly large application
-        that includes source code. It can be used as a reference for Objective&#8209;C coding. The GNUstep MSYS shell
+        that includes source code. It can be used as a reference for <span style="white-space: nowrap;">Objective-C</span> coding. The GNUstep MSYS shell
         must be used for the compile since Autoconf is used. There are INSTALL instructions in the top-level GWorkspace
         directory.</p>
     <p>
@@ -70,12 +70,12 @@
         The compiled Example will run as any other console program. If Artistic Style is linked as a DLL it must be in
         the same directory as the example, or in another system path directory.</p>
 
-    <h3>Objective&#8209;C on Linux</h3>
+    <h3><span style="white-space: nowrap;">Objective-C</span> on Linux</h3>
 
     <p>
-        Objective&#8209;C on Linux requires the GNUstep packages and the GCC or Clang compiler. On many systems GNUstep
+        <span style="white-space: nowrap;">Objective-C</span> on Linux requires the GNUstep packages and the GCC or Clang compiler. On many systems GNUstep
         will be available as a packaged install. For a typical installation the gobjc, gobjc++, gnustep, and 
-        gnustep-core-devel packages are needed. The gobjc packages are the Objective&#8209;C compilers for GCC. If packages
+        gnustep-core-devel packages are needed. The gobjc packages are the <span style="white-space: nowrap;">Objective-C</span> compilers for GCC. If packages
         are not available they can be compiled with source code available at the 
         <a href="http://www.gnustep.org/">GNUstep</a> website.</p>
     <p>
@@ -84,7 +84,7 @@
         application menu display is separate from the application window. This can NOT be changed with "System Preferences"
         as on Windows. <a href="http://www.gnustep.it/enrico/gworkspace/">GWorkspace</a>
         is a fairly large application that includes source code if downloaded from the website. It can be used as a reference
-        for Objective&#8209;C coding. There are INSTALL instructions in the top-level GWorkspace directory.</p>
+        for <span style="white-space: nowrap;">Objective-C</span> coding. There are INSTALL instructions in the top-level GWorkspace directory.</p>
     <p>
         To compile the Artistic Style Example program the GNUstep development packages must be installed. Artistic Style
         should be compiled as a shared or static library for linking with the example. In the following options the "-L./"

AStyleDev/doc/index.html

@@ -20,7 +20,7 @@
         &nbsp;</p>
     <p class="noindent">
         Artistic Style has compile options for creating a shared library (DLL) or static library for use with a Graphical
-        User Interface (GUI). The shared library can be called from a C++, Objective&#8209;C, C#, or Python program. There
+        User Interface (GUI). The shared library can be called from a C++, <span style="white-space: nowrap;">Objective-C</span>, C#, or Python program. There
         are also compile options for a Java Native Interface (JNI) that allows it to be called from a Java program. Information
         on compiling the various configurations of Artistic Style is in the Install Information.</p>
     <p class="noindent">
@@ -50,12 +50,12 @@
         as a shared or static library from a C++ program. It includes a C++ sample program that can be used to test the
         Artistic Style libraries.</p>
     <p>
-        <a href="objc.html">Calling Artistic Style from an Objective-C Program</a> contains information on calling Artistic
-        Style as a shared or static library from an Objective-C program. It includes an Objective-C sample program that
+        <a href="objc.html">Calling Artistic Style from an <span style="white-space: nowrap;">Objective-C</span> Program</a> contains information on calling Artistic
+        Style as a shared or static library from an <span style="white-space: nowrap;">Objective-C</span> program. It includes an <span style="white-space: nowrap;">Objective-C</span> sample program that
         can be used to test the Artistic Style shared libraries.</p>
     <p style="margin-left: 0.5in;">
-        <a href="gnustep.html">Objective&#8209;C on Windows and Linux</a> contains information on compiling and running
-        Objective-C programs using GNUstep. It has instructions for compiling the Example program on Windows or 
+        <a href="gnustep.html"><span style="white-space: nowrap;">Objective-C</span> on Windows and Linux</a> contains information on compiling and running
+        <span style="white-space: nowrap;">Objective-C</span> programs using GNUstep. It has instructions for compiling the Example program on Windows or 
         Linux.</p>
     <p>
         <a href="jni.html">Calling Artistic Style as a Java Native Interface</a> contains information on calling Artistic
@@ -99,13 +99,13 @@
 
     <h4>
         <a href="https://sourceforge.net/projects/astyle/files/OldFiles/examples/example-objc.zip" target="_blank"
-            title="open new window">Objective&#8209;C Example</a>
+            title="open new window"><span style="white-space: nowrap;">Objective-C</span> Example</a>
     </h4>
 
     <p>
-        The example for Objective&#8209;C contains the methods to call Artistic Style from a static or shared library
-        using an Objective&#8209;C program. Compile Artistic Style as a static or shared library using the macro ASTYLE_LIB.
-        Copy the shared library to the same folder as the Objective&#8209;C Example executable. It will format files in
+        The example for <span style="white-space: nowrap;">Objective-C</span> contains the methods to call Artistic Style from a static or shared library
+        using an <span style="white-space: nowrap;">Objective-C</span> program. Compile Artistic Style as a static or shared library using the macro ASTYLE_LIB.
+        Copy the shared library to the same folder as the <span style="white-space: nowrap;">Objective-C</span> Example executable. It will format files in
         the test&#8209;data directory included in the download.</p>
 
     <h4>

AStyleDev/doc/objc.html

@@ -15,20 +15,20 @@
 
     <h1>Artistic Style Developer Information</h1>
 
-    <h2 class="large">Calling Artistic Style from an Objective&#8209;C Program</h2>
+    <h2 class="large">Calling Artistic Style from an <span style="white-space: nowrap;">Objective-C</span> Program</h2>
 
     <p>
         &nbsp;</p>
     <p class="noindent">
-        Artistic Style can be compiled as a shared library (DLL) or a static library and linked with an Objective&#8209;C
-        program. This is usually done on a Mac OS computer. However,&nbsp; <a href="gnustep.html">Objective&#8209;C on Windows
-            and Linux</a> contains information on compiling and running Objective&#8209;C programs using GNUstep. It has
+        Artistic Style can be compiled as a shared library (DLL) or a static library and linked with an <span style="white-space: nowrap;">Objective-C</span>
+        program. This is usually done on a Mac OS computer. However,&nbsp; <a href="gnustep.html"><span style="white-space: nowrap;">Objective-C</span> on Windows
+            and Linux</a> contains information on compiling and running <span style="white-space: nowrap;">Objective-C</span> programs using GNUstep. It has
         instructions for compiling the following example program on Windows or Linux.</p>
 
     <h3>Compile Options</h3>
 
     <p>
-        To compile AStyle for use with an Objective&#8209;C program the compile option ASTYLE_LIB must be defined. Then
+        To compile AStyle for use with an <span style="white-space: nowrap;">Objective-C</span> program the compile option ASTYLE_LIB must be defined. Then
         AStyle will accept the files and options as parameters from a function call. It is the responsibility of the calling
         program to read the source files and accept the options from the user via a graphical interface or other method.
         These are then passed via the function call. After the source files are formatted they will be returned to the

AStyleTest/regression-sh/gen_old_file.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Creates a new test case for a single long option
+# if the string begins as flag the second part is stored in OPTS
+
+# Examples:
+# ./gen_old_file.sh style_kr
+# ./gen_old_file.sh flag_attach-namespaces
+
+# Loop through the command-line arguments
+for arg in "$@"; do
+    # Split each argument into 'name' and 'value'
+    IFS="_" read -r name value <<< "$arg"
+	dirName="$arg"
+    mkdir -p "$dirName"
+
+    arg="--$name=$value"
+
+	if [ "$name" = "flag" ]; then
+	    arg="--$value"
+    	echo "$arg" > "$dirName/OPTS"
+	fi
+
+	# call the astyle version here which is considered as reference for the future
+    astyle_ref "$arg" < tmp.cpp > "$dirName/tmp.cpp.old"
+done

AStyleTest/regression-sh/run_tests.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# run all test cases in the current directory
+# it assumes a source file produced by a previous astyle version to compare with the output of the current
+#
+
+for dir in */
+do
+    dir=${dir%*/}      # remove the trailing "/"
+
+	# make string an array
+	cmd_arg=(${dir//_/ })
+
+	# default arg=val based on directory name
+	arg="--${cmd_arg[0]}=${cmd_arg[1]}"
+
+	# custom arguments
+	if [ -f "$dir/OPTS" ]; then
+  		arg=$(<"$dir/OPTS")
+	fi
+
+	# call the latest astyle here
+	../../AStyle/build_local/astyle --squeeze-lines=1 "$arg"  < tmp.cpp > "$dir/tmp.cpp.new"
+	diff $dir/tmp.cpp.old $dir/tmp.cpp.new
+	if [ $? -eq 0 ]; then
+		rm "$dir/tmp.cpp.new"
+	else
+		echo "${dir} -> FAILED"
+		exit 1
+	fi
+done

AStyleTest/regression-sh/style_1tbs/tmp.cpp.old

@@ -0,0 +1,290 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    } while (func(foo,
+                  bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_allman/tmp.cpp.old

@@ -0,0 +1,320 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct               // Structure declaration
+    {
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0)
+    {
+        cout << "x is positive" << endl;
+    }
+    else
+    {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++)
+    {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c)
+    {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x)
+        {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do
+    {
+        x2 = 1;
+    }
+    while (func(foo,
+                bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp)
+    {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL)
+        {
+            if (tp == curtab)
+            {
+                ui_ext_win_position (wp, validate);
+            }
+            else
+            {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab)
+        {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating)
+    {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]()
+    {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx
+{
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo)
+    {
+    case 1:
+        a += 1;
+        break;
+    case 2:
+    {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true)
+    {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2)
+        {
+            abc();
+
+            for (int i = 0; i < 6; i++)
+            {
+                def();
+            }
+        }
+        else
+        {
+            xyz();
+
+            for (int i = 0; i < 8; i++)
+            {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s
+{
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct
+{
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_gnu/tmp.cpp.old

@@ -0,0 +1,320 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct               // Structure declaration
+    {
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0)
+        {
+            cout << "x is positive" << endl;
+        }
+    else
+        {
+            cout << "x is non-positive" << endl;
+        }
+
+    // Loop
+    for (int i = 0; i < 5; i++)
+        {
+            cout << "Iteration " << i + 1 << endl;
+        }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c)
+        {
+            func(a==b==c);
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+
+            if (x)
+                {
+                    someVal = someVal2 =
+                    someVal3 = someVal4 = 0;
+                }
+        }
+
+    int x2;
+
+    do
+        {
+            x2 = 1;
+        }
+    while (func(foo,
+                bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+    {
+        int x = 1 * 2;
+        return;
+    }
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+    {
+        return 1;
+    }
+
+if (**f(xss) < mx)
+    {
+        return 1;
+    }
+if (t * f(xss) < mx)
+    {
+        return 1;
+    }
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp)
+    {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL)
+            {
+                if (tp == curtab)
+                    {
+                        ui_ext_win_position (wp, validate);
+                    }
+                else
+                    {
+                        ui_call_win_hide (wp->w_grid_alloc.handle);
+                        wp->w_pos_changed = false;
+                    }
+            }
+
+        if (tp == curtab)
+            {
+                ui_ext_win_viewport (wp);
+            }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating)
+        {
+            res = res->w_prev;
+        }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]()
+    {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx
+{
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo)
+        {
+        case 1:
+            a += 1;
+            break;
+        case 2:
+        {
+            a += 2;
+            break;
+        }
+        }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true)
+        {
+            new int *[5]; // Remove this and everything works fine
+            if (5 > 2)
+                {
+                    abc();
+
+                    for (int i = 0; i < 6; i++)
+                        {
+                            def();
+                        }
+                }
+            else
+                {
+                    xyz();
+
+                    for (int i = 0; i < 8; i++)
+                        {
+                            xyz();
+                        }
+                }
+        }
+    return 0;
+}
+
+struct s
+{
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct
+{
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_google/tmp.cpp.old

@@ -0,0 +1,271 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass {
+  public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display() {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+  private:
+    int        myValue;
+};
+
+int main() {
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    } while (func(foo,
+                  bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b) {
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2)) {
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t) {
+    return 1;
+}
+
+if (*f(xss) < mx) {
+    return 1;
+}
+
+if (**f(xss) < mx) {
+    return 1;
+}
+if (t * f(xss) < mx) {
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c) {
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate) {
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void) {
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path) {
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this] {
+    some_code(argument);
+})
+, member3(42)
+, member4("test") {
+}
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q) {
+    return;
+}
+
+int main(void) {
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn() {
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main() {
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+  public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_horstmann/tmp.cpp.old

@@ -0,0 +1,280 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {   cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{   // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct               // Structure declaration
+    {   int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0)
+    {   cout << "x is positive" << endl;
+    }
+    else
+    {   cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++)
+    {   cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c)
+    {   func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x)
+        {   someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do
+    {   x2 = 1;
+    }
+    while (func(foo,
+                bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{   return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{   int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{   return 1;
+}
+
+if (*f(xss) < mx)
+{   return 1;
+}
+
+if (**f(xss) < mx)
+{   return 1;
+}
+if (t * f(xss) < mx)
+{   return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{   int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{   FOR_ALL_TAB_WINDOWS (tp, wp)
+    {   if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL)
+        {   if (tp == curtab)
+            {   ui_ext_win_position (wp, validate);
+            }
+            else
+            {   ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab)
+        {   ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{   win_T* res = lastwin;
+
+    while (res->w_floating)
+    {   res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{   m_futureMIText = std::async(std::launch::async, [ = ]()
+    {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{   some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx
+{   int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{   return;
+}
+
+int main(void)
+{
+
+    switch (foo)
+    {   case 1:
+            a += 1;
+            break;
+        case 2:
+        {   a += 2;
+            break;
+        }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{   some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{   while (true)
+    {   new int *[5]; // Remove this and everything works fine
+        if (5 > 2)
+        {   abc();
+
+            for (int i = 0; i < 6; i++)
+            {   def();
+            }
+        }
+        else
+        {   xyz();
+
+            for (int i = 0; i < 8; i++)
+            {   xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s
+{
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct
+{   uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct
+{   uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct
+{   uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_java/tmp.cpp.old

@@ -0,0 +1,271 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass {
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display() {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main() {
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    } while (func(foo,
+                  bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b) {
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2)) {
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t) {
+    return 1;
+}
+
+if (*f(xss) < mx) {
+    return 1;
+}
+
+if (**f(xss) < mx) {
+    return 1;
+}
+if (t * f(xss) < mx) {
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c) {
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate) {
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void) {
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path) {
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this] {
+    some_code(argument);
+})
+, member3(42)
+, member4("test") {
+}
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q) {
+    return;
+}
+
+int main(void) {
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn() {
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main() {
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_kr/tmp.cpp.old

@@ -0,0 +1,290 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    } while (func(foo,
+                  bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_linux/tmp.cpp.old

@@ -0,0 +1,290 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    } while (func(foo,
+                  bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_lisp/tmp.cpp.old

@@ -0,0 +1,231 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass {
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display() {
+        cout << "MyValue: "       << myValue      << endl; }
+private:
+    int        myValue; };
+
+int main() {
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl; }
+    else {
+        cout << "x is non-positive" << endl; }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl; }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0; } }
+
+    int x2;
+
+    do {
+        x2 = 1; }
+    while (func(foo,
+                bar));
+
+    return 0; }
+
+// Function definition
+int add(int a, int b) {
+    return a + b; }
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2)) {
+    int x = 1 * 2;
+    return; }
+
+int fdfd(int* t) {
+    return 1; }
+
+if (*f(xss) < mx) {
+    return 1; }
+
+if (**f(xss) < mx) {
+    return 1; }
+if (t * f(xss) < mx) {
+    return 1; }
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c) {
+    int* p = (int*)& _mem; }
+
+void win_ui_flush (bool validate) {
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate); }
+            else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false; } }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp); } } }
+
+win_T* lastwin_nofloating (void) {
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev; }
+
+    return res; }
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path) {
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str(); }).share(); }
+
+Test::Test() : member1(argument)
+    , member2([this] {
+    some_code(argument); })
+, member3(42)
+, member4("test") {}
+
+struct xxxx {
+    int a, b, c; };
+
+(struct xxxxx *p);
+
+int main(int * p, int *q) {
+    return; }
+
+int main(void) {
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break; } }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0; }
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn() {
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ])); }
+
+int main() {
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def(); } }
+        else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz(); } } }
+    return 0; }
+
+struct s {
+public:
+    inline s() :
+        size(x),
+        ia {new int [y] },
+        ia {new int [y] }
+    {} }
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void); }
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void); }
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void); }

AStyleTest/regression-sh/style_mozilla/tmp.cpp.old

@@ -0,0 +1,296 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct               // Structure declaration
+    {
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    } while (func(foo,
+                  bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx
+{
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s
+{
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct
+{
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_pico/tmp.cpp.old

@@ -0,0 +1,236 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {   cout << "MyValue: "       << myValue      << endl; }
+private:
+    int        myValue; };
+
+int main()
+{   // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct               // Structure declaration
+    {   int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0)
+    {   cout << "x is positive" << endl; }
+    else
+    {   cout << "x is non-positive" << endl; }
+
+    // Loop
+    for (int i = 0; i < 5; i++)
+    {   cout << "Iteration " << i + 1 << endl; }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c)
+    {   func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x)
+        {   someVal = someVal2 =
+            someVal3 = someVal4 = 0; } }
+
+    int x2;
+
+    do
+    {   x2 = 1; }
+    while (func(foo,
+                bar));
+
+    return 0; }
+
+// Function definition
+int add(int a, int b)
+{   return a + b; }
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{   int x = 1 * 2;
+    return; }
+
+int fdfd(int* t)
+{   return 1; }
+
+if (*f(xss) < mx)
+{   return 1; }
+
+if (**f(xss) < mx)
+{   return 1; }
+if (t * f(xss) < mx)
+{   return 1; }
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{   int* p = (int*)& _mem; }
+
+void win_ui_flush (bool validate)
+{   FOR_ALL_TAB_WINDOWS (tp, wp)
+    {   if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL)
+        {   if (tp == curtab)
+            {   ui_ext_win_position (wp, validate); }
+            else
+            {   ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false; } }
+
+        if (tp == curtab)
+        {   ui_ext_win_viewport (wp); } } }
+
+win_T* lastwin_nofloating (void)
+{   win_T* res = lastwin;
+
+    while (res->w_floating)
+    {   res = res->w_prev; }
+
+    return res; }
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{   m_futureMIText = std::async(std::launch::async, [ = ]()
+    {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str(); }).share(); }
+
+Test::Test() : member1(argument)
+    , member2([this]
+{   some_code(argument); })
+, member3(42)
+, member4("test")
+{}
+
+struct xxxx
+{   int a, b, c; };
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{   return; }
+
+int main(void)
+{
+
+    switch (foo)
+    {   case 1:
+            a += 1;
+            break;
+        case 2:
+        {   a += 2;
+            break; } }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0; }
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{   some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ])); }
+
+int main()
+{   while (true)
+    {   new int *[5]; // Remove this and everything works fine
+        if (5 > 2)
+        {   abc();
+
+            for (int i = 0; i < 6; i++)
+            {   def(); } }
+        else
+        {   xyz();
+
+            for (int i = 0; i < 8; i++)
+            {   xyz(); } } }
+    return 0; }
+
+struct s
+{
+public:
+    inline s() :
+        size(x),
+        ia {new int [y] },
+        ia {new int [y] }
+    {} }
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct
+{   uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void); }
+
+struct
+{   uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void); }
+
+typedef struct
+{   uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void); }

AStyleTest/regression-sh/style_ratliff/tmp.cpp.old

@@ -0,0 +1,275 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass {
+    public:
+        MyClass   (int         value) : myValue         (value       ) {}
+        void        display() {
+            cout << "MyValue: "       << myValue      << endl;
+            }
+    private:
+        int        myValue;
+    };
+
+int main() {
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+        } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+        }
+    else {
+        cout << "x is non-positive" << endl;
+        }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+        }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+            }
+        }
+
+    int x2;
+
+    do {
+        x2 = 1;
+        }
+    while (func(foo,
+                bar));
+
+    return 0;
+    }
+
+// Function definition
+int add(int a, int b) {
+    return a + b;
+    }
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2)) {
+    int x = 1 * 2;
+    return;
+    }
+
+int fdfd(int* t) {
+    return 1;
+    }
+
+if (*f(xss) < mx) {
+    return 1;
+    }
+
+if (**f(xss) < mx) {
+    return 1;
+    }
+if (t * f(xss) < mx) {
+    return 1;
+    }
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c) {
+    int* p = (int*)& _mem;
+    }
+
+void win_ui_flush (bool validate) {
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+                }
+            else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+                }
+            }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+            }
+        }
+    }
+
+win_T* lastwin_nofloating (void) {
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+        }
+
+    return res;
+    }
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path) {
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+        }).share();
+    }
+
+Test::Test() : member1(argument)
+    , member2([this] {
+    some_code(argument);
+    })
+, member3(42)
+, member4("test") {
+    }
+
+struct xxxx {
+    int a, b, c;
+    };
+
+(struct xxxxx *p);
+
+int main(int * p, int *q) {
+    return;
+    }
+
+int main(void) {
+
+    switch (foo) {
+        case 1:
+            a += 1;
+            break;
+        case 2: {
+            a += 2;
+            break;
+            }
+        }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+    }
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn() {
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+    }
+
+int main() {
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+                }
+            }
+        else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+                }
+            }
+        }
+    return 0;
+    }
+
+struct s {
+    public:
+        inline s() :
+            size(x),
+            ia {new int [y]},
+            ia {new int [y]}
+            {}
+    }
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+    }
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+    }
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+    }

AStyleTest/regression-sh/style_stroustrup/tmp.cpp.old

@@ -0,0 +1,293 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass {
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    }
+    else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    }
+    while (func(foo,
+                bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            }
+            else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        }
+        else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_vtk/tmp.cpp.old

@@ -0,0 +1,320 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+{
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct               // Structure declaration
+        {
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+        } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0)
+        {
+        cout << "x is positive" << endl;
+        }
+    else
+        {
+        cout << "x is non-positive" << endl;
+        }
+
+    // Loop
+    for (int i = 0; i < 5; i++)
+        {
+        cout << "Iteration " << i + 1 << endl;
+        }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c)
+        {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x)
+            {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+            }
+        }
+
+    int x2;
+
+    do
+        {
+        x2 = 1;
+        }
+    while (func(foo,
+                bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp)
+        {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL)
+            {
+            if (tp == curtab)
+                {
+                ui_ext_win_position (wp, validate);
+                }
+            else
+                {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+                }
+            }
+
+        if (tp == curtab)
+            {
+            ui_ext_win_viewport (wp);
+            }
+        }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating)
+        {
+        res = res->w_prev;
+        }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]()
+        {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+        }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx
+{
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo)
+        {
+        case 1:
+            a += 1;
+            break;
+        case 2:
+            {
+            a += 2;
+            break;
+            }
+        }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true)
+        {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2)
+            {
+            abc();
+
+            for (int i = 0; i < 6; i++)
+                {
+                def();
+                }
+            }
+        else
+            {
+            xyz();
+
+            for (int i = 0; i < 8; i++)
+                {
+                xyz();
+                }
+            }
+        }
+    return 0;
+}
+
+struct s
+{
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct
+{
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct
+{
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_webkit/tmp.cpp.old

@@ -0,0 +1,289 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass {
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display()
+    {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main()
+{
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct {             // Structure declaration
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+    } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+    for (int i = 0; i < 5; i++) {
+        cout << "Iteration " << i + 1 << endl;
+    }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x) {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+        }
+    }
+
+    int x2;
+
+    do {
+        x2 = 1;
+    } while (func(foo,
+                  bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b)
+{
+    return a + b;
+}
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+{
+    int x = 1 * 2;
+    return;
+}
+
+int fdfd(int* t)
+{
+    return 1;
+}
+
+if (*f(xss) < mx)
+{
+    return 1;
+}
+
+if (**f(xss) < mx)
+{
+    return 1;
+}
+if (t * f(xss) < mx)
+{
+    return 1;
+}
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{
+    m_futureMIText = std::async(std::launch::async, [ = ]() {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+Test::Test() : member1(argument)
+    , member2([this]
+{
+    some_code(argument);
+})
+, member3(42)
+, member4("test")
+{
+}
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+{
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+}
+
+int main()
+{
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+public:
+    inline s() :
+        size(x),
+        ia {new int [y]},
+        ia {new int [y]}
+    {}
+}
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

AStyleTest/regression-sh/style_whitesmith/tmp.cpp.old

@@ -0,0 +1,320 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass
+    {
+    public:
+        MyClass   (int         value) : myValue         (value       ) {}
+        void        display()
+            {
+            cout << "MyValue: "       << myValue      << endl;
+            }
+    private:
+        int        myValue;
+    };
+
+int main()
+    {
+    // Variables and data types
+    int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+    double y, foo, bar = 3.14;
+    char ch = 'A';
+    bool isTrue = true;
+
+    struct               // Structure declaration
+        {
+        int myNum;         // Member (int variable)
+        string myString;   // Member (string variable)
+        } myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0)
+        {
+        cout << "x is positive" << endl;
+        }
+    else
+        {
+        cout << "x is non-positive" << endl;
+        }
+
+    // Loop
+    for (int i = 0; i < 5; i++)
+        {
+        cout << "Iteration " << i + 1 << endl;
+        }
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+    goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa()
+           .setB12dsadasdasdsa( 2 )
+           .setB12dsadasdasdsa( 2 )
+           .setC12dsdsds( 3 );
+
+    if (a=b=c)
+        {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+        if (x)
+            {
+            someVal = someVal2 =
+            someVal3 = someVal4 = 0;
+            }
+        }
+
+    int x2;
+
+    do
+        {
+        x2 = 1;
+        }
+    while (func(foo,
+                bar));
+
+    return 0;
+    }
+
+// Function definition
+int add(int a, int b)
+    {
+    return a + b;
+    }
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2))
+    {
+    int x = 1 * 2;
+    return;
+    }
+
+int fdfd(int* t)
+    {
+    return 1;
+    }
+
+if (*f(xss) < mx)
+    {
+    return 1;
+    }
+
+if (**f(xss) < mx)
+    {
+    return 1;
+    }
+if (t * f(xss) < mx)
+    {
+    return 1;
+    }
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+    {
+    int* p = (int*)& _mem;
+    }
+
+void win_ui_flush (bool validate)
+    {
+    FOR_ALL_TAB_WINDOWS (tp, wp)
+        {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL)
+            {
+            if (tp == curtab)
+                {
+                ui_ext_win_position (wp, validate);
+                }
+            else
+                {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+                }
+            }
+
+        if (tp == curtab)
+            {
+            ui_ext_win_viewport (wp);
+            }
+        }
+    }
+
+win_T* lastwin_nofloating (void)
+    {
+    win_T* res = lastwin;
+
+    while (res->w_floating)
+        {
+        res = res->w_prev;
+        }
+
+    return res;
+    }
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+    {
+    m_futureMIText = std::async(std::launch::async, [ = ]()
+        {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+        }).share();
+    }
+
+Test::Test() : member1(argument)
+    , member2([this]
+    {
+    some_code(argument);
+    })
+, member3(42)
+, member4("test")
+    {
+    }
+
+struct xxxx
+    {
+    int a, b, c;
+    };
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+    {
+    return;
+    }
+
+int main(void)
+    {
+
+    switch (foo)
+        {
+        case 1:
+            a += 1;
+            break;
+        case 2:
+            {
+            a += 2;
+            break;
+            }
+        }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+    }
+
+mapping someData = ([
+                        "key": "value",
+                    ]);
+
+void fn()
+    {
+    some_fn(([
+                 "key1": "/path/to/file1.c",
+                 "key2": "/path/to/file2.c",
+             ]));
+    }
+
+int main()
+    {
+    while (true)
+        {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2)
+            {
+            abc();
+
+            for (int i = 0; i < 6; i++)
+                {
+                def();
+                }
+            }
+        else
+            {
+            xyz();
+
+            for (int i = 0; i < 8; i++)
+                {
+                xyz();
+                }
+            }
+        }
+    return 0;
+    }
+
+struct s
+    {
+    public:
+        inline s() :
+            size(x),
+            ia {new int [y]},
+            ia {new int [y]}
+            {}
+    }
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct
+    {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+    }
+
+struct
+    {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+    }
+
+typedef struct
+    {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+    }

AStyleTest/regression-sh/tmp.cpp

@@ -0,0 +1,293 @@
+#include "stdafx.h"
+#include <emmintrin.h>
+#include <iostream>
+
+// a badly formatted file used for CI regression tests
+
+#ifdef TEST
+
+#endif
+
+using namespace std;
+
+// Function declaration
+int add(int a, int b);
+
+// Class definition
+class MyClass {
+public:
+    MyClass   (int         value) : myValue         (value       ) {}
+    void        display() {
+        cout << "MyValue: "       << myValue      << endl;
+    }
+private:
+    int        myValue;
+};
+
+int main() {
+    // Variables and data types
+int a, b, c, x, someVal, someVal2, someVal3, someVal4 = 5;
+double y, foo, bar = 3.14;
+char ch = 'A';
+bool isTrue = true;
+
+	struct {             // Structure declaration
+  int myNum;         // Member (int variable)
+  string myString;   // Member (string variable)
+} myStructure;       // Structure variable
+
+    // Arithmetic operations
+    int result = x + 2 * (int)y;
+    cout << "Result: " << result << endl;
+
+    // Conditional statement
+    if (x > 0) {
+        cout << "x is positive" << endl;
+    } else {
+        cout << "x is non-positive" << endl;
+    }
+
+    // Loop
+for (int i = 0; i < 5; i++) {
+cout << "Iteration " << i + 1 << endl;
+}
+
+    // Function call
+    int sum = add(3, 4);
+    cout << "Sum: " << sum << endl;
+
+    // Object creation and method call
+    MyClass obj(42);
+    obj.display();
+
+	goto label;
+
+label:
+
+    MyClass.setA1234( 1 )
+         .setB12dsadasdasdsa( 2 )
+.setB12dsadasdasdsa()
+.setB12dsadasdasdsa( 2 )
+         .setB12dsadasdasdsa( 2 )
+         .setC12dsdsds( 3 );
+
+   if (a=b=c) {
+        func(a==b==c);
+        someVal = someVal2 =
+        someVal3 = someVal4 = 0;
+
+if (x) {
+someVal = someVal2 =
+someVal3 = someVal4 = 0;
+}
+    }
+
+					int x2;
+
+    do
+	    {
+x2 = 1;
+    } while (func(foo,
+    bar));
+
+    return 0;
+}
+
+// Function definition
+int add(int a, int b) {
+    return a + b;
+}
+
+
+// Pointer alignment
+
+if (anotherMethod((uint8_t *)param1, (uint8_t *)param2)) {
+        int x = 1 * 2;
+        return;
+    }
+
+    int fdfd(int* t) {
+    return 1;
+}
+
+if (*f(xss) < mx) {
+    return 1;
+}
+
+if (**f(xss) < mx) {
+    return 1;
+}
+if (t * f(xss) < mx) {
+    return 1;
+}
+
+
+int* p = (int*)& _mem;
+
+void foo(int a, int c)
+{
+    int* p = (int*)& _mem;
+}
+
+void win_ui_flush (bool validate)
+{
+    FOR_ALL_TAB_WINDOWS (tp, wp) {
+        if (wp->w_pos_changed && wp->w_grid_alloc.chars != NULL) {
+            if (tp == curtab) {
+                ui_ext_win_position (wp, validate);
+            } else {
+                ui_call_win_hide (wp->w_grid_alloc.handle);
+                wp->w_pos_changed = false;
+            }
+        }
+
+        if (tp == curtab) {
+            ui_ext_win_viewport (wp);
+        }
+    }
+}
+
+win_T* lastwin_nofloating (void)
+{
+    win_T* res = lastwin;
+
+    while (res->w_floating) {
+        res = res->w_prev;
+    }
+
+    return res;
+}
+
+
+
+CPPageFileMediaInfo::CPPageFileMediaInfo(CString path, IFileSourceFilter *pFSF)
+    : CPropertyPage(CPPageFileMediaInfo::IDD, CPPageFileMediaInfo::IDD)
+    , m_fn(path)
+    , m_path(path)
+{   m_futureMIText = std::async(std::launch::async, [ = ]()
+    {
+#if USE_STATIC_MEDIAINFO
+        MediaInfoLib::String filename = m_path;
+        MediaInfoLib::MediaInfo MI;
+#else
+        MediaInfoDLL::String filename = m_path;
+        MediaInfo MI;
+#endif
+
+        return MI.Inform().c_str();
+    }).share();
+}
+
+
+
+
+Test::Test() : member1(argument)
+    , member2([this] {
+                  some_code(argument);
+              })
+    , member3(42)
+    , member4("test")
+{
+}
+
+
+struct xxxx {
+    int a, b, c;
+};
+
+(struct xxxxx *p);
+
+int main(int * p, int *q)
+{
+    return;
+}
+
+int main(void)
+{
+
+    switch (foo) {
+    case 1:
+        a += 1;
+        break;
+    case 2: {
+        a += 2;
+        break;
+    }
+    }
+
+    struct xxxx *p;
+    printf("sizeof p: %d\n", sizeof p);
+
+    int * p, *q;
+
+    return 0;
+}
+
+
+
+mapping someData = ([
+    "key": "value",
+]);
+
+void fn() {
+    some_fn(([
+        "key1": "/path/to/file1.c",
+        "key2": "/path/to/file2.c",
+    ]));
+}
+
+
+int main() {
+    while (true) {
+        new int *[5]; // Remove this and everything works fine
+        if (5 > 2) {
+            abc();
+
+            for (int i = 0; i < 6; i++) {
+                def();
+            }
+        } else {
+            xyz();
+
+            for (int i = 0; i < 8; i++) {
+                xyz();
+            }
+        }
+    }
+    return 0;
+}
+
+struct s {
+    public:
+        inline s() :
+            size(x),
+            ia {new int [y]},
+            ia {new int [y]}
+        {}
+}
+
+
+
+#define MY_BITFIELD_WIDTH
+
+typedef struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+struct {
+    uint32_t member_1 :    MY_BITFIELD_WIDTH;
+    uint32_t member_1 : MY_BITFIELD_WIDTH;
+    uint32_t member_2 : MY_BITFIELD_WIDTH;
+    bool (*func) (void);
+}
+
+
+typedef struct {
+    uint32_t member_1 : 8;
+    uint32_t member_1 : 2;
+    uint32_t member_2 : 3;
+    bool (*func) (void);
+}

CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.8)
+project(astyle CXX)
+
+add_subdirectory( AStyle )
+
+# Only attempt to build wxWidgets if found
+find_package(wxWidgets)
+if (wxWidgets_FOUND)
+    add_subdirectory( AStyleWx )
+endif ()

README.adoc

@@ -1,9 +1,9 @@
 = Artistic Style
 
-Artistic Style is a source code indenter, formatter, and beautifier for the C, C++, C++/CLI, Objective‑C, C# and Java programming languages. 
-Written in C++, it can be used from the command line or incorporated as a library in another program. 
+Artistic Style is a source code indenter, formatter, and beautifier for the C, pass:[C++], pass:[C++]/CLI, Objective‑C, C# and Java programming languages. 
+Written in pass:[C++], it can be used from the command line or incorporated as a library in another program. 
 Options can be entered from the command line or from an option file. 
-The library version can be called from programs written in languages other that C++.
+The library version can be called from programs written in languages other than pass:[C++].
 
 == Repositories