[Python-modules-commits] [sip4] 01/05: Import sip4_4.18.1.orig.tar.gz
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Jul 27 17:50:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository sip4.
commit 263e0bcf0a23632e66af00e2cb1666d46d2008bf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Jul 27 20:02:52 2016 +0300
Import sip4_4.18.1.orig.tar.gz
---
ChangeLog | 113 ++++++-
NEWS | 3 +
configure.py | 6 +-
sipgen/gencode.c | 2 +-
sipgen/lexer.c | 342 +++++++++----------
sipgen/parser.c | 862 ++++++++++++++++++++++++------------------------
sipgen/parser.h | 4 +-
sipgen/sip.h | 4 +-
siplib/objmap.c | 16 +-
siplib/sip.h.in | 4 +-
sphinx/conf.py | 6 +-
sphinx/introduction.rst | 2 +-
12 files changed, 744 insertions(+), 620 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a05f7b5..8739135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,118 @@
+2016-07-25 Phil Thompson <phil at riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 4.18.1 for changeset 81021a5690ce
+ [8f5b6c8fe5f1] [tip] <4.18-maint>
+
+ * NEWS:
+ Released as v4.18.1.
+ [81021a5690ce] [4.18.1] <4.18-maint>
+
+2016-07-22 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Roadmap.rst:
+ Updated the Roadmap.
+ [1226013f2516] <4.18-maint>
+
+ * NEWS:
+ Updated the NEWS file.
+ [26a4fd92bf59] <4.18-maint>
+
+2016-07-03 Phil Thompson <phil at riverbankcomputing.com>
+
+ * siplib/objmap.c:
+ Fixed a problem with stale aliases for objects created by C/C++.
+ [b493c6f3e015] <4.18-maint>
+
+2016-06-21 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rb-product, rbproduct.py:
+ Replaced the product plugin with a product file.
+ [a10b0caa91a8] <4.18-maint>
+
+2016-06-20 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Product plugin changes for rb-tools API changes.
+ [86f51ad3ac30] <4.18-maint>
+
+ * rbproduct.py:
+ Debugged the product plugin.
+ [67a81861273c] <4.18-maint>
+
+ * rbproduct.py:
+ Added support for a minimal build and release build types.
+ [8cc794662db5] <4.18-maint>
+
+2016-06-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Tewaks to the product plugin.
+ [b2fd658f11cf] <4.18-maint>
+
+2016-06-15 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Debugged the support for rb-release.
+ [38cdb78872f4] <4.18-maint>
+
+2016-06-13 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Updated the product plugin to support rb-release.
+ [ecb166af3ad3] <4.18-maint>
+
+2016-06-10 Phil Thompson <phil at riverbankcomputing.com>
+
+ * sipgen/gencode.c:
+ Fixed a regression in the handling of a cast with a diamond
+ hierachy.
+ [91206af66161] <4.18-maint>
+
+2016-06-02 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Implemented the different build types.
+ [15184d86e394] <4.18-maint>
+
+ * rbproduct.py:
+ Updates to the product plugin.
+ [23ca59449373] <4.18-maint>
+
+2016-06-01 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Updated the product plugin to simplify the class hierachy.
+ [a977c7f870f7] <4.18-maint>
+
+ * .hgignore, rbproduct.py:
+ The product plugin will now do a default build.
+ [8c433398f573] <4.18-maint>
+
+2016-05-09 Phil Thompson <phil at riverbankcomputing.com>
+
+ * rbproduct.py:
+ Updated the product plugin for the latest rbtools changes.
+ [a4a0a84984dc] <4.18-maint>
+
+2016-05-05 Phil Thompson <phil at riverbankcomputing.com>
+
+ * configure.py.in:
+ Fixed a bug in out-of-source builds.
+ [f9602fd24f17] <4.18-maint>
+
+2016-04-22 Phil Thompson <phil at riverbankcomputing.com>
+
+ * METADATA.in:
+ Updated the meta-data to say that 64-bit Linux wheels are available
+ at PyPI.
+ [5602445cb458] <4.18-maint>
+
2016-04-13 Phil Thompson <phil at riverbankcomputing.com>
* .hgtags:
Added tag 4.18 for changeset b51768a1749e
- [1da474e6ccc1] [tip]
+ [1da474e6ccc1]
* NEWS, sphinx/specification_files.rst:
Released as v4.18.
@@ -9708,4 +9818,3 @@
specs/win32-msvc.net, specs/win32-msvc2005, specs/win32-watcom:
Initial import of sip from CVS
[1fd77e66a56d]
-
diff --git a/NEWS b/NEWS
index 9372da9..3c07b64 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+v4.18.1 25th July 2016
+ - Bug fixes.
+
v4.18 13th April 2016
- Added the /TypeHint/ argument, class, mapped type, function, typedef and
variable annotations.
diff --git a/configure.py b/configure.py
index ff0bd0c..a88443e 100644
--- a/configure.py
+++ b/configure.py
@@ -30,8 +30,8 @@ import siputils
# Initialise the globals.
-sip_version = 0x041200
-sip_version_str = "4.18"
+sip_version = 0x041201
+sip_version_str = "4.18.1"
py_version = sys.hexversion >> 8
py_platform = sys.platform
plat_py_site_dir = None
@@ -474,7 +474,7 @@ macx {
cfg.sip_inc_dir)]
if opts.pyi:
- installs.append(([os.path.join(build_dir, 'sip.pyi')], pyi_dir))
+ installs.append(([os.path.join(src_dir, 'sip.pyi')], pyi_dir))
makefile = sipconfig.ModuleMakefile(
configuration=cfg,
diff --git a/sipgen/gencode.c b/sipgen/gencode.c
index 16787d6..c5707ef 100644
--- a/sipgen/gencode.c
+++ b/sipgen/gencode.c
@@ -5937,7 +5937,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
for (mro = cd->mro; mro != NULL; mro = mro->next)
{
- if (needsCast(mro))
+ if (needsCast(mro) && !isDuplicateSuper(mro) && !hasDuplicateSuper(mro))
{
prcode(fp,
" if (targetType == sipType_%C)\n"
diff --git a/sipgen/lexer.c b/sipgen/lexer.c
index c6dadee..1f0a2dd 100644
--- a/sipgen/lexer.c
+++ b/sipgen/lexer.c
@@ -1,6 +1,6 @@
-#line 2 "/Users/phil/hg/sip/sip-4.18/sipgen/lexer.c"
+#line 2 "sip-4.18.1/sipgen/lexer.c"
-#line 4 "/Users/phil/hg/sip/sip-4.18/sipgen/lexer.c"
+#line 4 "sip-4.18.1/sipgen/lexer.c"
#define YY_INT_ALIGNED short int
@@ -1453,7 +1453,7 @@ int yy_flex_debug = 0;
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
-#line 1 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 1 "sip-4.18.1/sipgen/metasrc/lexer.l"
/*
* The SIP lexer.
*
@@ -1471,7 +1471,7 @@ char *yytext;
* SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-#line 20 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 20 "sip-4.18.1/sipgen/metasrc/lexer.l"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1521,7 +1521,7 @@ static void fatallex(char *);
-#line 1525 "/Users/phil/hg/sip/sip-4.18/sipgen/lexer.c"
+#line 1525 "sip-4.18.1/sipgen/lexer.c"
#define INITIAL 0
#define code 1
@@ -1720,10 +1720,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 74 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 74 "sip-4.18.1/sipgen/metasrc/lexer.l"
-#line 1727 "/Users/phil/hg/sip/sip-4.18/sipgen/lexer.c"
+#line 1727 "sip-4.18.1/sipgen/lexer.c"
if ( !(yy_init) )
{
@@ -1809,507 +1809,507 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 76 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 76 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_API;}
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 77 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 77 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_AUTOPYNAME;}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 78 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 78 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_CMODULE;}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 79 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 79 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_COMPOMODULE;}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 80 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 80 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_CONSMODULE;}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 81 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 81 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFDOCSTRING;}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 82 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 82 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFENCODING;}
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 83 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 83 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFMETATYPE;}
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 84 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 84 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFSUPERTYPE;}
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 85 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 85 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_END;}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 86 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 86 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN INITIAL; return TK_END;}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 87 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 87 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_EXCEPTION;}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 88 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 88 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_FEATURE;}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 89 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 89 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_IF;}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 90 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 90 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_IMPORT;}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 91 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 91 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_INCLUDE;}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 92 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 92 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_LICENSE;}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 93 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 93 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_MAPPEDTYPE;}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 94 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 94 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_MODULE;}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 95 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 95 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_OPTINCLUDE;}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 96 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 96 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PLATFORMS;}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 97 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 97 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_PLUGIN;}
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 98 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 98 "sip-4.18.1/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_PROPERTY;}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 99 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 99 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_TIMELINE;}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 101 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 101 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_CLASS;}
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 102 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 102 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_STRUCT;}
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 103 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 103 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PUBLIC;}
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 104 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 104 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PROTECTED;}
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 105 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 105 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PRIVATE;}
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 106 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 106 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIGNALS;}
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 107 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 107 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIGNALS;}
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 108 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 108 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIGNAL_METHOD;}
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 109 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 109 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SLOTS;}
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 110 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 110 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SLOTS;}
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 111 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 111 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SLOT_METHOD;}
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 112 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 112 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_CHAR;}
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 113 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 113 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_WCHAR_T;}
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 114 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 114 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_BOOL;}
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 115 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 115 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SHORT;}
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 116 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 116 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_INT;}
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 117 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 117 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_LONG;}
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 118 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 118 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_FLOAT;}
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 119 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 119 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_DOUBLE;}
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 120 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 120 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_VOID;}
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 121 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 121 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_VIRTUAL;}
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 122 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 122 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_ENUM;}
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 123 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 123 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIGNED;}
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 124 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 124 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_UNSIGNED;}
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 125 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 125 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_CONST;}
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 126 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 126 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_STATIC;}
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 127 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 127 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_TRUE_VALUE;}
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 128 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 128 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_FALSE_VALUE;}
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 129 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 129 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_NULL_VALUE;}
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 130 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 130 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_TYPEDEF;}
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 131 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 131 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_NAMESPACE;}
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 132 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 132 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_OPERATOR;}
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 133 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 133 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_THROW;}
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 134 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 134 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_EXPLICIT;}
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 135 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 135 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_TEMPLATE;}
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 136 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 136 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SCOPE;}
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 137 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 137 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_LOGICAL_OR;}
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 138 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 138 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYOBJECT;}
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 139 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 139 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYTUPLE;}
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 140 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 140 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYLIST;}
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 141 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 141 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYDICT;}
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 142 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 142 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYCALLABLE;}
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 143 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 143 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYSLICE;}
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 144 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 144 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYTYPE;}
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 145 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 145 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_PYBUFFER;}
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 146 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 146 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPSIGNAL;}
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 147 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 147 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPSLOT;}
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 148 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 148 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPANYSLOT;}
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 149 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 149 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPRXCON;}
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 150 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 150 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPRXDIS;}
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 151 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 151 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPSLOTCON;}
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 152 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 152 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPSLOTDIS;}
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 153 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 153 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIPSSIZET;}
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 154 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 154 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_QOBJECT;}
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 155 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 155 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_ELLIPSIS;}
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 157 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 157 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_FORMAT;}
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 158 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 158 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_GET;}
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 159 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 159 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_ID;}
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 160 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 160 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_KWARGS;}
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 161 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 161 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_LANGUAGE;}
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 162 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 162 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_LICENSEE;}
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 163 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 163 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_NAME;}
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 164 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 164 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_OPTIONAL;}
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 165 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 165 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_ORDER;}
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 166 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 166 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_REMOVELEADING;}
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 167 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 167 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SET;}
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 168 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 168 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_SIGNATURE;}
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 169 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 169 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_TIMESTAMP;}
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 170 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 170 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_TYPE;}
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 171 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 171 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_USEARGNAMES;}
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 172 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 172 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_ALLRAISEPYEXC;}
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 173 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 173 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_CALLSUPERINIT;}
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 174 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 174 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_DEFERRORHANDLER;}
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 175 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 175 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_VERSION;}
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 177 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 177 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_TRUE_VALUE;}
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 178 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 178 "sip-4.18.1/sipgen/metasrc/lexer.l"
{return TK_FALSE_VALUE;}
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 181 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 181 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* Ignore whitespace. */
;
@@ -2317,7 +2317,7 @@ YY_RULE_SETUP
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 186 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 186 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/*
* Maintain the parenthesis depth so that we don't enter the 'code' state
@@ -2332,7 +2332,7 @@ YY_RULE_SETUP
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 198 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 198 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* Maintain the parenthesis depth. */
--parenDepth;
@@ -2345,7 +2345,7 @@ YY_RULE_SETUP
case 104:
/* rule 104 can match eol */
YY_RULE_SETUP
-#line 207 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 207 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* Maintain the line number. */
++inputFileStack[currentFile].sloc.linenr;
@@ -2358,7 +2358,7 @@ YY_RULE_SETUP
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 217 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 217 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* Ignore C++ style comments. */
;
@@ -2366,7 +2366,7 @@ YY_RULE_SETUP
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 223 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 223 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* A signed decimal number. */
yylval.number = strtol(yytext,NULL,0);
@@ -2375,7 +2375,7 @@ YY_RULE_SETUP
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 230 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 230 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* A floating point number. */
yylval.real = strtod(yytext,NULL);
@@ -2384,7 +2384,7 @@ YY_RULE_SETUP
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 237 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 237 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* An unsigned hexadecimal number. */
yylval.number = strtol(yytext,NULL,16);
@@ -2393,7 +2393,7 @@ YY_RULE_SETUP
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 244 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 244 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* An identifier name. */
yylval.text = sipStrdup(yytext);
@@ -2402,7 +2402,7 @@ YY_RULE_SETUP
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 251 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 251 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* A relative pathname. */
yylval.text = sipStrdup(yytext);
@@ -2412,7 +2412,7 @@ YY_RULE_SETUP
case 111:
/* rule 111 can match eol */
YY_RULE_SETUP
-#line 258 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 258 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* A double-quoted string. */
char *dp, *sp;
@@ -2440,7 +2440,7 @@ YY_RULE_SETUP
case 112:
/* rule 112 can match eol */
YY_RULE_SETUP
-#line 283 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 283 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* A single-quoted character. */
if (strlen(yytext) != 3)
@@ -2453,7 +2453,7 @@ YY_RULE_SETUP
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 294 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 294 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* Ignore C-style comments. */
yy_push_state(ccomment);
@@ -2462,28 +2462,28 @@ YY_RULE_SETUP
case 114:
/* rule 114 can match eol */
YY_RULE_SETUP
-#line 298 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 298 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
++inputFileStack[currentFile].sloc.linenr;
}
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 301 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 301 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
yy_pop_state();
}
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 304 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 304 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
;
}
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 309 "/Users/phil/hg/sip/sip-4.18/sipgen/metasrc/lexer.l"
+#line 309 "sip-4.18.1/sipgen/metasrc/lexer.l"
{
/* The software license. */
codeIdx = 0;
... 4187 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sip4.git
More information about the Python-modules-commits
mailing list