From 0247755e1496b876c4fa5759eafb6ebc1b47a459 Mon Sep 17 00:00:00 2001 From: Ben Gardner Date: Thu, 25 Nov 2010 10:20:27 -0600 Subject: [PATCH] Prep uncrustify 0.57 release --- ChangeLog | 15 + aclocal.m4 | 4 +- commit.log | 984 +++++++++++++++++++++++++++++++ configure | 341 ++++++----- configure.in | 2 +- documentation/htdocs/default.cfg | 136 ++++- documentation/htdocs/index.html | 2 +- etc/defaults.cfg | 29 +- extras.vpj | 1 + man/uncrustify.1.in | 3 + release-steps.txt | 35 +- src/config.h | 6 +- 12 files changed, 1344 insertions(+), 214 deletions(-) diff --git a/ChangeLog b/ChangeLog index d30512f063..cd8a3b793d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,19 @@ +Change highlights in uncrustify-0.57 (25 Nov 2010) +------------------------------------------------------------------------------- +New options: + - sp_func_call_paren_empty + - nl_func_def_start + - nl_func_def_start_single + - nl_func_def_paren + - nl_func_def_args + - nl_func_def_empty + - nl_func_def_end + - nl_func_def_end_single + +See commit.log for details. + + Change highlights in uncrustify-0.56 (27 Mar 2010) ------------------------------------------------------------------------------- New options: diff --git a/aclocal.m4 b/aclocal.m4 index 233c4f7b8e..741fa125f9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff --git a/commit.log b/commit.log index c9bd70754c..f0d705d923 100644 --- a/commit.log +++ b/commit.log @@ -1,3 +1,474 @@ +commit cbb8025fd6ba45664ed49e7f4d4c4e215fc77b01 +Author: Ben Gardner +Date: Wed Nov 24 10:51:39 2010 -0600 + + Bail on template detection if we back up into a return and there is a + boolean op in the angles. + +commit ef6ccbacb8583b22c9d3df8a2b3c9bf808628cf7 +Author: Ben Gardner +Date: Wed Nov 24 10:09:09 2010 -0600 + + Fix detection of anonymous bit fields in a structure + +commit bda365fd6805565584ab02237862cc961eb99723 +Author: Ben Gardner +Date: Sat Nov 20 10:25:09 2010 -0600 + + Fix incorrect removal of braces of an 'if' statement that is followed by + and 'else' and have a nested 'if' before the 'else'. + +commit 2d1498c30ae7aa985fbde3d882ab2d35092b4adf +Author: Ben Gardner +Date: Mon Nov 15 17:22:08 2010 -0600 + + Don't change the '*' in the following to a ptr_type: + struct { int a; } b[2 * SZ]; + +commit 233256cc6a661ff8ff56f31172602b11be9c4149 +Author: Ben Gardner +Date: Mon Nov 15 17:12:34 2010 -0600 + + Improve labeling of the angled brackets in protocol lists as in: + @protocol Shape + +commit 5276460b2449fe3f4410a44c47ff29ff3ada3773 +Author: Ben Gardner +Date: Sat Nov 6 14:18:41 2010 -0500 + + Do not indent ignored text. + +commit 196b1e23fe67070290285ee9e180f2c3a1ff1949 +Author: Ben Gardner +Date: Thu Nov 4 10:09:44 2010 -0500 + + Add support for Q_SLOTS and Q_SIGNALS. (John Volpe) + +commit e936d42ed978b8e1497ec4b65171f52262795ff5 +Author: Ben Gardner +Date: Thu Nov 4 09:55:04 2010 -0500 + + Update test to cover classes declared with scope. + +commit a690b7bcce5371935c569c0d9564da23e125070f +Author: Ben Gardner +Date: Thu Nov 4 09:52:14 2010 -0500 + + Skip over '::' when looking for the class name. + +commit cf154549c630206d22e4fca3b27e1672cc6ed26a +Author: Ben Gardner +Date: Thu Nov 4 09:44:08 2010 -0500 + + Fix indent of ObjC class if there are no messages declared. + +commit 2382da103bd64ff866d0ce4a875436a5e8fd7740 +Author: Ben Gardner +Date: Thu Nov 4 09:16:23 2010 -0500 + + Check for indent-on on the current line before parsing off whitespace. + +commit 91808ad839f2aeb6566192beeac2f10f55027259 +Author: Ben Gardner +Date: Wed Nov 3 22:13:04 2010 -0500 + + Add D support for 'unittest' as a plain old symbol instead of a keyword. + +commit 49ddde72b5c528633c37341123a2a09da12db431 +Author: Ben Gardner +Date: Wed Nov 3 22:04:35 2010 -0500 + + Fix detection of " *INDENT-ON*" when the comment isn't in column 1. + +commit f7c0b6f5edf89f72cf9a01405d4611b8da1c5223 +Author: Ben Gardner +Date: Wed Nov 3 21:48:06 2010 -0500 + + Fix handling of multi-line CPP comments. + These are '//' comments with escaped newlines. + +commit 4dffd493412a5811e0b1cbfe1b31470511c75e34 +Author: Ben Gardner +Date: Wed Nov 3 21:03:25 2010 -0500 + + Add support for the D template format that doesn't use parens. + Example: "to!string(1.2)" or "TFoo!int.t x;" + Fixed bug #3091128 + +commit 2b2ceb78c6db5e1b1a099c11a1932b740ebb075a +Author: Ben Gardner +Date: Thu Oct 7 21:52:27 2010 -0500 + + Treat 'try' followed by a colon as a qualifier to handle this format: + A::A(int) try : B() { } catch (...) { } + + Otherwise, a virtual brace is inserted after 'try'. + +commit 4c5d7b7377efcda9e2c1573e2178ebe5a5386b55 +Author: Ben Gardner +Date: Thu Oct 7 21:40:14 2010 -0500 + + Fix detection of the language of files passed on the command line. + +commit 11fb326964e5096b75f2a3edb171851794163bb5 +Author: Ben Gardner +Date: Thu Oct 7 21:26:31 2010 -0500 + + Zero cpd.frame_count before scanning the file. + Force the preproc parent type to the correct value in pf_check(). + +commit a0c308b86bff8f29609b3dbc866317293317de2f +Author: Ben Gardner +Date: Thu Oct 7 20:17:24 2010 -0500 + + Add minimal support for C++0x rvalue references + +commit 67365501baa5df7b617a97ede8597809f102b727 +Author: Ben Gardner +Date: Thu Oct 7 19:26:58 2010 -0500 + + Add support for the MS-specific '#@' charizing preprocessor operator + +commit 52a3525fed0b407a01dace8f959b22e369f84fc1 +Author: Ben Gardner +Date: Wed Sep 1 20:12:49 2010 -0500 + + Comment out mark_struct_union_body log statement. + +commit 247a8053952291032b134b8ef2d35f94e4707d8c +Author: Ben Gardner +Date: Sat Aug 28 17:58:14 2010 -0500 + + Update test for C++0x R strings with embedded newlines. + +commit a20c582e003cccb1fa2f8f0f696c71ea3799dac2 +Author: Ben Gardner +Date: Sat Aug 28 17:57:50 2010 -0500 + + Newlines may appear inside the C++0x R"(xxx)" strings + +commit d1db1dd3ffa9983f9c07ecd824fba68785b55f9d +Author: Ben Gardner +Date: Thu Aug 26 20:51:22 2010 -0500 + + Update the tests for the newly added C++0x literals. + +commit 5af337c38f0dd8025ae46e2ccbf290d2b43a2638 +Author: Ben Gardner +Date: Thu Aug 26 20:49:10 2010 -0500 + + Add support for C++0x string literals and the user-defined literals + +commit e63fe8b359ac2efa1e015c87ae4eb079de7071fa +Author: Ben Gardner +Date: Fri Aug 13 09:00:40 2010 -0500 + + 'foreach' isn't a C++ keyword + +commit f543e31a8c6fe5b9b31fead5caafd970277319d8 +Author: Ben Gardner +Date: Wed Jul 28 21:41:59 2010 -0500 + + Fix incorrect log text + +commit 525014a12e3e5427e61f6f607d985fae87ab9657 +Author: Ben Gardner +Date: Wed Jul 28 21:41:47 2010 -0500 + + Improve support for D casts and const(type) qualifier. + +commit 0c9675a86e8225fe65bdaaf9a3138f6efe7c4d12 +Author: Ben Gardner +Date: Sun Jul 25 19:15:06 2010 -0500 + + Rework tests for new nl_func_def_xxx options + +commit fece00a87048a3e2631356c8d10ddd947498c6ad +Author: Ben Gardner +Date: Sun Jul 25 19:10:09 2010 -0500 + + Adjust config to pass with new options + +commit 2d1e4acc633a1ddf65d1f6a19c0c25ca29b8bbe8 +Author: Ben Gardner +Date: Sun Jul 25 19:09:41 2010 -0500 + + Add nl_func_def_paren, nl_func_def_start, nl_func_def_start_single, + nl_func_def_end, nl_func_def_end_single, nl_func_def_empty + +commit 494715379a4b277fa72ff029ae9593f063125730 +Author: Ben Gardner +Date: Sun Jul 25 18:46:34 2010 -0500 + + Enhance tests for nl_func_def_args + +commit 462b272579de97a1140fd7a8fc7f3f3bb21ee198 +Author: Ben Gardner +Date: Sun Jul 25 18:45:35 2010 -0500 + + Add option nl_func_def_args, which is nl_func_decl_args for function defs. + +commit 022a9f957da6f907a07f492af2cdcbf9e3d7883b +Author: Ben Gardner +Date: Sun Jul 25 18:22:40 2010 -0500 + + Fix interaction between mod_case_brace and mod_move_case_brace + +commit 74b73e29483c52fba4b34decde389a837373fbc9 +Author: Ben Gardner +Date: Sun Jul 25 18:17:44 2010 -0500 + + Add more logging for inserting blank lines. + +commit 7449c779ffa8944adae43d4579515d1f1540de18 +Author: Ben Gardner +Date: Sun Jul 25 17:48:59 2010 -0500 + + Add option sp_func_call_paren_empty + +commit 033a4ff4fab8954f6f66e79245e550ef623dfe10 +Author: Ben Gardner +Date: Sun Jul 25 17:46:37 2010 -0500 + + Update tests for operator byref fix. + SF bug #3023966 + +commit 54a60a6b912bfbd2fbe0366fe1907f4651d8c79f +Author: Ben Gardner +Date: Sun Jul 25 17:27:46 2010 -0500 + + Use column_indent for checking to see if a comment is off to the right. + Fixed detection inside of switch statements. + SF bug #3032787 + +commit e54a3e147d4e7f44a5f54a82e7c8469c819bf0c1 +Author: Ben Gardner +Date: Sun Jul 25 16:59:22 2010 -0500 + + Change operator tokens into a type before merging into CT_OPERATOR_VAL. + Fixed SF bug #3023966. + +commit 508abd9c8fc41e14f0f498df27afa1234d8ec79b +Author: Ben Gardner +Date: Sun Jul 25 16:45:18 2010 -0500 + + Try to do a better job of handling struct/union bodies, reusing code. + Fixes bug-3029014 + +commit 7425e9e102cc81381b366a814176e8914bede5f1 +Author: Ben Gardner +Date: Sun Jul 25 16:40:56 2010 -0500 + + Update test for bug 3029014 + +commit e2166d7634e28f44352bdab4e5d0e70cc8dd1606 +Author: Ben Gardner +Date: Sat Jul 24 11:45:31 2010 -0500 + + Add missing ChoicesReadable for lead_break, lead_force, etc. + +commit 931d0b7e5d381c9849695f1f56c3dd19fdea1e93 +Author: Ben Gardner +Date: Wed Jul 21 21:54:33 2010 -0500 + + Add a test for templates. + Illustrates SF bug #3019852 + +commit d5f09b310e3ac6acb7cee023a16a8fe8d98f75d2 +Author: Ben Gardner +Date: Wed Jul 21 21:51:19 2010 -0500 + + Mark token after '+' as starting an expression + Fixes SF bug 3032782 + +commit 07fc9a7e6179d77d0170ecadf66c285896f12542 +Author: Ben Gardner +Date: Fri Jul 16 17:16:24 2010 -0500 + + Add --frag option for indenting a code fragment. + +commit 5777fe7d9a354b074e579a18630f5e30b90bbea7 +Author: Ben Gardner +Date: Thu Jul 15 20:43:23 2010 -0500 + + Templates: Only split a '>?' if the '<' is at the top of the stack + +commit 9b77f5bfe4dd4593e3b5e0a9da64c252704b7b2c +Author: Ben Gardner +Date: Wed Jul 14 21:51:02 2010 -0500 + + Improve throw() handling. It is either like return or const. + +commit 73a33f4b4952992351d9e2c6ab05660b03a76c0f +Author: Ben Gardner +Date: Wed Jul 14 20:09:27 2010 -0500 + + Fix removal of braces when the body contains a braced statement + extra stuff + +commit 877bf9e44a20e8381ccd342d5f763789e12d10d9 +Author: Ben Gardner +Date: Tue Jun 8 07:53:44 2010 -0500 + + Increase the hard-coded template depth from 16 to 1024. + +commit aefb0814b43b59ca3abfbfc5366653efe065075c +Author: Ben Gardner +Date: Fri May 28 17:05:16 2010 -0500 + + Rebuild automake stuff after applying the last silent build patch. + +commit d2c438a56776a04c945972961a4cd11c96b9630b +Author: Ben Gardner +Date: Fri May 28 17:03:52 2010 -0500 + + Use silent rules instead of nostdinc + + A nice feature of automake is that it allows a VPATH build. That is, + a build from outside the source tree. This is disabled in uncrustify + via nostdinc in /src/Makefile.am. If the purpose of using nostdinc + is to clean up the output of the build, I recommend using + silent rules instead. + +commit 10ef222f462174a92d727f2afd669f346d0deb4c +Author: Ben Gardner +Date: Fri May 28 16:54:58 2010 -0500 + + Skip over CT_SPACE when looking for the chunk to align the open paren. + +commit 4b246dd11309323b446e31f4b75835f1289d471b +Author: Ben Gardner +Date: Fri May 28 16:18:22 2010 -0500 + + Close out the assign on a level drop inside a preprocessor. + +commit b120022d230e7c3e623269128ab27ea0838b8e11 +Author: Ben Gardner +Date: Fri May 28 15:41:20 2010 -0500 + + Clean up some minor (?) code issues. + Tests still pass, so I doubt the code in question mattered too much. + I'm sure someone will let me know if this change breaks something. + +commit 211a7366ea612ae18153b660a847f34ecd75ccf6 +Author: Ben Gardner +Date: Fri May 28 15:11:17 2010 -0500 + + Properly mark the return type of an operator function def/proto. + +commit f446787e4de9add6467646d3b17dcc9c50b2a157 +Author: Ben Gardner +Date: Fri May 28 14:44:28 2010 -0500 + + Update test to cover a class declaration with a macro before the class name. + +commit 56de0a62647e9fe5970e6ce5c5242af81be36006 +Author: Ben Gardner +Date: Fri May 28 14:43:24 2010 -0500 + + Handle macros in the class name, detecting the last word/type as the class. + class MACRO foo { + }; + +commit 84162ab363cb62b1e355d055aaaad23cf9b6429a +Author: Ben Gardner +Date: Fri May 28 14:24:05 2010 -0500 + + Reset the column after outputting the BOM. + +commit 5be5734967ad787c22d5e3a30d5c15d7646e8b6b +Author: Ben Gardner +Date: Mon May 17 18:23:44 2010 -0500 + + Clean up build and project files. + Rebuild the makefiles. + +commit 3fce21b5dd8f61adf4aab3a8c71209e22d957452 +Author: Ben Gardner +Date: Mon May 17 18:21:09 2010 -0500 + + Reduce the number of places where the version needs to be manually entered. + Automatically generate the man and version files. + + From: Ger Hobbelt + +commit efb84c2491d76b5f32e22b54561c69afb11796bf +Author: Ben Gardner +Date: Thu May 6 08:25:53 2010 -0500 + + Check for NULL to prevent a segmentation fault. + Fixes Debian bug #580195. + +commit 9a25a81a035dd7c1fe3d25213be14b482d48465d +Author: Ben Gardner +Date: Sun Apr 25 16:49:26 2010 -0500 + + Fix newline handling between 'private:' and a constructor. + Fixes bug 2983317 + +commit e635598c2ccf3a8d017bd2d88df59e3aa18326e4 +Author: Ben Gardner +Date: Wed Apr 21 07:56:03 2010 -0500 + + Fix spelling (paramter -> parameter) and regenerate the default configs. + +commit d256f0dfb9ec59b74d145da2b02bcbfc969980fa +Author: Ben Gardner +Date: Sun Apr 11 08:36:24 2010 -0500 + + Fix sp_paren_comma (was hard-coded to FORCE) + +commit a82bdbf9fa8b2f43340338329162ea61fde7496f +Author: Ben Gardner +Date: Tue Mar 30 19:03:11 2010 -0500 + + Do a better job of resolving '>>', '>=', '>>=' vs '> >' for templates. + Affects C++ and C#. + C# parses '>>' as two ANGLE_CLOSE and the logic must combine them when + it is supposed to be a right shift. + C++ parses '>>' as right shift and must peel off the leading '>' as needed. + +commit 7d5ef5c2d156b979ed1508ac1ad87ad4b40c39e6 +Author: Ben Gardner +Date: Tue Mar 30 18:59:57 2010 -0500 + + Add sp_angle_shift to control the space between two ANGLE_CLOSE. + '>>' vs '> >' + +commit 48542c381460f20d5e5e4316e46c3a97d9d8fc35 +Author: Ben Gardner +Date: Tue Mar 30 18:07:47 2010 -0500 + + Make sp_cpp_cast_paren affect TYPE_WRAP. + Example (assuming SLIST_HEAD is set as TYPE_WRAP): + typedef SLIST_HEAD( , foo) foo_list_t; + +commit 495501c3a2e6e6450b4654b7524e4b87aee99775 +Author: Ben Gardner +Date: Tue Mar 30 18:00:46 2010 -0500 + + Add sp_paren_comma to handle the super-rare missing first argument in a + macro. + "typedef SLIST_HEAD( , foo) foo_list_t;" + +commit 2f37327eab974d6faa2148af43347eea9be653bd +Author: Ben Gardner +Date: Tue Mar 30 17:56:45 2010 -0500 + + For mod_full_brace_xxx, 'remove' must be done before 'add' to make + 'force' work right. + +commit 174fc88607a0d4f0eb43bb66ccd7e5878bf33ebd +Author: Ben Gardner +Date: Tue Mar 30 17:55:34 2010 -0500 + + Label colons inside a function call as CT_LABEL_COLON + +commit 044aa182b0cc8ea2699345fc713dd672ec4c48c3 +Author: Ben Gardner +Date: Sat Mar 27 16:40:16 2010 -0500 + + Prep for version 0.56 + commit bf91a0e8452d67043c1f173d4c3891ee5e28ac44 Author: Ben Gardner Date: Sat Mar 27 16:10:56 2010 -0500 @@ -507,3 +978,516 @@ Author: Ben Gardner Date: Fri Nov 27 21:54:47 2009 -0600 Update release step. + +commit 709abc9d725d5b95a031057f2ad143325b99220a +Author: Ben Gardner +Date: Fri Nov 27 21:46:26 2009 -0600 + + Save off auto-generated files. + +commit c842cf4d9515f6d52a7f1cf8e72a9269517585c3 +Author: Ben Gardner +Date: Fri Nov 27 21:46:07 2009 -0600 + + Missed some support files for Win32 and OSX + +commit f0e41e2ff8b0ba6782ee520f74748cb38a01f44f +Author: Ben Gardner +Date: Fri Nov 27 21:30:18 2009 -0600 + + Update the release steps. + +commit 22f60eb9e70b7162f879d3d5b4685b1692a516b5 +Author: Ben Gardner +Date: Fri Nov 27 21:29:50 2009 -0600 + + Update the default config files. + +commit fa38a4d0b356130780f2aafae4fa089dae7b0ea2 +Author: Ben Gardner +Date: Fri Nov 27 21:17:48 2009 -0600 + + Move changelog to the root so 'make dist' can pick it up. + +commit 3fec51af2bac389ec34e9817ae3b22c2b196e48a +Author: Ben Gardner +Date: Fri Nov 27 20:59:52 2009 -0600 + + Update vpj file + +commit 7a426d5c03d9ef6fd721bc4474b647ce01ff1540 +Author: Ben Gardner +Date: Fri Nov 27 20:59:27 2009 -0600 + + Makefile.in doesn't need to be checked in. + +commit ea1432b6691ad678e23b470eae7473ad6e3d9646 +Author: Ben Gardner +Date: Fri Nov 27 20:57:41 2009 -0600 + + Fix operator-related breakage in pawn. + +commit 2ca1ce44ccc6da68f254ef7d2f88c01c856050ae +Author: Ben Gardner +Date: Fri Nov 27 18:10:24 2009 -0600 + + Update makefile to get 'make dist' to work right. + +commit cdc226c38c2a0d87603f24cb72b61a4d40850b8a +Author: Ben Gardner +Date: Fri Nov 27 17:59:07 2009 -0600 + + Add the homepage URL + +commit 42ca2151714ef394392f929607b18e59a59707a9 +Author: Ben Gardner +Date: Fri Nov 27 15:32:29 2009 -0600 + + Run 'autogen.sh' on Ubuntu 9.10 + +commit 163dfc47d406c4d709271a75380575d16afae923 +Author: Ben Gardner +Date: Fri Nov 27 15:31:47 2009 -0600 + + Updates for release 0.55 + +commit 2daa03ce4df9479178d4c84c5965af895eb4d41d +Author: Ben Gardner +Date: Fri Nov 27 11:27:26 2009 -0600 + + Add nl_func_decl_start_single and nl_func_decl_end_single + +commit 18dba54313c8aea3e59593fdab2a7beeb01fe5e2 +Author: Ben Gardner +Date: Fri Nov 27 11:06:41 2009 -0600 + + Add new option: nl_after_vbrace_open_empty + +commit 285dd9175bab26d9f44538131852210a24de20ea +Author: Ben Gardner +Date: Fri Nov 27 10:30:49 2009 -0600 + + Fix possible out-of-bounds array access. + +commit 71daf98217f8ee4ade168f9cf786b99c119124f3 +Author: Ben Gardner +Date: Thu Nov 19 20:17:47 2009 -0600 + + 'mutable' is a qualifier, just like const. Except different. + +commit 9855ec9cfd5b39daa35f389892cebcd48dd48452 +Author: Ben Gardner +Date: Thu Nov 19 20:08:54 2009 -0600 + + Update test + +commit 19463629dedebd2ac84d001ef6dbb4f419856654 +Author: Ben Gardner +Date: Thu Nov 19 20:05:15 2009 -0600 + + Don't insert a newline between a brace and comment for the else. + +commit d4270ec55aac03ad76b8816b07f2fcd7cc1ef15e +Author: Ben Gardner +Date: Thu Nov 19 19:42:51 2009 -0600 + + Fix test to reflect nl_struct_brace fix. + +commit 93be59cf4e1d56df7798a247a640edac14eecdb6 +Author: Ben Gardner +Date: Thu Nov 19 19:42:09 2009 -0600 + + pos_assign should not affect '=' followed by '{'. + +commit 3cda54e81789ccaf198ce498ed49d50c15464e56 +Author: Ben Gardner +Date: Thu Nov 19 19:30:47 2009 -0600 + + nl_struct_brace should not apply outside of a 'struct' declaration. + + // applies + struct foo { int x; int y; }; + + // does not apply + struct foo bar = { 5, 6 }; + +commit b209fe1639061db4a2f59b5bb1656ce64697dfbd +Author: Ben Gardner +Date: Thu Nov 19 18:55:53 2009 -0600 + + Change nl_create_if_one_liner to also work for 'else if' and 'else'. + +commit c20507f47e3d9db50e1d99eb91de9a4673955a17 +Author: Ben Gardner +Date: Sat Nov 14 18:13:33 2009 -0600 + + Fix align_on_tabstop + +commit e9c387ba3dd0f0d584156f12540d2668faafa635 +Author: Ben Gardner +Date: Sat Nov 14 18:13:21 2009 -0600 + + Fix align_with_tabs + +commit 90ca35b66e07ee5b9d695fde168eca016ee656c7 +Author: Ben Gardner +Date: Sat Nov 14 17:59:49 2009 -0600 + + Set PCF_WAS_ALIGNED when aligning chunks. + +commit 5c459ba07a32a2474522e31dd9873667fbd9ecde +Author: Ben Gardner +Date: Sat Nov 14 17:44:42 2009 -0600 + + Improve template test + +commit 405eb7bbd3c53b6b8daa48a2d79259e94d9b5941 +Author: Ben Gardner +Date: Sat Nov 14 17:44:21 2009 -0600 + + Add support for templates inside a #define + Fixes SF bug #2887001 + +commit 619b83477d37796f591477c35bb2c70ca96a779f +Author: Ben Gardner +Date: Sat Nov 14 17:02:59 2009 -0600 + + Improve operator tests after recent bugfix. + +commit ef02353e0c7d20082bad9e2c9f5228f64a17c2d1 +Author: Ben Gardner +Date: Sat Nov 14 16:58:19 2009 -0600 + + Rework operator handling. + Everything after the 'operator' keyword that is part of the operator + type is put in one chunk. + Fixes SF bug #2889468 + +commit f2941dd0dfa70431989d2d9f994532b3ac5aa019 +Author: Ben Gardner +Date: Sat Nov 14 13:32:23 2009 -0600 + + Improve test for nl_func_type_name + +commit b9f6aba423e6e08620ee83b7fe39d83f7b5bb823 +Author: Ben Gardner +Date: Sat Nov 14 13:31:58 2009 -0600 + + nl_func_type_name: Don't remove a newline after a brace open. + Fixed SF bug #2889292 + +commit dc920c761a001e99305daf6d0531db50f0d47826 +Author: Ben Gardner +Date: Sat Nov 14 13:11:42 2009 -0600 + + Expand a test to include a destructor. + +commit 72846d01c88d2ab8a2843dffc97a3c04275e9608 +Author: Ben Gardner +Date: Sat Nov 14 13:11:01 2009 -0600 + + The destructor is part of the function name definition, not the type. + Fixes SF bug #2892606. + +commit ce39ae62f6b69aaa86e4a6365bddb50b09083cad +Author: Ben Gardner +Date: Wed Nov 11 22:42:00 2009 -0600 + + Minor whitespace and comment changes + + Signed-off-by: Ben Gardner + +commit e28fc35ab98e7efe5449bbae1f9ae5a92ec1808a +Author: rdan +Date: Thu Nov 12 05:35:49 2009 +0800 + + Code updates to be able to run tests script in python under windoze with uncrustify compiled in debug mode with Visual C++ 2005 + + Signed-off-by: rdan + +commit b38dfb52efef5c703316bb9bcb33d64e1283b5ee +Author: Ben Gardner +Date: Sat Nov 7 13:36:36 2009 -0600 + + Clarify and rework sp_before_ellipsis. + It only applies when after a non-punctuator. + Fixes SF issue #2886991. + +commit ff4780d68465eb8b480a096c89310f85c5664f73 +Author: Ben Gardner +Date: Fri Nov 6 09:27:04 2009 -0600 + + Add new option sp_endif_cmt + +commit 0fb8f11ec1302854e408db82b9fa6aaebfab19aa +Author: Ben Gardner +Date: Fri Nov 6 07:49:24 2009 -0600 + + Update test to cover the bug where a close paren is added inside a preproc. + +commit 328aca7a107bdd9859079d431d71cabf2d52c037 +Author: Ben Gardner +Date: Fri Nov 6 07:48:25 2009 -0600 + + Fix SF issue #2892803. + The close paren was being added inside a preprocessor line. + +commit ad62ea13b11112f478c5b8f9c974ae8a98820768 +Author: Ben Gardner +Date: Fri Nov 6 07:47:29 2009 -0600 + + Update SlickEdit project due to recent file deletions + +commit fc97bf3fb1396f7f2928ff59c0e74aabcfc91db2 +Author: Ben Gardner +Date: Thu Nov 5 17:46:27 2009 -0600 + + Do a little whitspace cleanup in make_token_names.sh + +commit 30297231a5cffd865db53ec007295163bf2b15ca +Author: Ben Gardner +Date: Thu Nov 5 17:44:52 2009 -0600 + + Add test for align_left_shift + +commit c8bba4c31bcc6e1956ee7519bcb037cbc07144ea +Author: Ben Gardner +Date: Thu Nov 5 17:44:29 2009 -0600 + + Fix align_left_shift with array indexes. + Fixes #2887031 + +commit 0eef7440ba20893e8b895bacda426dd756fa2fdc +Author: Ben Gardner +Date: Thu Nov 5 17:42:01 2009 -0600 + + Remove unused files + +commit 011a65079177126b9e3c1d7c82e9c90594441e57 +Merge: 80db493 d8e30f3 +Author: Ben Gardner +Date: Tue Oct 27 19:12:38 2009 -0500 + + Merge branch 'objc' + + Conflicts: + src/align.cpp + tests/run_tests.py + +commit 80db493b7f78d7ea9123c3a7a0b35a17597cc9c2 +Author: Ben Gardner +Date: Sun Oct 25 10:26:08 2009 -0500 + + Change exit value based on test results + +commit d8e30f3c3f11f867d52fe4c6b5e4fbeae5c05f7e +Author: Ben Gardner +Date: Sun Oct 25 10:22:30 2009 -0500 + + Add back in token_names.h - needed for Windows build, which cannot recreated it. + +commit 6ac52866038bb3000b4e0e825aaddf8587770d71 +Author: Ben Gardner +Date: Sun Oct 25 10:20:37 2009 -0500 + + Run uncrustify on its own code + +commit 264967863eaab7cd77dad767ffd2faf2bbc07724 +Author: Ben Gardner +Date: Sun Oct 25 10:10:16 2009 -0500 + + Run uncrustify on itself + +commit 5e696d6554fcec27f09ed244f1119cadcef52d89 +Author: André Berg +Date: Sun Oct 25 03:07:45 2009 +0800 + + Spelling fix. suprisingly -> surprisingly. Minor grammar tweaks. + +commit 809b47f672ee55915e203986a52633a26a762c30 +Author: André Berg +Date: Sun Oct 25 02:59:05 2009 +0800 + + Add OSX Xcode build & install instructions to README. + +commit d11d2dfbc83aa85ee9a6a06e7f86ac1f3a6f6221 +Author: André Berg +Date: Sat Oct 24 16:43:07 2009 +0800 + + Remove some unneeded left-overs. Shorten the more info url. + +commit adab7441278cf2f54712894fd2b1c0dce008dcfa +Author: André Berg +Date: Sat Oct 24 14:27:15 2009 +0800 + + Replace those pesky tabs in some config files with spaces. + +commit 305e94a0ced1ea2deb1169aa9322802b89c73b8b +Author: André Berg +Date: Sat Oct 24 14:26:27 2009 +0800 + + Update existing block tests to better demonstrate that spacing options work as intended. + +commit bdf8181f1a2a2251e465e646ec516a3ee22c8c72 +Author: André Berg +Date: Sat Oct 24 14:24:47 2009 +0800 + + Update existing test case which already was using blocks. + +commit dc82fcc501bbc75f00949d760c5a61da4a82acf3 +Author: André Berg +Date: Sat Oct 24 14:24:11 2009 +0800 + + Add and register more test cases for block caret spacing. + +commit 08678af3a74ef7e55949ecf358ae2fde99f17bcd +Author: André Berg +Date: Sat Oct 24 14:22:00 2009 +0800 + + Update objc.cfg file. + +commit 5e39d01fe8b4e7c63133c3853047843b3b40341a +Author: André Berg +Date: Sat Oct 24 14:19:50 2009 +0800 + + Add new options for space before and after a block pointer caret. + +commit 511bc74d7cb4cf17d7dccfaa8c953f7b73b281ed +Author: André Berg +Date: Sat Oct 24 13:06:29 2009 +0800 + + Add test cases for blocks. + +commit 2d7013d9290a7e60e18ed786d63a72e6931dcb98 +Author: André Berg +Date: Sat Oct 24 13:03:31 2009 +0800 + + Bug fix: Fix for detecting class category and extension parens. + + Was confusing type with parent_type earlier. + +commit b92b77b739d9b652071dbf8067f0cb19f6f9eb96 +Author: André Berg +Date: Sat Oct 24 12:49:32 2009 +0800 + + First (devel) version of changes for OC blocks support. + + - Register new chunk types in token_enum.h + - Add early detection of block pointer caret to tokenize_cleanup.cpp + - Do the marking in combine.cpp + +commit cb9c866934ff2937e59eebab7dfeb937de73f792 +Author: André Berg +Date: Thu Oct 22 00:24:41 2009 +0800 + + Bug fix: OC msg sends like [self class] are no longer marked as CT_CLASS. + +commit 1080cbdd00ee8b1535145d962265d16bb1bc85b2 +Author: André Berg +Date: Thu Oct 22 00:08:38 2009 +0800 + + Improvement: Change oc_msg_colon_align from boolean to span with number. + + Makes just much more sense that way. The align feature works great but + a bit too aggressively since it would just go and align method calls + happening at the very top of an enclosing method with method calls all + the way at the bottom of the enclosing method. I think a span of 1 will + fit what most Objective-C programmers use. + + Uptaded a lot of the oc test cases to test for this behaviour. + + Xcode project update: Add missing oc test cases. + +commit 0d8540ee1ab4f923e63474b31a355f467f47d1ae +Author: André Berg +Date: Wed Oct 21 19:33:19 2009 +0800 + + Update tests with real_world_file.m output. Make sure tests run cleanly. + +commit 257e93e999c2f8560160ebc4e42378665600bb6b +Author: André Berg +Date: Wed Oct 21 15:39:56 2009 +0800 + + Tests: Add a sample of real world objective-c code to the tests. + + This sample also includes blocks which currently are not marked in uncrustify. + Will change that later. + +commit 8b97e6b3899da59c91e6ad4922da3d77cc63cbe7 +Author: André Berg +Date: Wed Oct 21 15:36:19 2009 +0800 + + Bug fix: line_len can become 0 here which subsequently causes a segmentation fault. + + This is a workaround because larger issues seem to be at stake as + I have seen line to contain garbage value at some point half into the + sentence. + +commit 7c44cc65fa378610d7f05230a3f128cd94504672 +Author: André Berg +Date: Tue Oct 20 00:47:31 2009 +0800 + + Fix for (Type **) problems in msg decls/specs. Fix for missing parent type inside msg decl/spec type parens: + now correctly is OC_MSG_DECL/OC_MSG_SPEC. + +commit 80c7a10b4abca4e8fb583f49e9001fa1be002c8c +Author: André Berg +Date: Tue Oct 20 00:41:10 2009 +0800 + + Xcode project update: Rearranged some build scripts. Replaced some absolute group references with project relative ones. + +commit fe224a9c2ad6f11925539c0933f1cbcd63b74d33 +Author: André Berg +Date: Tue Oct 20 00:32:08 2009 +0800 + + Make run_tests.py return 0 on all success or 1 on failure. + This plays better with shell script incorporating build systems. + +commit 441fa512bb0ef38217467ac4dd4b766345f485bb +Author: André Berg +Date: Tue Oct 20 00:24:17 2009 +0800 + + Add missing osx directory. + +commit 9884f5057576248f6014bb889b740f736ed25f6d +Author: André Berg +Date: Tue Oct 20 00:23:08 2009 +0800 + + obj.cfg again... dunno how that change got lost in the commit + +commit 4ac16b0c705a0a56c83be0fdcf47bbf4cbc9a30d +Author: André Berg +Date: Tue Oct 20 00:21:20 2009 +0800 + + Update objc.cfg. Add a few extra Xcode project specific entries to .gitignore. + +commit 344cf3524a5e6152668a168493339834a58ea946 +Author: André Berg +Date: Tue Oct 20 00:29:46 2009 +0800 + + Add new Objective-C test for a more complex method. Details follow... + + The complex_method.m test was showing a problem with method argument types in the form of (typeName **) + where the first star would get parsed as ARITH and the the second star would get parsed as DEREF. + + I have a fix available, coming in one of the next commits. + +commit 67a83fb1248674908de7c8e14b82ac63a1032e9b +Author: Ben Gardner +Date: Sat Oct 17 14:33:18 2009 -0500 + + Clean up the home page. + - add mention of Git + - add FreeBSD ports link + +commit 23632dae52e5a30a8ff595d9bd9d6c6d2eede07a +Author: Ben Gardner +Date: Sat Oct 17 14:02:39 2009 -0500 + + Spelling fix: preceeded -> preceded + +commit fe25b6d06401b0a523e15a896831720c488bd5ce +Author: Ben Gardner +Date: Sat Oct 17 13:13:55 2009 -0500 + + Import r1644 from subversion diff --git a/configure b/configure index 2e6e6f27c5..4510e3a0b7 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for uncrustify 0.56. +# Generated by GNU Autoconf 2.67 for uncrustify 0.57. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -316,7 +316,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +356,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -530,7 +530,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='uncrustify' PACKAGE_TARNAME='uncrustify' -PACKAGE_VERSION='0.56' -PACKAGE_STRING='uncrustify 0.56' +PACKAGE_VERSION='0.57' +PACKAGE_STRING='uncrustify 0.57' PACKAGE_BUGREPORT='' PACKAGE_URL='http://uncrustify.sourceforge.net/' @@ -767,8 +767,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -813,7 +814,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -839,7 +840,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1043,7 +1044,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1059,7 +1060,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1089,8 +1090,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1098,7 +1099,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1116,13 +1117,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1145,7 +1146,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1159,8 +1160,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1175,9 +1176,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1216,11 +1217,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1246,7 +1247,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures uncrustify 0.56 to adapt to many kinds of systems. +\`configure' configures uncrustify 0.57 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1260,7 +1261,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1312,7 +1313,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of uncrustify 0.56:";; + short | recursive ) echo "Configuration of uncrustify 0.57:";; esac cat <<\_ACEOF @@ -1406,10 +1407,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -uncrustify configure 0.56 -generated by GNU Autoconf 2.65 +uncrustify configure 0.57 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1517,7 +1518,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1583,10 +1584,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1622,7 +1623,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1649,7 +1650,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1671,7 +1672,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1702,7 +1703,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1801,7 +1802,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1863,8 +1864,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by uncrustify $as_me 0.56, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by uncrustify $as_me 0.57, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1974,11 +1975,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2012,11 +2011,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2029,11 +2026,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2047,11 +2042,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2106,7 +2099,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2121,7 +2119,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2197,7 +2199,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2215,16 +2217,22 @@ am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2340,11 +2348,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2366,7 +2374,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2376,7 +2384,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2614,7 +2622,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2622,7 +2630,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2668,7 +2676,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2684,7 +2692,7 @@ fi # Define the identity of the package. PACKAGE='uncrustify' - VERSION='0.56' + VERSION='0.57' cat >>confdefs.h <<_ACEOF @@ -2975,9 +2983,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C++ compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C++ compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3019,8 +3026,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3077,9 +3084,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C++ compiled programs. +as_fn_error $? "cannot run C++ compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3130,8 +3137,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3749,8 +3756,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4163,7 +4170,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4179,11 +4186,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4222,7 +4229,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4238,18 +4245,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4310,7 +4317,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4376,7 +4383,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4508,8 +4515,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4523,8 +4529,7 @@ for ac_header in inttypes.h stdint.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4982,8 +4987,7 @@ for ac_func in memset strcasecmp strchr strdup strerror strtol strtoul do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -5126,6 +5130,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -5149,19 +5154,19 @@ else fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -5311,19 +5316,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -5519,7 +5524,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -5572,8 +5577,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by uncrustify $as_me 0.56, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by uncrustify $as_me 0.57, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5639,11 +5644,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -uncrustify config.status 0.56 -configured by $0, generated by GNU Autoconf 2.65, +uncrustify config.status 0.57 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5661,11 +5666,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -5687,6 +5697,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -5699,7 +5710,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -5708,7 +5719,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -5770,7 +5781,7 @@ do "man/uncrustify.1") CONFIG_FILES="$CONFIG_FILES man/uncrustify.1" ;; "src/uncrustify_version.h") CONFIG_FILES="$CONFIG_FILES src/uncrustify_version.h" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -5808,7 +5819,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -5825,7 +5836,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -5839,18 +5850,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -5939,20 +5950,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -5980,7 +5999,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6065,7 +6084,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -6078,7 +6097,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6106,7 +6125,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -6133,7 +6152,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -6270,22 +6289,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -6296,19 +6315,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -6458,7 +6477,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -6479,7 +6498,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.in b/configure.in index 403794f9a1..6661f18597 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(uncrustify, 0.56,,,http://uncrustify.sourceforge.net/) +AC_INIT(uncrustify, 0.57,,,http://uncrustify.sourceforge.net/) enable_silent_rules=${enable_silent_rules-yes} AM_INIT_AUTOMAKE([-Wall silent-rules]) AM_MAINTAINER_MODE diff --git a/documentation/htdocs/default.cfg b/documentation/htdocs/default.cfg index 911df22d24..6addc61060 100644 --- a/documentation/htdocs/default.cfg +++ b/documentation/htdocs/default.cfg @@ -1,4 +1,4 @@ -# Uncrustify 0.55 +# Uncrustify 0.57 # # General options @@ -27,12 +27,20 @@ string_escape_char2 = 0 # number # Usually 2, 3, 4, or 8. indent_columns = 8 # number +# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. +# For FreeBSD, this is set to 4. +indent_continue = 0 # number + # How to use tabs when indenting code # 0=spaces only -# 1=indent with tabs, align with spaces -# 2=indent and align with tabs +# 1=indent with tabs to brace level, align with spaces +# 2=indent and align with tabs, using spaces when not on a tabstop indent_with_tabs = 1 # number +# Comments that are not a brace level are indented with tabs on a tabstop. +# Requires indent_with_tabs=2. If false, will use spaces. +indent_cmt_with_tabs = false # false/true + # Whether to indent strings broken by '\' so that they line up indent_align_string = false # false/true @@ -49,6 +57,12 @@ indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true indent_braces_no_func = false # false/true +# Disabled indenting class braces if indent_braces is true +indent_braces_no_class = false # false/true + +# Disabled indenting struct braces if indent_braces is true +indent_braces_no_struct = false # false/true + # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. indent_brace_parent = false # false/true @@ -78,6 +92,9 @@ indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute indent_var_def_blk = 0 # number +# Indent continued variable declarations instead of aligning. +indent_var_def_cont = false # false/true + # True: indent continued function call parameters one indent level # False: align parameters under the open paren indent_func_call_param = false # false/true @@ -160,6 +177,9 @@ indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren indent_bool_paren = false # false/true +# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones +indent_first_bool_expr = false # false/true + # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) indent_square_nl = false # false/true @@ -180,6 +200,9 @@ sp_arith = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc sp_assign = ignore # ignore/add/remove/force +# Add or remove space around assignment operator '=' in a prototype +sp_assign_default = ignore # ignore/add/remove/force + # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. sp_before_assign = ignore # ignore/add/remove/force @@ -198,7 +221,7 @@ sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add sp_pp_concat = add # ignore/add/remove/force -# Add or remove space after preprocessor '#' stringify operator. Default=Add +# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add sp_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' @@ -276,6 +299,9 @@ sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' sp_angle_word = ignore # ignore/add/remove/force +# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add +sp_angle_shift = add # ignore/add/remove/force + # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' sp_before_sparen = ignore # ignore/add/remove/force @@ -333,6 +359,9 @@ sp_after_comma = ignore # ignore/add/remove/force # Add or remove space before ',' sp_before_comma = remove # ignore/add/remove/force +# Add or remove space between an open paren and comma: '(,' vs '( ,' +sp_paren_comma = force # ignore/add/remove/force + # Add or remove space before the variadic '...' when preceded by a non-punctuator sp_before_ellipsis = ignore # ignore/add/remove/force @@ -403,6 +432,10 @@ sp_fparen_brace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls sp_func_call_paren = ignore # ignore/add/remove/force +# Add or remove space between function name and '()' on function calls without parameters. +# If set to 'ignore' (the default), sp_func_call_paren is used. +sp_func_call_paren_empty = ignore # ignore/add/remove/force + # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. sp_func_call_user_paren = ignore # ignore/add/remove/force @@ -518,9 +551,19 @@ sp_after_oc_type = ignore # ignore/add/remove/force sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' -# '@selector(msgName).' vs '@selector (msgName)' +# '@selector(msgName)' vs '@selector (msgName)' +# Also applies to @protocol() constructs sp_after_oc_at_sel = ignore # ignore/add/remove/force +# Add or remove space between '@selector(x)' and the following word +# '@selector(foo) a:' vs '@selector(foo)a:' +sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force + +# Add or remove space inside '@selector' parens +# '@selector(foo)' vs '@selector( foo )' +# Also applies to @protocol() constructs +sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force + # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' sp_before_oc_block_caret = ignore # ignore/add/remove/force @@ -655,7 +698,7 @@ align_right_cmt_span = 0 # number align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, -# it will qualify for being aligned. +# it will qualify for being aligned. This has to be > 0 to do anything. align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) @@ -703,6 +746,9 @@ align_left_shift = true # false/true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) align_oc_msg_colon_span = 0 # number +# Aligning parameters in an Obj-C '+' or '-' declaration on the ':' +align_oc_decl_colon = false # false/true + # # Newline adding and removing options # @@ -749,7 +795,7 @@ nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' nl_after_square_assign = ignore # ignore/add/remove/force -# The number of newlines after a block of variable definitions +# The number of blank lines after a block of variable definitions nl_func_var_def_blk = 0 # number # Add or remove newline between a function call's ')' and '{', as in: @@ -805,6 +851,9 @@ nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' nl_while_brace = ignore # ignore/add/remove/force +# Add or remove newline between 'using' and '{' +nl_using_brace = ignore # ignore/add/remove/force + # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. nl_brace_brace = ignore # ignore/add/remove/force @@ -863,24 +912,45 @@ nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' nl_func_paren = ignore # ignore/add/remove/force +# Add or remove newline between a function name and the opening '(' in the definition +nl_func_def_paren = ignore # ignore/add/remove/force + # Add or remove newline after '(' in a function declaration nl_func_decl_start = ignore # ignore/add/remove/force -# Overrides nl_func_decl_start when there is only one paramter. +# Add or remove newline after '(' in a function definition +nl_func_def_start = ignore # ignore/add/remove/force + +# Overrides nl_func_decl_start when there is only one parameter. nl_func_decl_start_single = ignore # ignore/add/remove/force +# Overrides nl_func_def_start when there is only one parameter. +nl_func_def_start_single = ignore # ignore/add/remove/force + # Add or remove newline after each ',' in a function declaration nl_func_decl_args = ignore # ignore/add/remove/force +# Add or remove newline after each ',' in a function definition +nl_func_def_args = ignore # ignore/add/remove/force + # Add or remove newline before the ')' in a function declaration nl_func_decl_end = ignore # ignore/add/remove/force -# Overrides nl_func_decl_end when there is only one paramter. +# Add or remove newline before the ')' in a function definition +nl_func_def_end = ignore # ignore/add/remove/force + +# Overrides nl_func_decl_end when there is only one parameter. nl_func_decl_end_single = ignore # ignore/add/remove/force +# Overrides nl_func_def_end when there is only one parameter. +nl_func_def_end_single = ignore # ignore/add/remove/force + # Add or remove newline between '()' in a function declaration. nl_func_decl_empty = ignore # ignore/add/remove/force +# Add or remove newline between '()' in a function definition. +nl_func_def_empty = ignore # ignore/add/remove/force + # Add or remove newline between function signature and '{' nl_fdef_brace = ignore # ignore/add/remove/force @@ -913,46 +983,51 @@ nl_after_vbrace_open_empty = false # false/true # Does not apply if followed by a necessary ';'. nl_after_brace_close = false # false/true +# Whether to put a newline after a virtual brace close. +# Would add a newline before return in: 'if (foo) a++; return;' +nl_after_vbrace_close = false # false/true + # Whether to alter newlines in '#define' macros nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' nl_squeeze_ifdef = false # false/true -# Add or remove newline before 'if' +# Add or remove blank line before 'if' nl_before_if = ignore # ignore/add/remove/force -# Add or remove newline after 'if' +# Add or remove blank line after 'if' statement nl_after_if = ignore # ignore/add/remove/force -# Add or remove newline before 'for' +# Add or remove blank line before 'for' nl_before_for = ignore # ignore/add/remove/force -# Add or remove newline after 'for' +# Add or remove blank line after 'for' statement nl_after_for = ignore # ignore/add/remove/force -# Add or remove newline before 'while' +# Add or remove blank line before 'while' nl_before_while = ignore # ignore/add/remove/force -# Add or remove newline after 'while' +# Add or remove blank line after 'while' statement nl_after_while = ignore # ignore/add/remove/force -# Add or remove newline before 'switch' +# Add or remove blank line before 'switch' nl_before_switch = ignore # ignore/add/remove/force -# Add or remove newline after 'switch' +# Add or remove blank line after 'switch' statement nl_after_switch = ignore # ignore/add/remove/force -# Add or remove newline before 'do' +# Add or remove blank line before 'do' nl_before_do = ignore # ignore/add/remove/force -# Add or remove newline after 'do' +# Add or remove blank line after 'do/while' statement nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum +# (lower priority than 'eat_blanks_before_close_brace') nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. @@ -976,29 +1051,29 @@ nl_create_while_one_liner = false # false/true # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/trail +pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/trail +pos_conditional = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # # Line Splitting options @@ -1044,7 +1119,7 @@ nl_before_c_comment = 0 # number # Doesn't apply if after a brace open or other CPP comments. nl_before_cpp_comment = 0 # number -# Whether to force a newline after a mulit-line comment. +# Whether to force a newline after a multi-line comment. nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. @@ -1104,6 +1179,9 @@ mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement mod_full_brace_while = ignore # ignore/add/remove/force +# Add or remove braces on single-line 'using ()' statement +mod_full_brace_using = ignore # ignore/add/remove/force + # Add or remove unnecessary paren on 'return' statement mod_paren_on_return = ignore # ignore/add/remove/force @@ -1165,7 +1243,7 @@ cmt_width = 0 # number # 2: full reflow cmt_reflow_mode = 0 # number -# If false, disable all multi-line comment changes, including cmt_width and leading chars. +# If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. cmt_indent_multi = true # false/true diff --git a/documentation/htdocs/index.html b/documentation/htdocs/index.html index 8bbedaa925..76a20ffbaa 100644 --- a/documentation/htdocs/index.html +++ b/documentation/htdocs/index.html @@ -36,7 +36,7 @@

Features

  • Add or remove parens on return statements
  • Add or remove braces on single-statement if/do/while/for statements
  • Supports embedded SQL 'EXEC SQL' stuff
    • -
  • Highly configurable - 385 configurable options as of version 0.56
    • +
  • Highly configurable - 395 configurable options as of version 0.57

    • diff --git a/etc/defaults.cfg b/etc/defaults.cfg index 2efb6af243..6addc61060 100644 --- a/etc/defaults.cfg +++ b/etc/defaults.cfg @@ -1,4 +1,4 @@ -# Uncrustify 0.56 +# Uncrustify 0.57 # # General options @@ -221,7 +221,7 @@ sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add sp_pp_concat = add # ignore/add/remove/force -# Add or remove space after preprocessor '#' stringify operator. Default=Add +# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add sp_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' @@ -432,6 +432,10 @@ sp_fparen_brace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls sp_func_call_paren = ignore # ignore/add/remove/force +# Add or remove space between function name and '()' on function calls without parameters. +# If set to 'ignore' (the default), sp_func_call_paren is used. +sp_func_call_paren_empty = ignore # ignore/add/remove/force + # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. sp_func_call_user_paren = ignore # ignore/add/remove/force @@ -908,24 +912,45 @@ nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' nl_func_paren = ignore # ignore/add/remove/force +# Add or remove newline between a function name and the opening '(' in the definition +nl_func_def_paren = ignore # ignore/add/remove/force + # Add or remove newline after '(' in a function declaration nl_func_decl_start = ignore # ignore/add/remove/force +# Add or remove newline after '(' in a function definition +nl_func_def_start = ignore # ignore/add/remove/force + # Overrides nl_func_decl_start when there is only one parameter. nl_func_decl_start_single = ignore # ignore/add/remove/force +# Overrides nl_func_def_start when there is only one parameter. +nl_func_def_start_single = ignore # ignore/add/remove/force + # Add or remove newline after each ',' in a function declaration nl_func_decl_args = ignore # ignore/add/remove/force +# Add or remove newline after each ',' in a function definition +nl_func_def_args = ignore # ignore/add/remove/force + # Add or remove newline before the ')' in a function declaration nl_func_decl_end = ignore # ignore/add/remove/force +# Add or remove newline before the ')' in a function definition +nl_func_def_end = ignore # ignore/add/remove/force + # Overrides nl_func_decl_end when there is only one parameter. nl_func_decl_end_single = ignore # ignore/add/remove/force +# Overrides nl_func_def_end when there is only one parameter. +nl_func_def_end_single = ignore # ignore/add/remove/force + # Add or remove newline between '()' in a function declaration. nl_func_decl_empty = ignore # ignore/add/remove/force +# Add or remove newline between '()' in a function definition. +nl_func_def_empty = ignore # ignore/add/remove/force + # Add or remove newline between function signature and '{' nl_fdef_brace = ignore # ignore/add/remove/force diff --git a/extras.vpj b/extras.vpj index 6bbcd0e41d..f099fc95ff 100644 --- a/extras.vpj +++ b/extras.vpj @@ -121,6 +121,7 @@ + diff --git a/man/uncrustify.1.in b/man/uncrustify.1.in index b4158d05ad..33468a8acd 100644 --- a/man/uncrustify.1.in +++ b/man/uncrustify.1.in @@ -57,6 +57,9 @@ The default is '.uncrustify' if neither \fISFX\fR or \fIPFX\fR are specified. .br This cannot be combined with \fB\-f\fR, \fB\-\-replace\fR, or \fB\-\-no\-backup\fR. .TP +\fB\-\-frag\fI +Assume the input is a code fragment and the first line is properly indented. +.TP \fB\-\-replace\fR Replace source files (creates a backup). .br diff --git a/release-steps.txt b/release-steps.txt index 8a2b7ea5ac..6f038b3315 100644 --- a/release-steps.txt +++ b/release-steps.txt @@ -14,28 +14,33 @@ Just in case I don't do a release for a while and forget what to do... =) sh make_win32.sh -3. Update the version number and rebuild. +3. Update documentation for the release + +3a. Update the version number and rebuild. Replace the old version with the new version everywhere except in ChangeLog. Specific files to update: configure.in documentation/htdocs/index.html - man/uncrustify.1 (man file) - src/uncrustify_version.h Run "sh autogen.sh" and then "./configure". Rebuild from scratch (make clean && make) -4. Update the config files +3b. Update the option count in index.html + +3c. Update the config files $ scripts/update-defaults.sh -5. Update the man file, if any command-line options have changed. +3d. Update the man file, if any command-line options have changed. + +3e. Update the ChangeLog to indicate the release date -6. Update the ChangeLog to indicate the release date +3f. Generate a commit.log +$ git log > commit.log -7. Make sure there are no modified files in the workspace. +4. Make sure there are no modified files in the workspace. Check in all the changes you just made. -8. Create a dist tarball and win32 package +5. Create a dist tarball and win32 package $ make dist Untar the file in a temporary folder and run './configure && make && make check' @@ -44,23 +49,23 @@ Then, in that new folder, run 'sh make_win32.sh'. NOTE: "make distcheck" doesn't work. It can't find the config.h file. No idea why. -9. Create a GIT tag +6. Create a GIT tag $ git tag -a uncrustify-0.56 -m uncrustify-0.56 -10. Re-run 'make dist' and copy out the release tarball. +7. Re-run 'make dist' and copy out the release tarball. -11. Update and build for windows via mingw (save the zip file this time) +8. Update and build for windows via mingw (save the zip file this time) sh make_win32.sh -12. Update the web page files +9. Update the web page files $ cd uncrustify-$UNC_REL/ $ scp -r documentation/htdocs/* ChangeLog USER,uncrustify@web.sourceforge.net:htdocs/ -13. Use the web interface (file manager) to create the release folder and +10. Use the web interface (file manager) to create the release folder and upload the files to sourceforge. -14. (optional) Create a news item +11. (optional) Create a news item -15. (optional) Update freshmeat.net project +12. (optional) Update freshmeat.net project diff --git a/src/config.h b/src/config.h index 6347ba7c46..8adc6fe860 100644 --- a/src/config.h +++ b/src/config.h @@ -76,7 +76,7 @@ #define PACKAGE_NAME "uncrustify" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "uncrustify 0.56" +#define PACKAGE_STRING "uncrustify 0.57" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "uncrustify" @@ -85,13 +85,13 @@ #define PACKAGE_URL "http://uncrustify.sourceforge.net/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.56" +#define PACKAGE_VERSION "0.57" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.56" +#define VERSION "0.57" /* Define to appropriate substitue if compiler doesnt have __func__ */ /* #undef __func__ */