[Python-modules-commits] [sip4] 01/03: New upstream version 4.19.6+dfsg
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Nov 25 11:36:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch debian/master
in repository sip4.
commit 5e3738f87d8933519645df34cc128e0e99b73a00
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Nov 25 14:29:14 2017 +0300
New upstream version 4.19.6+dfsg
---
ChangeLog | 23 ++
NEWS | 3 +
configure.py | 4 +-
sipgen/gencode.c | 48 ++-
sipgen/lexer.c | 350 +++++++++----------
sipgen/parser.c | 892 ++++++++++++++++++++++++------------------------
sipgen/parser.h | 4 +-
sipgen/sip.h | 4 +-
siplib/sip.h.in | 4 +-
sphinx/annotations.rst | 4 +-
sphinx/conf.py | 6 +-
sphinx/introduction.rst | 2 +-
12 files changed, 691 insertions(+), 653 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8c6451c..16e9bc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
+2017-11-23 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS:
+ Released as v4.19.6.
+ [3f131525d4d5] [4.19.6] <4.19-maint>
+
+2017-11-21 Phil Thompson <phil at riverbankcomputing.com>
+
+ * sphinx/annotations.rst:
+ Updated the docs for /NewThread/.
+ [30c7476904af] <4.19-maint>
+
+2017-11-10 Phil Thompson <phil at riverbankcomputing.com>
+
+ * sipgen/gencode.c:
+ Fixed the handling of the default value of unscoped enums when using
+ old compilers.
+ [dd017d3e1454] <4.19-maint>
+
2017-11-06 Phil Thompson <phil at riverbankcomputing.com>
+ * .hgtags:
+ Added tag 4.19.5 for changeset a572b9daf87f
+ [e0419013252c] <4.19-maint>
+
* NEWS:
Released as v4.19.5.
[a572b9daf87f] [4.19.5] <4.19-maint>
diff --git a/NEWS b/NEWS
index 24f0c87..54a903a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+v4.19.6 23rd November 2017
+ - Bug fixes.
+
v4.19.5 6th November 2017
- Bug fixes.
diff --git a/configure.py b/configure.py
index fa731aa..77372d8 100644
--- a/configure.py
+++ b/configure.py
@@ -30,8 +30,8 @@ import siputils
# Initialise the globals.
-sip_version = 0x041305
-sip_version_str = "4.19.5"
+sip_version = 0x041306
+sip_version_str = "4.19.6"
py_version = sys.hexversion >> 8
py_platform = sys.platform
plat_py_site_dir = None
diff --git a/sipgen/gencode.c b/sipgen/gencode.c
index 1ab4301..d9ee728 100644
--- a/sipgen/gencode.c
+++ b/sipgen/gencode.c
@@ -305,6 +305,7 @@ static void prTemplateType(FILE *fp, ifaceFileDef *scope, templateDef *td,
static int isString(argDef *ad);
static scopedNameDef *stripScope(scopedNameDef *snd, classDef *ecd,
StripAction strip);
+static void prEnumMemberScope(enumMemberDef *emd, FILE *fp);
/*
@@ -3295,25 +3296,14 @@ static int generateEnumMemberTable(sipSpec *pt, moduleDef *mod, classDef *cd,
if (!isNoScope(emd->ed))
{
- classDef *ecd = emd->ed->ecd;
-
if (isScopedEnum(emd->ed))
- {
- prcode(fp, "::%s::", emd->ed->cname->text);
- }
- else if (ecd != NULL)
- {
- if (isProtectedEnum(emd->ed))
- prcode(fp, "sip%C::", classFQCName(ecd));
- else if (isProtectedClass(ecd))
- prcode(fp, "%U::", ecd);
- else
- prcode(fp, "%S::", classFQCName(ecd));
- }
+ prcode(fp, "::%s", emd->ed->cname->text);
+ else if (emd->ed->ecd != NULL)
+ prEnumMemberScope(emd, fp);
else if (mtd != NULL)
- {
- prcode(fp, "%S::", mtd->iff->fqcname);
- }
+ prcode(fp, "%S", mtd->iff->fqcname);
+
+ prcode(fp, "::");
}
prcode(fp, "%s%s, %d},\n", emd->cname, (generating_c ? "" : ")"), emd->ed->first_alt->enumnr);
@@ -7592,7 +7582,13 @@ static void generateCastZero(argDef *ad, FILE *fp)
if (ed->members != NULL)
{
- prcode(fp, "%E::%s", ed, ed->members->cname);
+ if (isScopedEnum(ed))
+ prcode(fp, "%E", ed);
+ else
+ prEnumMemberScope(ed->members, fp);
+
+ prcode(fp, "::%s", ed->members->cname);
+
return;
}
@@ -15531,3 +15527,19 @@ static scopedNameDef *stripScope(scopedNameDef *snd, classDef *ecd,
return snd;
}
+
+
+/*
+ * Generate the scope of a member of an unscoped enum.
+ */
+static void prEnumMemberScope(enumMemberDef *emd, FILE *fp)
+{
+ classDef *ecd = emd->ed->ecd;
+
+ if (isProtectedEnum(emd->ed))
+ prcode(fp, "sip%C", classFQCName(ecd));
+ else if (isProtectedClass(ecd))
+ prcode(fp, "%U", ecd);
+ else
+ prcode(fp, "%S", classFQCName(ecd));
+}
diff --git a/sipgen/lexer.c b/sipgen/lexer.c
index ce9aea0..a0c6da0 100644
--- a/sipgen/lexer.c
+++ b/sipgen/lexer.c
@@ -1,6 +1,6 @@
-#line 2 "sip-4.19.5/sipgen/lexer.c"
+#line 2 "sip-4.19.6/sipgen/lexer.c"
-#line 4 "sip-4.19.5/sipgen/lexer.c"
+#line 4 "sip-4.19.6/sipgen/lexer.c"
#define YY_INT_ALIGNED short int
@@ -1486,7 +1486,7 @@ int yy_flex_debug = 0;
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
-#line 1 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 1 "sip-4.19.6/sipgen/metasrc/lexer.l"
/*
* The SIP lexer.
*
@@ -1504,7 +1504,7 @@ char *yytext;
* SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-#line 20 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 20 "sip-4.19.6/sipgen/metasrc/lexer.l"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1554,7 +1554,7 @@ static void fatallex(char *);
-#line 1558 "sip-4.19.5/sipgen/lexer.c"
+#line 1558 "sip-4.19.6/sipgen/lexer.c"
#define INITIAL 0
#define code 1
@@ -1753,10 +1753,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 74 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 74 "sip-4.19.6/sipgen/metasrc/lexer.l"
-#line 1760 "sip-4.19.5/sipgen/lexer.c"
+#line 1760 "sip-4.19.6/sipgen/lexer.c"
if ( !(yy_init) )
{
@@ -1842,522 +1842,522 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 76 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 76 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_API;}
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 77 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 77 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_AUTOPYNAME;}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 78 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 78 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_CMODULE;}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 79 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 79 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_COMPOMODULE;}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 80 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 80 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_CONSMODULE;}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 81 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 81 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFDOCSTRING;}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 82 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 82 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFENCODING;}
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 83 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 83 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFMETATYPE;}
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 84 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 84 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_DEFSUPERTYPE;}
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 85 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 85 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_END;}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 86 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 86 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN INITIAL; return TK_END;}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 87 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 87 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_EXCEPTION;}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 88 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 88 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_FEATURE;}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 89 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 89 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_HIDE_NS;}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 90 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 90 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_IF;}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 91 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 91 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_IMPORT;}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 92 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 92 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_INCLUDE;}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 93 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 93 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_LICENSE;}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 94 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 94 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_MAPPEDTYPE;}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 95 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 95 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_MODULE;}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 96 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 96 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_OPTINCLUDE;}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 97 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 97 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PLATFORMS;}
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 98 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 98 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_PLUGIN;}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 99 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 99 "sip-4.19.6/sipgen/metasrc/lexer.l"
{BEGIN directive_start; return TK_PROPERTY;}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 100 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 100 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_TIMELINE;}
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 102 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 102 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_CLASS;}
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 103 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 103 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_STRUCT;}
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 104 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 104 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PUBLIC;}
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 105 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 105 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PROTECTED;}
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 106 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 106 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PRIVATE;}
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 107 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 107 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIGNALS;}
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 108 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 108 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIGNALS;}
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 109 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 109 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIGNAL_METHOD;}
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 110 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 110 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SLOTS;}
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 111 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 111 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SLOTS;}
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 112 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 112 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SLOT_METHOD;}
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 113 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 113 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_CHAR;}
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 114 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 114 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_WCHAR_T;}
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 115 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 115 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_BOOL;}
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 116 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 116 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SHORT;}
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 117 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 117 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_INT;}
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 118 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 118 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_LONG;}
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 119 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 119 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_FLOAT;}
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 120 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 120 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_DOUBLE;}
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 121 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 121 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_VOID;}
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 122 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 122 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_VIRTUAL;}
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 123 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 123 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_ENUM;}
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 124 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 124 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIGNED;}
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 125 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 125 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_UNSIGNED;}
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 126 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 126 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_CONST;}
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 127 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 127 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_STATIC;}
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 128 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 128 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_TRUE_VALUE;}
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 129 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 129 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_FALSE_VALUE;}
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 130 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 130 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_NULL_VALUE;}
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 131 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 131 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_TYPEDEF;}
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 132 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 132 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_NAMESPACE;}
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 133 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 133 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_OPERATOR;}
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 134 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 134 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_THROW;}
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 135 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 135 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_EXPLICIT;}
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 136 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 136 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_TEMPLATE;}
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 137 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 137 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_FINAL;}
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 138 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 138 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SCOPE;}
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 139 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 139 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_LOGICAL_OR;}
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 140 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 140 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYOBJECT;}
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 141 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 141 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYTUPLE;}
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 142 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 142 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYLIST;}
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 143 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 143 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYDICT;}
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 144 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 144 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYCALLABLE;}
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 145 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 145 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYSLICE;}
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 146 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 146 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYTYPE;}
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 147 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 147 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_PYBUFFER;}
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 148 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 148 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPSIGNAL;}
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 149 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 149 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPSLOT;}
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 150 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 150 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPANYSLOT;}
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 151 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 151 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPRXCON;}
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 152 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 152 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPRXDIS;}
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 153 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 153 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPSLOTCON;}
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 154 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 154 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPSLOTDIS;}
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 155 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 155 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIPSSIZET;}
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 156 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 156 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_QOBJECT;}
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 157 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 157 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_ELLIPSIS;}
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 159 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 159 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_FORMAT;}
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 160 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 160 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_GET;}
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 161 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 161 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_ID;}
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 162 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 162 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_KWARGS;}
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 163 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 163 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_LANGUAGE;}
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 164 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 164 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_LICENSEE;}
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 165 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 165 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_NAME;}
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 166 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 166 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_OPTIONAL;}
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 167 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 167 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_ORDER;}
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 168 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 168 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_REMOVELEADING;}
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 169 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 169 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SET;}
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 170 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 170 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_SIGNATURE;}
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 171 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 171 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_TIMESTAMP;}
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 172 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 172 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_TYPE;}
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 173 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 173 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_USEARGNAMES;}
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 174 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 174 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_USELIMITEDAPI;}
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 175 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 175 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_ALLRAISEPYEXC;}
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 176 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 176 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_CALLSUPERINIT;}
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 177 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 177 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_DEFERRORHANDLER;}
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 178 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 178 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_VERSION;}
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 180 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 180 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_TRUE_VALUE;}
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 181 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 181 "sip-4.19.6/sipgen/metasrc/lexer.l"
{return TK_FALSE_VALUE;}
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 184 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 184 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* Ignore whitespace. */
;
@@ -2365,7 +2365,7 @@ YY_RULE_SETUP
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 189 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 189 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/*
* Maintain the parenthesis depth so that we don't enter the 'code' state
@@ -2380,7 +2380,7 @@ YY_RULE_SETUP
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 201 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 201 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* Maintain the parenthesis depth. */
--parenDepth;
@@ -2393,7 +2393,7 @@ YY_RULE_SETUP
case 107:
/* rule 107 can match eol */
YY_RULE_SETUP
-#line 210 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 210 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* Maintain the line number. */
++inputFileStack[currentFile].sloc.linenr;
@@ -2406,7 +2406,7 @@ YY_RULE_SETUP
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 220 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 220 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* Ignore C++ style comments. */
;
@@ -2414,7 +2414,7 @@ YY_RULE_SETUP
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 226 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 226 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* A signed decimal number. */
yylval.number = strtol(yytext,NULL,0);
@@ -2423,7 +2423,7 @@ YY_RULE_SETUP
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 233 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 233 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* A floating point number. */
yylval.real = strtod(yytext,NULL);
@@ -2432,7 +2432,7 @@ YY_RULE_SETUP
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 240 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 240 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* An unsigned hexadecimal number. */
yylval.number = strtol(yytext,NULL,16);
@@ -2441,7 +2441,7 @@ YY_RULE_SETUP
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 247 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 247 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* An identifier name. */
yylval.text = sipStrdup(yytext);
@@ -2450,7 +2450,7 @@ YY_RULE_SETUP
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 254 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 254 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* A relative pathname. */
yylval.text = sipStrdup(yytext);
@@ -2460,7 +2460,7 @@ YY_RULE_SETUP
case 114:
/* rule 114 can match eol */
YY_RULE_SETUP
-#line 261 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 261 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* A double-quoted string. */
char ch, *dp, *sp;
@@ -2499,7 +2499,7 @@ YY_RULE_SETUP
case 115:
/* rule 115 can match eol */
YY_RULE_SETUP
-#line 297 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 297 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* A single-quoted character. */
if (strlen(yytext) != 3)
@@ -2512,7 +2512,7 @@ YY_RULE_SETUP
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 308 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 308 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* Ignore C-style comments. */
yy_push_state(ccomment);
@@ -2521,28 +2521,28 @@ YY_RULE_SETUP
case 117:
/* rule 117 can match eol */
YY_RULE_SETUP
-#line 312 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 312 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
++inputFileStack[currentFile].sloc.linenr;
}
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 315 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 315 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
yy_pop_state();
}
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 318 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 318 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
;
}
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 323 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 323 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* The software license. */
codeIdx = 0;
@@ -2551,7 +2551,7 @@ YY_RULE_SETUP
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 329 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 329 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* The start of a from-type code block. */
codeIdx = 0;
@@ -2560,7 +2560,7 @@ YY_RULE_SETUP
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 335 "sip-4.19.5/sipgen/metasrc/lexer.l"
+#line 335 "sip-4.19.6/sipgen/metasrc/lexer.l"
{
/* The start of a to-type code block. */
codeIdx = 0;
@@ -2569,7 +2569,7 @@ YY_RULE_SETUP
YY_BREAK
case 123:
... 4288 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