updated README, prepared for new version tag
diff --git a/README.html b/README.html
index 0d4bd67..3c4b4ff 100644
--- a/README.html
+++ b/README.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
-<title>pycparser v1.08</title>
+<title>pycparser v2.00</title>
<meta name="author" content="Eli Bendersky" />
<style type="text/css">
@@ -305,8 +305,8 @@
</style>
</head>
<body>
-<div class="document" id="pycparser-v1-08">
-<h1 class="title">pycparser v1.08</h1>
+<div class="document" id="pycparser-v2-00">
+<h1 class="title">pycparser v2.00</h1>
<table class="docinfo" frame="void" rules="none">
<col class="docinfo-name" />
<col class="docinfo-content" />
@@ -318,43 +318,32 @@
<div class="contents topic" id="contents">
<p class="topic-title first">Contents</p>
<ul class="auto-toc simple">
-<li><a class="reference internal" href="#introduction" id="id1">1 Introduction</a><ul class="auto-toc">
-<li><a class="reference internal" href="#what-is-pycparser" id="id2">1.1 What is pycparser?</a></li>
-<li><a class="reference internal" href="#what-is-it-good-for" id="id3">1.2 What is it good for?</a></li>
-<li><a class="reference internal" href="#which-version-of-c-does-pycparser-support" id="id4">1.3 Which version of C does pycparser support?</a></li>
-<li><a class="reference internal" href="#what-grammar-does-pycparser-follow" id="id5">1.4 What grammar does pycparser follow?</a></li>
-<li><a class="reference internal" href="#what-is-an-ast" id="id6">1.5 What is an AST?</a></li>
-<li><a class="reference internal" href="#how-is-pycparser-licensed" id="id7">1.6 How is pycparser licensed?</a></li>
-<li><a class="reference internal" href="#contact-details" id="id8">1.7 Contact details</a></li>
+<li><a class="reference internal" href="#introduction" id="id2">1 Introduction</a><ul class="auto-toc">
+<li><a class="reference internal" href="#what-is-pycparser" id="id3">1.1 What is pycparser?</a></li>
+<li><a class="reference internal" href="#what-is-it-good-for" id="id4">1.2 What is it good for?</a></li>
+<li><a class="reference internal" href="#which-version-of-c-does-pycparser-support" id="id5">1.3 Which version of C does pycparser support?</a></li>
+<li><a class="reference internal" href="#what-grammar-does-pycparser-follow" id="id6">1.4 What grammar does pycparser follow?</a></li>
+<li><a class="reference internal" href="#what-is-an-ast" id="id7">1.5 What is an AST?</a></li>
+<li><a class="reference internal" href="#how-is-pycparser-licensed" id="id8">1.6 How is pycparser licensed?</a></li>
+<li><a class="reference internal" href="#contact-details" id="id9">1.7 Contact details</a></li>
</ul>
</li>
-<li><a class="reference internal" href="#installing" id="id9">2 Installing</a><ul class="auto-toc">
-<li><a class="reference internal" href="#prerequisites" id="id10">2.1 Prerequisites</a></li>
-<li><a class="reference internal" href="#installation-process" id="id11">2.2 Installation process</a></li>
+<li><a class="reference internal" href="#installing" id="id10">2 Installing</a><ul class="auto-toc">
+<li><a class="reference internal" href="#prerequisites" id="id11">2.1 Prerequisites</a></li>
+<li><a class="reference internal" href="#installation-process" id="id12">2.2 Installation process</a></li>
</ul>
</li>
-<li><a class="reference internal" href="#using" id="id12">3 Using</a><ul class="auto-toc">
-<li><a class="reference internal" href="#interaction-with-the-c-preprocessor" id="id13">3.1 Interaction with the C preprocessor</a></li>
-<li><a class="reference internal" href="#what-about-the-standard-c-library-headers" id="id14">3.2 What about the standard C library headers?</a></li>
-<li><a class="reference internal" href="#basic-usage" id="id15">3.3 Basic usage</a></li>
-<li><a class="reference internal" href="#advanced-usage" id="id16">3.4 Advanced usage</a></li>
+<li><a class="reference internal" href="#using" id="id13">3 Using</a><ul class="auto-toc">
+<li><a class="reference internal" href="#interaction-with-the-c-preprocessor" id="id14">3.1 Interaction with the C preprocessor</a></li>
+<li><a class="reference internal" href="#what-about-the-standard-c-library-headers" id="id15">3.2 What about the standard C library headers?</a></li>
+<li><a class="reference internal" href="#basic-usage" id="id16">3.3 Basic usage</a></li>
+<li><a class="reference internal" href="#advanced-usage" id="id17">3.4 Advanced usage</a></li>
</ul>
</li>
-<li><a class="reference internal" href="#modifying" id="id17">4 Modifying</a></li>
-<li><a class="reference internal" href="#package-contents" id="id18">5 Package contents</a></li>
-<li><a class="reference internal" href="#contributors" id="id19">6 Contributors</a></li>
-<li><a class="reference internal" href="#changelog" id="id20">7 Changelog</a><ul class="auto-toc">
-<li><a class="reference internal" href="#version-1-08-09-10-2010" id="id21">7.1 Version 1.08 (09.10.2010)</a></li>
-<li><a class="reference internal" href="#version-1-07-18-05-2010" id="id22">7.2 Version 1.07 (18.05.2010)</a></li>
-<li><a class="reference internal" href="#version-1-06-10-04-2010" id="id23">7.3 Version 1.06 (10.04.2010)</a></li>
-<li><a class="reference internal" href="#version-1-05-16-10-2009" id="id24">7.4 Version 1.05 (16.10.2009)</a></li>
-<li><a class="reference internal" href="#version-1-04-22-05-2009" id="id25">7.5 Version 1.04 (22.05.2009)</a></li>
-<li><a class="reference internal" href="#version-1-03-31-01-2009" id="id26">7.6 Version 1.03 (31.01.2009)</a></li>
-<li><a class="reference internal" href="#version-1-02-16-01-2009" id="id27">7.7 Version 1.02 (16.01.2009)</a></li>
-<li><a class="reference internal" href="#version-1-01-09-01-2009" id="id28">7.8 Version 1.01 (09.01.2009)</a></li>
-<li><a class="reference internal" href="#version-1-0-15-11-2008" id="id29">7.9 Version 1.0 (15.11.2008)</a></li>
-</ul>
-</li>
+<li><a class="reference internal" href="#modifying" id="id18">4 Modifying</a></li>
+<li><a class="reference internal" href="#package-contents" id="id19">5 Package contents</a></li>
+<li><a class="reference internal" href="#contributors" id="id20">6 Contributors</a></li>
+<li><a class="reference internal" href="#changelog" id="id21">7 Changelog</a></li>
</ul>
</div>
<div class="section" id="introduction">
@@ -377,16 +366,12 @@
</div>
<div class="section" id="which-version-of-c-does-pycparser-support">
<h2>1.3 Which version of C does pycparser support?</h2>
-<p>At the moment, <tt class="docutils literal"><span class="pre">pycparser</span></tt> supports ANSI/ISO C89, the language described by Kernighan and Ritchie in "The C Programming language, 2nd edition" (K&R2), with only selected extensions from C99. The currently supported C99 features are:</p>
-<ul class="simple">
-<li>Allowing a comma after the last value in an enumeration list</li>
-</ul>
-<p>Additionally, since <tt class="docutils literal"><span class="pre">pycparser</span></tt> lets you use your own C preprocessor (<tt class="docutils literal"><span class="pre">cpp</span></tt>), C99 features implemented in the preprocessor (such as variadic macros or <tt class="docutils literal"><span class="pre">//</span></tt> comments) can be supported in a manner transparent to <tt class="docutils literal"><span class="pre">pycparser</span></tt>.</p>
+<p><tt class="docutils literal"><span class="pre">pycparser</span></tt> aims to support the full C99 language (according to the standard ISO/IEC 9899). This is a new feature in the version 2.x series - earlier versions only supported C89. For more information on the change, read <a class="reference external" href="http://code.google.com/p/pycparser/wiki/C99support">this wiki page</a>.</p>
<p><tt class="docutils literal"><span class="pre">pycparser</span></tt> doesn't support any GCC extensions.</p>
</div>
<div class="section" id="what-grammar-does-pycparser-follow">
<h2>1.4 What grammar does pycparser follow?</h2>
-<p><tt class="docutils literal"><span class="pre">pycparser</span></tt> very closely follows the ANSI C grammar provided in the end of K&R2. Listings of this grammar (often in Yacc syntax) can be easily found by a simple web search. Google for <cite>ansi c grammar</cite> to get started.</p>
+<p><tt class="docutils literal"><span class="pre">pycparser</span></tt> very closely follows the C grammar provided in the end of the C99 standard document</p>
</div>
<div class="section" id="what-is-an-ast">
<h2>1.5 What is an AST?</h2>
@@ -427,7 +412,7 @@
</div>
<div class="section" id="what-about-the-standard-c-library-headers">
<h2>3.2 What about the standard C library headers?</h2>
-<p>C code almost always includes various header files from the standard C library, like <tt class="docutils literal"><span class="pre">stdio.h</span></tt>. While, with some effort, <tt class="docutils literal"><span class="pre">pycparser</span></tt> can be made to parse the standard headers from any C compiler, it's much simpler to use the provided "fake" standard in includes in <tt class="docutils literal"><span class="pre">utils/fake_libc_include</span></tt>. These are standard C header files that contain only the bare necessities to allow valid compilation of the files that use them. As a bonus, since they're minimal, it can significantly improve the performance of parsing C files.</p>
+<p>C code almost always includes various header files from the standard C library, like <tt class="docutils literal"><span class="pre">stdio.h</span></tt>. While, with some effort, <tt class="docutils literal"><span class="pre">pycparser</span></tt> can be made to parse the standard headers from any C compiler, it's much simpler to use the provided "fake" standard in includes in <tt class="docutils literal"><span class="pre">utils/fake_libc_include</span></tt>. These are standard C header files that contain only the bare necessities to allow valid parsing of the files that use them. As a bonus, since they're minimal, it can significantly improve the performance of parsing C files.</p>
<p>See the <tt class="docutils literal"><span class="pre">using_cpp_libc.py</span></tt> example for more details.</p>
</div>
<div class="section" id="basic-usage">
@@ -477,9 +462,12 @@
</div>
<div class="section" id="changelog">
<h1>7 Changelog</h1>
-<div class="section" id="version-1-08-09-10-2010">
-<h2>7.1 Version 1.08 (09.10.2010)</h2>
<ul class="simple">
+<li>Version 2.00 (31.10.2010)<ul>
+<li>Support for C99 (read <a class="reference external" href="http://code.google.com/p/pycparser/wiki/C99support">this wiki page</a> for more information).</li>
+</ul>
+</li>
+<li>Version 1.08 (09.10.2010)<ul>
<li>Bug fixes:<ul>
<li>Correct handling of <tt class="docutils literal"><span class="pre">do{}</span> <span class="pre">...</span> <span class="pre">while</span></tt> statements in some cases</li>
<li>Issues 6 & 7: Concatenation of string literals</li>
@@ -487,16 +475,12 @@
</ul>
</li>
</ul>
-</div>
-<div class="section" id="version-1-07-18-05-2010">
-<h2>7.2 Version 1.07 (18.05.2010)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.07 (18.05.2010)<ul>
<li>Python 3.1 compatibility: <tt class="docutils literal"><span class="pre">pycparser</span></tt> was modified to run on Python 3.1 as well as 2.6</li>
</ul>
-</div>
-<div class="section" id="version-1-06-10-04-2010">
-<h2>7.3 Version 1.06 (10.04.2010)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.06 (10.04.2010)<ul>
<li>Bug fixes:<ul>
<li>coord not propagated to FuncCall nodes</li>
<li>lexing of the ^= token (XOREQUALS)</li>
@@ -505,45 +489,34 @@
</li>
<li>Linux compatibility: fixed end-of-line and <tt class="docutils literal"><span class="pre">cpp</span></tt> path issues to allow all tests and examples run on Linux</li>
</ul>
-</div>
-<div class="section" id="version-1-05-16-10-2009">
-<h2>7.4 Version 1.05 (16.10.2009)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.05 (16.10.2009)<ul>
<li>Fixed the <tt class="docutils literal"><span class="pre">parse_file</span></tt> auxiliary function to handle multiple arguments to <tt class="docutils literal"><span class="pre">cpp</span></tt> correctly</li>
</ul>
-</div>
-<div class="section" id="version-1-04-22-05-2009">
-<h2>7.5 Version 1.04 (22.05.2009)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.04 (22.05.2009)<ul>
<li>Added the <tt class="docutils literal"><span class="pre">fake_libc_include</span></tt> directory to allow parsing of C code that uses standard C library include files without dependency on a real C library.</li>
<li>Tested with Python 2.6 and PLY 3.2</li>
</ul>
-</div>
-<div class="section" id="version-1-03-31-01-2009">
-<h2>7.6 Version 1.03 (31.01.2009)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.03 (31.01.2009)<ul>
<li>Accept enumeration lists with a comma after the last item (C99 feature).</li>
</ul>
-</div>
-<div class="section" id="version-1-02-16-01-2009">
-<h2>7.7 Version 1.02 (16.01.2009)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.02 (16.01.2009)<ul>
<li>Fixed problem of parsing struct/enum/union names that were named similarly to previously defined <tt class="docutils literal"><span class="pre">typedef</span></tt> types.</li>
</ul>
-</div>
-<div class="section" id="version-1-01-09-01-2009">
-<h2>7.8 Version 1.01 (09.01.2009)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.01 (09.01.2009)<ul>
<li>Fixed subprocess invocation in the helper function parse_file - now it's more portable</li>
</ul>
-</div>
-<div class="section" id="version-1-0-15-11-2008">
-<h2>7.9 Version 1.0 (15.11.2008)</h2>
-<ul class="simple">
+</li>
+<li>Version 1.0 (15.11.2008)<ul>
<li>Initial release</li>
<li>Support for ANSI C89</li>
</ul>
-</div>
+</li>
+</ul>
</div>
</div>
</body>
diff --git a/README.txt b/README.txt
index 907c0d4..6b795c9 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,5 @@
===============
-pycparser v1.08
+pycparser v2.00
===============
:Author: `Eli Bendersky <http://eli.thegreenplace.net>`_
@@ -36,18 +36,14 @@
Which version of C does pycparser support?
------------------------------------------
-At the moment, ``pycparser`` supports ANSI/ISO C89, the language described by Kernighan and Ritchie in "The C Programming language, 2nd edition" (K&R2), with only selected extensions from C99. The currently supported C99 features are:
-
-* Allowing a comma after the last value in an enumeration list
-
-Additionally, since ``pycparser`` lets you use your own C preprocessor (``cpp``), C99 features implemented in the preprocessor (such as variadic macros or ``//`` comments) can be supported in a manner transparent to ``pycparser``.
+``pycparser`` aims to support the full C99 language (according to the standard ISO/IEC 9899). This is a new feature in the version 2.x series - earlier versions only supported C89. For more information on the change, read `this wiki page <http://code.google.com/p/pycparser/wiki/C99support>`_.
``pycparser`` doesn't support any GCC extensions.
What grammar does pycparser follow?
-----------------------------------
-``pycparser`` very closely follows the ANSI C grammar provided in the end of K&R2. Listings of this grammar (often in Yacc syntax) can be easily found by a simple web search. Google for `ansi c grammar` to get started.
+``pycparser`` very closely follows the C grammar provided in the end of the C99 standard document
What is an AST?
@@ -99,7 +95,7 @@
What about the standard C library headers?
------------------------------------------
-C code almost always includes various header files from the standard C library, like ``stdio.h``. While, with some effort, ``pycparser`` can be made to parse the standard headers from any C compiler, it's much simpler to use the provided "fake" standard in includes in ``utils/fake_libc_include``. These are standard C header files that contain only the bare necessities to allow valid compilation of the files that use them. As a bonus, since they're minimal, it can significantly improve the performance of parsing C files.
+C code almost always includes various header files from the standard C library, like ``stdio.h``. While, with some effort, ``pycparser`` can be made to parse the standard headers from any C compiler, it's much simpler to use the provided "fake" standard in includes in ``utils/fake_libc_include``. These are standard C header files that contain only the bare necessities to allow valid parsing of the files that use them. As a bonus, since they're minimal, it can significantly improve the performance of parsing C files.
See the ``using_cpp_libc.py`` example for more details.
@@ -162,65 +158,58 @@
Changelog
=========
-Version 1.08 (09.10.2010)
--------------------------
++ Version 2.00 (31.10.2010)
-* Bug fixes:
+ * Support for C99 (read `this wiki page <http://code.google.com/p/pycparser/wiki/C99support>`_ for more information).
- + Correct handling of ``do{} ... while`` statements in some cases
- + Issues 6 & 7: Concatenation of string literals
- + Issue 9: Support for unnamed bitfields in structs
++ Version 1.08 (09.10.2010)
-Version 1.07 (18.05.2010)
--------------------------
+ * Bug fixes:
-* Python 3.1 compatibility: ``pycparser`` was modified to run on Python 3.1 as well as 2.6
+ + Correct handling of ``do{} ... while`` statements in some cases
+ + Issues 6 & 7: Concatenation of string literals
+ + Issue 9: Support for unnamed bitfields in structs
+
++ Version 1.07 (18.05.2010)
+
+ * Python 3.1 compatibility: ``pycparser`` was modified to run on Python 3.1 as well as 2.6
+
++ Version 1.06 (10.04.2010)
+
+ * Bug fixes:
+
+ + coord not propagated to FuncCall nodes
+ + lexing of the ^= token (XOREQUALS)
+ + parsing failed on some abstract declarator rules
+
+ * Linux compatibility: fixed end-of-line and ``cpp`` path issues to allow all tests and examples run on Linux
-Version 1.06 (10.04.2010)
--------------------------
++ Version 1.05 (16.10.2009)
-* Bug fixes:
+ * Fixed the ``parse_file`` auxiliary function to handle multiple arguments to ``cpp`` correctly
- + coord not propagated to FuncCall nodes
- + lexing of the ^= token (XOREQUALS)
- + parsing failed on some abstract declarator rules
++ Version 1.04 (22.05.2009)
-* Linux compatibility: fixed end-of-line and ``cpp`` path issues to allow all tests and examples run on Linux
+ * Added the ``fake_libc_include`` directory to allow parsing of C code that uses standard C library include files without dependency on a real C library.
+ * Tested with Python 2.6 and PLY 3.2
++ Version 1.03 (31.01.2009)
-Version 1.05 (16.10.2009)
--------------------------
+ * Accept enumeration lists with a comma after the last item (C99 feature).
-* Fixed the ``parse_file`` auxiliary function to handle multiple arguments to ``cpp`` correctly
++ Version 1.02 (16.01.2009)
-Version 1.04 (22.05.2009)
--------------------------
+ * Fixed problem of parsing struct/enum/union names that were named similarly to previously defined ``typedef`` types.
-* Added the ``fake_libc_include`` directory to allow parsing of C code that uses standard C library include files without dependency on a real C library.
-* Tested with Python 2.6 and PLY 3.2
++ Version 1.01 (09.01.2009)
+ * Fixed subprocess invocation in the helper function parse_file - now it's more portable
-Version 1.03 (31.01.2009)
--------------------------
++ Version 1.0 (15.11.2008)
-* Accept enumeration lists with a comma after the last item (C99 feature).
-
-Version 1.02 (16.01.2009)
--------------------------
-
-* Fixed problem of parsing struct/enum/union names that were named similarly to previously defined ``typedef`` types.
-
-Version 1.01 (09.01.2009)
--------------------------
-
-* Fixed subprocess invocation in the helper function parse_file - now it's more portable
-
-Version 1.0 (15.11.2008)
-------------------------
-
-* Initial release
-* Support for ANSI C89
+ * Initial release
+ * Support for ANSI C89
diff --git a/TODO.txt b/TODO.txt
index dc1da89..6a823da 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -10,8 +10,8 @@
V- mix declarations and statements inside a block
V- VLAs (non-constants in arr[n]), including [*] for parameter lists
V- declarations in the first expression of "for" loops
-- named initializers for structs and arrays
- - including unnamed objects
+V- named initializers for structs and arrays
+ V- including unnamed objects
* Make the changelog in the readme a normal bullet list
diff --git a/pycparser/__init__.py b/pycparser/__init__.py
index 6034107..7d91134 100644
--- a/pycparser/__init__.py
+++ b/pycparser/__init__.py
@@ -4,12 +4,12 @@
# This package file exports some convenience functions for
# interacting with pycparser
#
-# Copyright (C) 2008-2009, Eli Bendersky
+# Copyright (C) 2008-2010, Eli Bendersky
# License: LGPL
#-----------------------------------------------------------------
__all__ = ['c_lexer', 'c_parser', 'c_ast']
-__version__ = '1.08'
+__version__ = '2.00'
from subprocess import Popen, PIPE
diff --git a/setup.py b/setup.py
index 4974f44..d031cad 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
C compilers or analysis tools.
""",
license='LGPL',
- version='1.08',
+ version='2.00',
author='Eli Bendersky',
maintainer='Eli Bendersky',
author_email='eliben@gmail.com',