Skip to content

Commit

Permalink
Import r1644 from subversion
Browse files Browse the repository at this point in the history
  • Loading branch information
bengardner committed Oct 17, 2009
0 parents commit fe25b6d
Show file tree
Hide file tree
Showing 945 changed files with 125,891 additions and 0 deletions.
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.svn
*.o
src/uncrustify
Makefile
man/Makefile
src/Makefile
src/stamp-h1
*~
config.log
config.status
*.vtg
*.vpwh*
tests/results
.waf*
.lock*
build
waf*
win32/Release
win32/Debug
*.obj
autom4te.cache
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2005 - .... : Ben Gardner
67 changes: 67 additions & 0 deletions BUGS
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
-------------------------------------------------------------------------------
BUGS:

Post any bugs to the issue tracker found on the project's Sourceforge page:
http://sourceforge.net/projects/uncrustify

Before you do so, try running with the latest code from subversion.
The bug might have already been fixed.

If it hasn't already been reported, then you'll need to file a bug report.

First, reduce your input file to the minimum that still causes the problem.
This is important, as a 1000-line input file is much more difficult to diagnose
than a 5-line file.

Next, rename your functions, change your strings, comments, etc, to protect
any trade secrets or whatnot.
If you attach an input file with a bug, it will most likely appear as a future
test case.

Finally, create a bug report.

Here's what I like to see in a bug report.

1. The type of problem (crash or bad formatting)
2. The version of uncrustify you tested with (ie, rev 850)
3. The operating system
4. The input file or code snippet
5. The configuration file you used.
If it isn't one of the 'standard' ones, then attach it.
6. The expected output (not needed for crash bugs)


If you are the code writing type (and you are, since you are using a code
formatting tool), I'd like you to take a quick look and see if you can pinpoint
the source of the problem.

Here is what I do when I get a bug report.

1. Check for options that control the desired behavior.
About half the time a user missed an option.

2. Run with the supplied input and config to verify the problem.
$ uncrustify -c bug.cfg -f bug.c

2a. For a crash-bug, I create a core dump to quickly find the offending code.
$ ulimit -c unlimited
$ uncrustify -c bug.cfg -f bug.c
$ gdb uncrustify core

3. Formatting bugs usually land in one of three catagories.
a. Incorrectly labeled chunks
b. Bad formatting logic or unexpected input
c. Missing options

Debugging help:

I run with the "-p" option to get a dump of the chunks.
$ uncrustify -c bug.cfg -f bug.c -p parsed.txt

This tells me the configuration and how each chunk is labeled, indented, and
otherwise processed.

I also selectively turn on log levels (the -L command line option) to aid
debugging of specific areas of interest.
Don't turn on all log levels -- the result is excessive and not at all helpful.

340 changes: 340 additions & 0 deletions COPYING

Large diffs are not rendered by default.

56 changes: 56 additions & 0 deletions HELP
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
-------------------------------------------------------------------------------
HELP:

Are you looking to help with uncrustify development? Great!

Here are some tasks that need to be done:

1. New features

Look at the feature requests on the Sourceforge project site.
Do any interest you?
Most are easily done, but I haven't had the 'itch' to implement them.


2. Test Coverage

The test coverage right now is hardly adequate.
I would appreciate it if someone could make sure that every option is
tested and add tests as needed.
Automated testing is good. Without it, we can't detect regressions.
Any option that doesn't have an associated test isn't really supported.


3. Code cleanup

I don't have much time to work on uncrustify.
When I do, it is usually a short span - only an hour or two.
This leads to unreachable code and doing the same thing in multiple places.

Trace through the code and find these "problems".
I found one the other day in do_space(). A new feature didn't work because
several lines of code were not reachable.


4. Code redesign

Code gets ugly over time when new features are added willy-nilly.
The problem is that the requirements are not known before the design is done.

There are a few areas in particular that could benefit from a redesign.

4a. brace_cleanup

The code in brace_cleanup is ugly. It works, but it is ugly.
It was written with the assumption that there is no 'next' chunk.
I had planned to merge that code in with the tokenizer.
That didn't happen.
So we are left with code that is more complicated than it needs to be.
I haven't had the time or energy to revisit that code; I probably never will.
If you'd like to take a stab at it... the would be wonderful.

4b. indent_text

I think this function could be reworked to better take advantage of the
paren stack.

229 changes: 229 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.

This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.

Basic Installation
==================

These are generic installation instructions.

The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').

It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)

If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.

The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.

The simplest way to compile this package is:

1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.

Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.

2. Type `make' to compile the package.

3. Optionally, type `make check' to run any self-tests that come with
the package.

4. Type `make install' to install the programs and any data files and
documentation.

5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.

Compilers and Options
=====================

Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.

You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:

./configure CC=c89 CFLAGS=-O2 LIBS=-lposix

*Note Defining Variables::, for more details.

Compiling For Multiple Architectures
====================================

You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.

If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.

Installation Names
==================

By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.

You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.

In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.

If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.

Optional Features
=================

Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.

For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.

Specifying the System Type
==========================

There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:

CPU-COMPANY-SYSTEM

where SYSTEM can have one of these forms:

OS KERNEL-OS

See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.

If you are _building_ compiler tools for cross-compiling, you should
use the `--target=TYPE' option to select the type of system they will
produce code for.

If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.

Sharing Defaults
================

If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.

Defining Variables
==================

Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:

./configure CC=/usr/local2/bin/gcc

will cause the specified gcc to be used as the C compiler (unless it is
overridden in the site shell script).

`configure' Invocation
======================

`configure' recognizes the following options to control how it
operates.

`--help'
`-h'
Print a summary of the options to `configure', and exit.

`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.

`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.

`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.

`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).

`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.

`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

18 changes: 18 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
## Process this file with automake to produce Makefile.in

AUTOMAKE_OPTIONS=foreign no-dependencies

SUBDIRS = src man

pkgdata_DATA = etc/ben.cfg etc/d.cfg etc/gnu-indent.cfg etc/kr-indent.cfg etc/linux-indent.cfg etc/linux.cfg etc/mono.cfg etc/xsupplicant.cfg

# INCLUDES = @INCLUDES@

testdir = tests
TESTS = run_tests.sh

check-local:

DISTCLEANFILES =
CLEANFILES = *~ *.bak
MAINTAINERCLEANFILES = aclocal.m4 Makefile.in
Loading

0 comments on commit fe25b6d

Please sign in to comment.