Uncrustify 0.66.1

.gitignore

@@ -6,6 +6,7 @@ src/uncrustify_version.h
 # Testing framework
 results/
 tests/results/
+tests/results_2/
 tests/usage.txt
 tests/pclint/
 *.sh.trs
@@ -90,4 +91,4 @@ build/
 # Eclipse Configuration
 .cproject
 .project
-.settings
+.settings

.travis.yml

@@ -6,6 +6,7 @@ matrix:
   include:
     - env: BUILD_TYPE=debug
     - env: BUILD_TYPE=release
+    - env: BUILD_TYPE=release NO_MACRO_VARARG=1
 
     # GCC 6
     - env: C_COMPILER=gcc-6 CXX_COMPILER=g++-6
@@ -87,5 +88,5 @@ script:
     # test if all the sources are conform to the forUncrustifySources.cfg config file
   - if [ "x${BUILD_TYPE}" == "xrelease" ]; then cd ../; ./scripts/Run_uncrustify_for_sources.sh; fi
     # test if uncrustify runs for (some) command line options
-  - if [ "x${BUILD_TYPE}" == "xrelease" ]; then ./scripts/Test_more_Options.sh; fi
+  - if [ "x${BUILD_TYPE}" == "xrelease" ]; then ./tests/cli/test_cli_options.sh; fi
 #  - /home/travis/build/uncrustify/uncrustify/build/uncrustify -c /home/travis/build/uncrustify/uncrustify/tests/config/mono.cfg -f /home/travis/build/uncrustify/uncrustify/tests/input/cs/simple.cs -L A

CMakeLists.txt

@@ -43,6 +43,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
     endif()
     unset(flag_var)
   endforeach()
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
+  endif()
   unset(gcc_warning_flags)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_definitions(-std=gnu++0x)
@@ -120,7 +123,7 @@ endif()
 #
 
 # FIXME: the version number should be automatically integrated
-set(CURRENT_VERSION "Uncrustify-0.65_f")
+set(CURRENT_VERSION "Uncrustify-0.66.1_f")
 
 option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
 if(NOT NoGitVersionString)
@@ -207,6 +210,7 @@ add_executable(uncrustify
   src/unc_tools.cpp
   src/unicode.cpp
   src/universalindentgui.cpp
+  src/controlPSECount.cpp
   src/width.cpp
   src/align_stack.h
   src/args.h
@@ -230,6 +234,7 @@ add_executable(uncrustify
   src/unc_ctype.h
   src/unc_text.h
   src/unc_tools.h
+  src/controlPSECount.h
 )
 
 if(CMAKE_VERSION VERSION_LESS 2.8.10)

ChangeLog

@@ -1,3 +1,37 @@
+Change highlights in uncrustify-0.66.1 (November 2017)
+-------------------------------------------------------------------------------
+
+Bugfix:
+ - Debian issue #881249 "FTBFS on armel/i386/mips64el/s390x: cpp_33057 fails"
+     is fixed
+
+Change highlights in uncrustify-0.66 (November 2017)
+-------------------------------------------------------------------------------
+
+New options:
+  - indent_ignore_asm_block              Nov 05
+  - sp_angle_colon                       Oct 17
+  - nl_func_call_empty                   Sep 30
+  - nl_func_call_paren_empty             Sep 30
+  - align_func_params_span               Sep 29
+  - align_func_params_thresh             Sep 29
+  - align_func_params_gap                Sep 29
+  - nl_func_call_paren                   Jul 25
+  - indent_paren_after_func_def          Jul 21
+  - indent_paren_after_func_decl         Jul 21
+  - indent_paren_after_func_call         Jul 21
+  - nl_func_paren_empty                  Jul 07
+  - nl_func_def_paren_empty              Jul 07
+  - indent_switch_pp                     Jun 22
+  - pp_indent_case                       Jun 22
+  - pp_indent_func_def                   Jun 22
+  - pp_indent_extern                     Jun 22
+  - pp_indent_brace                      Jun 22
+
+Bugfix:
+ - Issue # 548, 1098, 1103, 1108, 1112, 1127, 1134, 1158, 1165, 1170, 1187,
+     1200, 1203, 1236, 1249, 1310, 1315, 1340, 1349, 1352, 1366 are fixed
+
 Change highlights in uncrustify-0.65 (May 2017)
 -------------------------------------------------------------------------------
 

README.md

@@ -9,7 +9,7 @@
 A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA
 
 ## Features
-* highly configurable - __590__ configurable options as of version 0.65
+* highly configurable - 609 configurable options as of version 0.66.1
 - <details><summary>add/remove spaces</summary>
 
   - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._
@@ -133,6 +133,10 @@ More about this is in the [ISSUE_TEMPLATE](https://github.com/uncrustify/uncrust
 [Look at the Wiki](https://github.com/uncrustify/uncrustify/wiki/Known-Problems)
 
 
+## Which repositories have uncrustify?
+[Look here](https://repology.org/metapackage/uncrustify/versions)
+
+
 ## Contribute
 If you want to add a feature, fix a bug, or implement missing
 functionality, feel free to do so! Patches are welcome!
@@ -177,12 +181,8 @@ The codebase has to be formatted by the options set up in
 cause TravisCI build failures.
 
 The Command line interface (CLI) output is tested by the
-`scripts/Test_more_Options.sh` script. It operates on the files inside
-this directories:
-- `scripts/Config/`
-- `scripts/Output/`
-- `scripts/Input/`
-- `scripts/More_Options_to_Test/`
+`test_cli_options.sh` script. It is located inside of `tests/cli/` and operates
+on the subdirectories of that folder.
 
 If a PR is altering the CLI output, files inside those directories might
 need to be manually updated. This often happens when options are
@@ -199,7 +199,7 @@ The software has been previously tested on the following operating systems:
 - OS X
 - FreeBSD, NetBSD, OpenBSD
 - Sun Solaris 9
-- Windows XP (binary available)
+- Windows (binary available)
 
 
 ---------------------------------------------------------------------------

TESTING

@@ -103,3 +103,5 @@ Features
 - Tip: There are also a few options to run_tests.py that can
   help. Most interesting is '-d' will run 'diff' if the test fails.
 
+- Tip: If some errors occur with Windows, set the macro variable
+  NO_MACRO_VARARG to 1 to test some more pointer under Linux.

appveyor.yml

@@ -2,8 +2,13 @@ version: "{build}"
 platform: x64
 environment:
   matrix:
-     - CONFIG: Debug
-     - CONFIG: Release
+  # MSVC
+  - GENERATOR: Visual Studio 15 2017 Win64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  - GENERATOR: Visual Studio 14 2015 Win64
+configuration:
+  - Debug
+  - Release
 clone_folder: C:\projects\uncrustify
 branches:
   only:
@@ -16,17 +21,15 @@ skip_tags: true
 
 install:
   - "SET PATH=C:/Python35-x64;C:/Python35-x64/Scripts;%PATH%"
-build_script:
-  - echo Running CMake...
+before_build:
   - cd c:\projects\uncrustify
   - mkdir build
   - cd build
-  - cmake -G "Visual Studio 14 2015 Win64" ..
-  - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  - set MSBuildOptions=/v:m /p:Configuration=%CONFIG% /logger:%MSBuildLogger%
-  - msbuild %MSBuildOptions% uncrustify.sln
+  - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%GENERATOR%" ..
+build_script:
+  - cmake --build . --config %CONFIGURATION%
 test_script:
 #  - echo This is for test only
 #  - C:/projects/uncrustify/build/Debug/uncrustify.exe -c C:/projects/uncrustify/tests/config/mono.cfg -f C:/projects/uncrustify/tests/input/cs/simple.cs -L 66
-  - ctest -C %CONFIG% -V
+  - ctest -C %CONFIGURATION% -V
 deploy: off

documentation/htdocs/ben.cfg.txt

@@ -104,7 +104,7 @@ align_var_struct_span		= 99
 align_right_cmt_span		= 3
 align_pp_define_span		= 3
 align_pp_define_gap		= 4
-align_number_left		= TRUE
+align_number_right		= TRUE
 align_typedef_span		= 5
 align_typedef_gap		= 3