diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2013-11-28 20:55:11 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-06 08:00:48 +0100 |
commit | e382b722fa853e0241b396a13831bcdc9dd840b2 (patch) | |
tree | 6142b8f2f08d63e59164ff9c228844c8cfdf672c /src/xmlpatterns/parser/qquerytransformparser_p.h | |
parent | 624e7d7bcdcd1f5e5f73faf07f7c19c6f0e04160 (diff) | |
download | qtxmlpatterns-e382b722fa853e0241b396a13831bcdc9dd840b2.tar.gz |
Sync source and generated versions of the query parser.
The following manual changes to qquerytransformparser.cpp were not
reflected in the .ypp source, but they are now:
c95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (Nov 2009)
c1623a0d42c9869e5a1d04081e7660722a863de5 (Apr 2012)
The following change is lost because it modified code generated by
bison (not from .ypp) and needs to be re-applied:
e7a51b138772cb453555d27f44e6a2c0e79e799c
Change-Id: I72e76732acd1c370394c9fc373522b43ace6e009
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/xmlpatterns/parser/qquerytransformparser_p.h')
-rw-r--r-- | src/xmlpatterns/parser/qquerytransformparser_p.h | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/src/xmlpatterns/parser/qquerytransformparser_p.h b/src/xmlpatterns/parser/qquerytransformparser_p.h index a8c3af5..87117c9 100644 --- a/src/xmlpatterns/parser/qquerytransformparser_p.h +++ b/src/xmlpatterns/parser/qquerytransformparser_p.h @@ -49,27 +49,24 @@ // // We mean it. -/* A Bison parser, made by GNU Bison 2.3a. */ +/* A Bison parser, made by GNU Bison 2.5. */ -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify +/* Bison interface for Yacc-like parsers in C + + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -80,7 +77,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -116,25 +113,6 @@ # undef MAP #endif -/* These tokens are defined to nothing on Windows because they're - * used in their documentation parser, for use in things like: - * - * int foo(IN char* name, OUT char* path); - * - * Hence this un-break fix. Note that this file was auto generated. */ -#ifdef IN -# undef IN -#endif -#ifdef INSTANCE -# undef INSTANCE -#endif -#ifdef STRICT -# undef STRICT -#endif -#ifdef SELF -# undef SELF -#endif - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE |