Browse Source

Fix FTBFS

pull/1/head
Timothy Pearson 11 years ago
parent
commit
71cbc66f6c
  1. 267
      sipgen/lexer.c
  2. 8
      sipgen/lexer.l
  3. 598
      sipgen/parser.c
  4. 12
      sipgen/parser.h
  5. 52
      sipgen/parser.y
  6. 1
      sipgen/sip.h

267
sipgen/lexer.c

@ -1,6 +1,5 @@
#line 2 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.c"
#line 4 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.c"
#line 3 "<stdout>"
#define YY_INT_ALIGNED short int
@ -1143,7 +1142,7 @@ int yy_flex_debug = 0;
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
#line 1 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 1 "/TEMP/sip4-tqt/sipgen/lexer.l"
/*
* The SIP lexer.
*
@ -1161,7 +1160,7 @@ char *yytext;
* SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#line 20 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 20 "/TEMP/sip4-tqt/sipgen/lexer.l"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -1199,7 +1198,7 @@ static FILE *openFile(const char *);
static void fatallex(char *);
#line 1203 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.c"
#line 1202 "<stdout>"
#define INITIAL 0
#define code 1
@ -1391,10 +1390,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
#line 60 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 60 "/TEMP/sip4-tqt/sipgen/lexer.l"
#line 1398 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.c"
#line 1397 "<stdout>"
if ( !(yy_init) )
{
@ -1480,372 +1479,372 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
#line 62 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 62 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_API;}
YY_BREAK
case 2:
YY_RULE_SETUP
#line 63 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 63 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_DEFENCODING;}
YY_BREAK
case 3:
YY_RULE_SETUP
#line 64 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 64 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PLUGIN;}
YY_BREAK
case 4:
YY_RULE_SETUP
#line 65 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 65 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_INCLUDE;}
YY_BREAK
case 5:
YY_RULE_SETUP
#line 66 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 66 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_OPTINCLUDE;}
YY_BREAK
case 6:
YY_RULE_SETUP
#line 67 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 67 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_IMPORT;}
YY_BREAK
case 7:
YY_RULE_SETUP
#line 68 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 68 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_MODULE;}
YY_BREAK
case 8:
YY_RULE_SETUP
#line 69 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 69 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_CMODULE;}
YY_BREAK
case 9:
YY_RULE_SETUP
#line 70 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 70 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_CONSMODULE;}
YY_BREAK
case 10:
YY_RULE_SETUP
#line 71 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 71 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_COMPOMODULE;}
YY_BREAK
case 11:
YY_RULE_SETUP
#line 72 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 72 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_TIMELINE;}
YY_BREAK
case 12:
YY_RULE_SETUP
#line 73 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 73 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PLATFORMS;}
YY_BREAK
case 13:
YY_RULE_SETUP
#line 74 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 74 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_FEATURE;}
YY_BREAK
case 14:
YY_RULE_SETUP
#line 75 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 75 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_LICENSE;}
YY_BREAK
case 15:
YY_RULE_SETUP
#line 76 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 76 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_MAPPEDTYPE;}
YY_BREAK
case 16:
YY_RULE_SETUP
#line 77 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 77 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_EXCEPTION;}
YY_BREAK
case 17:
YY_RULE_SETUP
#line 78 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 78 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_IF;}
YY_BREAK
case 18:
YY_RULE_SETUP
#line 79 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 79 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_DEFMETATYPE;}
YY_BREAK
case 19:
YY_RULE_SETUP
#line 80 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 80 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_DEFSUPERTYPE;}
YY_BREAK
case 20:
YY_RULE_SETUP
#line 81 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 81 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_END;}
YY_BREAK
case 21:
YY_RULE_SETUP
#line 82 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 82 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_CLASS;}
YY_BREAK
case 22:
YY_RULE_SETUP
#line 83 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 83 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_STRUCT;}
YY_BREAK
case 23:
YY_RULE_SETUP
#line 84 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 84 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PUBLIC;}
YY_BREAK
case 24:
YY_RULE_SETUP
#line 85 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 85 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PROTECTED;}
YY_BREAK
case 25:
YY_RULE_SETUP
#line 86 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 86 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PRIVATE;}
YY_BREAK
case 26:
YY_RULE_SETUP
#line 87 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 87 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIGNALS;}
YY_BREAK
case 27:
YY_RULE_SETUP
#line 88 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 88 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIGNALS;}
YY_BREAK
case 28:
YY_RULE_SETUP
#line 89 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 89 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIGNAL_METHOD;}
YY_BREAK
case 29:
YY_RULE_SETUP
#line 90 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 90 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SLOTS;}
YY_BREAK
case 30:
YY_RULE_SETUP
#line 91 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 91 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SLOTS;}
YY_BREAK
case 31:
YY_RULE_SETUP
#line 92 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 92 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SLOT_METHOD;}
YY_BREAK
case 32:
YY_RULE_SETUP
#line 93 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 93 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_CHAR;}
YY_BREAK
case 33:
YY_RULE_SETUP
#line 94 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 94 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_WCHAR_T;}
YY_BREAK
case 34:
YY_RULE_SETUP
#line 95 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 95 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_BOOL;}
YY_BREAK
case 35:
YY_RULE_SETUP
#line 96 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 96 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SHORT;}
YY_BREAK
case 36:
YY_RULE_SETUP
#line 97 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 97 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_INT;}
YY_BREAK
case 37:
YY_RULE_SETUP
#line 98 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 98 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_LONG;}
YY_BREAK
case 38:
YY_RULE_SETUP
#line 99 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 99 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_FLOAT;}
YY_BREAK
case 39:
YY_RULE_SETUP
#line 100 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 100 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_DOUBLE;}
YY_BREAK
case 40:
YY_RULE_SETUP
#line 101 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 101 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_VOID;}
YY_BREAK
case 41:
YY_RULE_SETUP
#line 102 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 102 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_VIRTUAL;}
YY_BREAK
case 42:
YY_RULE_SETUP
#line 103 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 103 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_ENUM;}
YY_BREAK
case 43:
YY_RULE_SETUP
#line 104 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 104 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIGNED;}
YY_BREAK
case 44:
YY_RULE_SETUP
#line 105 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 105 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_UNSIGNED;}
YY_BREAK
case 45:
YY_RULE_SETUP
#line 106 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 106 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_CONST;}
YY_BREAK
case 46:
YY_RULE_SETUP
#line 107 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 107 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_STATIC;}
YY_BREAK
case 47:
YY_RULE_SETUP
#line 108 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 108 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_TRUE;}
YY_BREAK
case 48:
YY_RULE_SETUP
#line 109 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 109 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_FALSE;}
YY_BREAK
case 49:
YY_RULE_SETUP
#line 110 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 110 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_NULL;}
YY_BREAK
case 50:
YY_RULE_SETUP
#line 111 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 111 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_TYPEDEF;}
YY_BREAK
case 51:
YY_RULE_SETUP
#line 112 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 112 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_NAMESPACE;}
YY_BREAK
case 52:
YY_RULE_SETUP
#line 113 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 113 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_OPERATOR;}
YY_BREAK
case 53:
YY_RULE_SETUP
#line 114 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 114 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_THROW;}
YY_BREAK
case 54:
YY_RULE_SETUP
#line 115 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 115 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_EXPLICIT;}
YY_BREAK
case 55:
YY_RULE_SETUP
#line 116 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 116 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_TEMPLATE;}
YY_BREAK
case 56:
YY_RULE_SETUP
#line 117 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 117 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SCOPE;}
YY_BREAK
case 57:
YY_RULE_SETUP
#line 118 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 118 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_LOGICAL_OR;}
YY_BREAK
case 58:
YY_RULE_SETUP
#line 119 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 119 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PYOBJECT;}
YY_BREAK
case 59:
YY_RULE_SETUP
#line 120 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 120 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PYTUPLE;}
YY_BREAK
case 60:
YY_RULE_SETUP
#line 121 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 121 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PYLIST;}
YY_BREAK
case 61:
YY_RULE_SETUP
#line 122 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 122 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PYDICT;}
YY_BREAK
case 62:
YY_RULE_SETUP
#line 123 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 123 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PYCALLABLE;}
YY_BREAK
case 63:
YY_RULE_SETUP
#line 124 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 124 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PYSLICE;}
YY_BREAK
case 64:
YY_RULE_SETUP
#line 125 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 125 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_PYTYPE;}
YY_BREAK
case 65:
YY_RULE_SETUP
#line 126 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 126 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIPSIGNAL;}
YY_BREAK
case 66:
YY_RULE_SETUP
#line 127 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 127 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIPSLOT;}
YY_BREAK
case 67:
YY_RULE_SETUP
#line 128 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 128 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIPANYSLOT;}
YY_BREAK
case 68:
YY_RULE_SETUP
#line 129 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 129 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIPRXCON;}
YY_BREAK
case 69:
YY_RULE_SETUP
#line 130 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 130 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIPRXDIS;}
YY_BREAK
case 70:
YY_RULE_SETUP
#line 131 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 131 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIPSLOTCON;}
YY_BREAK
case 71:
YY_RULE_SETUP
#line 132 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 132 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_SIPSLOTDIS;}
YY_BREAK
case 72:
YY_RULE_SETUP
#line 133 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 133 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_TQOBJECT;}
YY_BREAK
case 73:
YY_RULE_SETUP
#line 134 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 134 "/TEMP/sip4-tqt/sipgen/lexer.l"
{return TK_ELLIPSIS;}
YY_BREAK
case 74:
YY_RULE_SETUP
#line 137 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 137 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* Ignore whitespace. */
;
}
@ -1853,7 +1852,7 @@ YY_RULE_SETUP
case 75:
/* rule 75 can match eol */
YY_RULE_SETUP
#line 141 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 141 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* Maintain the line number. */
++inputFileStack[currentFile].lineno;
@ -1865,14 +1864,14 @@ YY_RULE_SETUP
YY_BREAK
case 76:
YY_RULE_SETUP
#line 150 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 150 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* Ignore C++ style comments. */
;
}
YY_BREAK
case 77:
YY_RULE_SETUP
#line 155 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 155 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* A signed decimal number. */
yylval.number = strtol(yytext,NULL,0);
return TK_NUMBER;
@ -1880,7 +1879,7 @@ YY_RULE_SETUP
YY_BREAK
case 78:
YY_RULE_SETUP
#line 161 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 161 "/TEMP/sip4-tqt/sipgen/lexer.l"
{/* A floating point number. */
yylval.real = strtod(yytext,NULL);
return TK_REAL;
@ -1888,7 +1887,7 @@ YY_RULE_SETUP
YY_BREAK
case 79:
YY_RULE_SETUP
#line 167 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 167 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* An unsigned hexadecimal number. */
yylval.number = strtol(yytext,NULL,16);
return TK_NUMBER;
@ -1896,7 +1895,7 @@ YY_RULE_SETUP
YY_BREAK
case 80:
YY_RULE_SETUP
#line 173 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 173 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* An identifier name. */
yylval.text = sipStrdup(yytext);
return TK_NAME;
@ -1904,7 +1903,7 @@ YY_RULE_SETUP
YY_BREAK
case 81:
YY_RULE_SETUP
#line 179 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 179 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* A relative pathname. */
yylval.text = sipStrdup(yytext);
return TK_PATHNAME;
@ -1913,7 +1912,7 @@ YY_RULE_SETUP
case 82:
/* rule 82 can match eol */
YY_RULE_SETUP
#line 185 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 185 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* A double-quoted string. */
char *dp, *sp;
@ -1940,7 +1939,7 @@ YY_RULE_SETUP
case 83:
/* rule 83 can match eol */
YY_RULE_SETUP
#line 209 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 209 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* A single-quoted character. */
if (strlen(yytext) != 3)
fatallex("Exactly one character expected between single quotes");
@ -1952,7 +1951,7 @@ YY_RULE_SETUP
YY_BREAK
case 84:
YY_RULE_SETUP
#line 219 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 219 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* Ignore C-style comments. */
BEGIN ccomment;
}
@ -1960,28 +1959,28 @@ YY_RULE_SETUP
case 85:
/* rule 85 can match eol */
YY_RULE_SETUP
#line 222 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 222 "/TEMP/sip4-tqt/sipgen/lexer.l"
{
++inputFileStack[currentFile].lineno;
}
YY_BREAK
case 86:
YY_RULE_SETUP
#line 225 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 225 "/TEMP/sip4-tqt/sipgen/lexer.l"
{
BEGIN INITIAL;
}
YY_BREAK
case 87:
YY_RULE_SETUP
#line 228 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 228 "/TEMP/sip4-tqt/sipgen/lexer.l"
{
;
}
YY_BREAK
case 88:
YY_RULE_SETUP
#line 233 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 233 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The software license. */
codeIdx = 0;
return TK_COPYING;
@ -1989,7 +1988,7 @@ YY_RULE_SETUP
YY_BREAK
case 89:
YY_RULE_SETUP
#line 238 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 238 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a from-type code block. */
codeIdx = 0;
return TK_FROMTYPE;
@ -1997,7 +1996,7 @@ YY_RULE_SETUP
YY_BREAK
case 90:
YY_RULE_SETUP
#line 243 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 243 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a to-type code block. */
codeIdx = 0;
return TK_TOTYPE;
@ -2005,7 +2004,7 @@ YY_RULE_SETUP
YY_BREAK
case 91:
YY_RULE_SETUP
#line 248 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 248 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a to-sub-class code block. */
codeIdx = 0;
return TK_TOSUBCLASS;
@ -2013,7 +2012,7 @@ YY_RULE_SETUP
YY_BREAK
case 92:
YY_RULE_SETUP
#line 253 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 253 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of an exported header code block. */
codeIdx = 0;
return TK_EXPHEADERCODE;
@ -2021,7 +2020,7 @@ YY_RULE_SETUP
YY_BREAK
case 93:
YY_RULE_SETUP
#line 258 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 258 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a module header code block. */
codeIdx = 0;
return TK_MODHEADERCODE;
@ -2029,7 +2028,7 @@ YY_RULE_SETUP
YY_BREAK
case 94:
YY_RULE_SETUP
#line 263 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 263 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a type header code block. */
codeIdx = 0;
return TK_TYPEHEADERCODE;
@ -2037,7 +2036,7 @@ YY_RULE_SETUP
YY_BREAK
case 95:
YY_RULE_SETUP
#line 268 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 268 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a pre-initialisation code block. */
codeIdx = 0;
return TK_PREINITCODE;
@ -2045,7 +2044,7 @@ YY_RULE_SETUP
YY_BREAK
case 96:
YY_RULE_SETUP
#line 273 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 273 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of an initialisation code block. */
codeIdx = 0;
return TK_INITCODE;
@ -2053,7 +2052,7 @@ YY_RULE_SETUP
YY_BREAK
case 97:
YY_RULE_SETUP
#line 278 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 278 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a post-initialisation code block. */
codeIdx = 0;
return TK_POSTINITCODE;
@ -2061,7 +2060,7 @@ YY_RULE_SETUP
YY_BREAK
case 98:
YY_RULE_SETUP
#line 283 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 283 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a unit code block. */
codeIdx = 0;
return TK_UNITCODE;
@ -2069,7 +2068,7 @@ YY_RULE_SETUP
YY_BREAK
case 99:
YY_RULE_SETUP
#line 288 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 288 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a module code block. */
codeIdx = 0;
return TK_MODCODE;
@ -2077,7 +2076,7 @@ YY_RULE_SETUP
YY_BREAK
case 100:
YY_RULE_SETUP
#line 293 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 293 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a type code block. */
codeIdx = 0;
return TK_TYPECODE;
@ -2085,7 +2084,7 @@ YY_RULE_SETUP
YY_BREAK
case 101:
YY_RULE_SETUP
#line 298 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 298 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a C++ method code block. */
codeIdx = 0;
return TK_METHODCODE;
@ -2093,7 +2092,7 @@ YY_RULE_SETUP
YY_BREAK
case 102:
YY_RULE_SETUP
#line 303 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 303 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a C++ virtual code block. */
codeIdx = 0;
return TK_VIRTUALCATCHERCODE;
@ -2101,7 +2100,7 @@ YY_RULE_SETUP
YY_BREAK
case 103:
YY_RULE_SETUP
#line 308 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 308 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a traverse code block. */
codeIdx = 0;
return TK_TRAVERSECODE;
@ -2109,7 +2108,7 @@ YY_RULE_SETUP
YY_BREAK
case 104:
YY_RULE_SETUP
#line 313 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 313 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a clear code block. */
codeIdx = 0;
return TK_CLEARCODE;
@ -2117,7 +2116,7 @@ YY_RULE_SETUP
YY_BREAK
case 105:
YY_RULE_SETUP
#line 318 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 318 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a get buffer code block. */
codeIdx = 0;
return TK_GETBUFFERCODE;
@ -2125,7 +2124,7 @@ YY_RULE_SETUP
YY_BREAK
case 106:
YY_RULE_SETUP
#line 323 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 323 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a release buffer code block. */
codeIdx = 0;
return TK_RELEASEBUFFERCODE;
@ -2133,7 +2132,7 @@ YY_RULE_SETUP
YY_BREAK
case 107:
YY_RULE_SETUP
#line 328 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 328 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a read buffer code block. */
codeIdx = 0;
return TK_READBUFFERCODE;
@ -2141,7 +2140,7 @@ YY_RULE_SETUP
YY_BREAK
case 108:
YY_RULE_SETUP
#line 333 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 333 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a write buffer code block. */
codeIdx = 0;
return TK_WRITEBUFFERCODE;
@ -2149,7 +2148,7 @@ YY_RULE_SETUP
YY_BREAK
case 109:
YY_RULE_SETUP
#line 338 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 338 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a segment count code block. */
codeIdx = 0;
return TK_SEGCOUNTCODE;
@ -2157,7 +2156,7 @@ YY_RULE_SETUP
YY_BREAK
case 110:
YY_RULE_SETUP
#line 343 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 343 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a char buffer code block. */
codeIdx = 0;
return TK_CHARBUFFERCODE;
@ -2165,7 +2164,7 @@ YY_RULE_SETUP
YY_BREAK
case 111:
YY_RULE_SETUP
#line 348 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 348 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a pickle code block. */
codeIdx = 0;
return TK_PICKLECODE;
@ -2173,7 +2172,7 @@ YY_RULE_SETUP
YY_BREAK
case 112:
YY_RULE_SETUP
#line 353 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 353 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a pre-Python code block. */
codeIdx = 0;
return TK_PREPYCODE;
@ -2181,7 +2180,7 @@ YY_RULE_SETUP
YY_BREAK
case 113:
YY_RULE_SETUP
#line 358 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 358 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a raise exception code block. */
codeIdx = 0;
return TK_RAISECODE;
@ -2189,7 +2188,7 @@ YY_RULE_SETUP
YY_BREAK
case 114:
YY_RULE_SETUP
#line 363 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 363 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a docstring block. */
codeIdx = 0;
return TK_DOCSTRING;
@ -2197,7 +2196,7 @@ YY_RULE_SETUP
YY_BREAK
case 115:
YY_RULE_SETUP
#line 368 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 368 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a documentation block. */
codeIdx = 0;
return TK_DOC;
@ -2205,7 +2204,7 @@ YY_RULE_SETUP
YY_BREAK
case 116:
YY_RULE_SETUP
#line 373 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 373 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of an exported documentation block. */
codeIdx = 0;
return TK_EXPORTEDDOC;
@ -2213,7 +2212,7 @@ YY_RULE_SETUP
YY_BREAK
case 117:
YY_RULE_SETUP
#line 378 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 378 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a Makefile code block. */
codeIdx = 0;
return TK_MAKEFILE;
@ -2221,7 +2220,7 @@ YY_RULE_SETUP
YY_BREAK
case 118:
YY_RULE_SETUP
#line 383 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 383 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of an access code block. */
codeIdx = 0;
return TK_ACCESSCODE;
@ -2229,7 +2228,7 @@ YY_RULE_SETUP
YY_BREAK
case 119:
YY_RULE_SETUP
#line 388 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 388 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a get code block. */
codeIdx = 0;
return TK_GETCODE;
@ -2237,7 +2236,7 @@ YY_RULE_SETUP
YY_BREAK
case 120:
YY_RULE_SETUP
#line 393 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 393 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The start of a set code block. */
codeIdx = 0;
return TK_SETCODE;
@ -2245,7 +2244,7 @@ YY_RULE_SETUP
YY_BREAK
case 121:
YY_RULE_SETUP
#line 398 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 398 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The end of a code block. */
BEGIN INITIAL;
codeIdx = -1;
@ -2255,7 +2254,7 @@ YY_RULE_SETUP
case 122:
/* rule 122 can match eol */
YY_RULE_SETUP
#line 404 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 404 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The end of a code line . */
struct inputFile *ifp;
@ -2277,7 +2276,7 @@ YY_RULE_SETUP
YY_BREAK
case 123:
YY_RULE_SETUP
#line 423 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 423 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* The contents of a code line. */
if (codeIdx == MAX_CODE_LINE_LENGTH)
fatallex("Line is too long");
@ -2287,17 +2286,17 @@ YY_RULE_SETUP
YY_BREAK
case 124:
YY_RULE_SETUP
#line 430 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 430 "/TEMP/sip4-tqt/sipgen/lexer.l"
{ /* Anything else is returned as is. */
return yytext[0];
}
YY_BREAK
case 125:
YY_RULE_SETUP
#line 434 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 434 "/TEMP/sip4-tqt/sipgen/lexer.l"
ECHO;
YY_BREAK
#line 2301 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.c"
#line 2300 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(code):
case YY_STATE_EOF(ccomment):
@ -3300,7 +3299,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
#line 434 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l"
#line 434 "/TEMP/sip4-tqt/sipgen/lexer.l"

8
sipgen/lexer.l

@ -84,10 +84,10 @@ struct {return TK_STRUCT;}
public {return TK_PUBLIC;}
protected {return TK_PROTECTED;}
private {return TK_PRIVATE;}
Q_SIGNALS {return TK_SIGNALS;}
signals {return TK_SIGNALS;}
Q_SIGNALS {return TK_SIGNALS;}
Q_SIGNAL {return TK_SIGNAL_METHOD;}
Q_SLOTS {return TK_SLOTS;}
slots {return TK_SLOTS;}
Q_SLOTS {return TK_SLOTS;}
Q_SLOT {return TK_SLOT_METHOD;}
char {return TK_CHAR;}
@ -130,7 +130,7 @@ SIP_RXOBJ_CON {return TK_SIPRXCON;}
SIP_RXOBJ_DIS {return TK_SIPRXDIS;}
SIP_SLOT_CON {return TK_SIPSLOTCON;}
SIP_SLOT_DIS {return TK_SIPSLOTDIS;}
SIP_QOBJECT {return TK_QOBJECT;}
SIP_QOBJECT {return TK_TQOBJECT;}
\.\.\. {return TK_ELLIPSIS;}
@ -212,7 +212,7 @@ SIP_QOBJECT {return TK_QOBJECT;}
yylval.qchar = yytext[1];
return TK_QCHAR;
return TK_TQCHAR;
}

598
sipgen/parser.c

File diff suppressed because it is too large Load Diff

12
sipgen/parser.h

@ -121,9 +121,9 @@
TK_LOGICAL_OR = 337,
TK_CONST = 338,
TK_STATIC = 339,
TK_SIPTQT_SIGNAL = 340,
TK_SIPTQT_SLOT = 341,
TK_SIPANYTQT_SLOT = 342,
TK_SIPSIGNAL = 340,
TK_SIPSLOT = 341,
TK_SIPANYSLOT = 342,
TK_SIPRXCON = 343,
TK_SIPRXDIS = 344,
TK_SIPSLOTCON = 345,
@ -235,9 +235,9 @@
#define TK_LOGICAL_OR 337
#define TK_CONST 338
#define TK_STATIC 339
#define TK_SIPTQT_SIGNAL 340
#define TK_SIPTQT_SLOT 341
#define TK_SIPANYTQT_SLOT 342
#define TK_SIPSIGNAL 340
#define TK_SIPSLOT 341
#define TK_SIPANYSLOT 342
#define TK_SIPRXCON 343
#define TK_SIPRXDIS 344
#define TK_SIPSLOTCON 345

52
sipgen/parser.y

@ -1772,7 +1772,7 @@ classline: ifstart
}
| TK_SIGNALS ':' {
if (currentSpec -> genc)
yyerror("Q_SIGNALS section not allowed in a C module");
yyerror("signals section not allowed in a C module");
if (notSkipping())
sectionFlags = SECT_IS_SIGNAL;
@ -2288,7 +2288,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.name = cacheName(currentSpec, $2);
$$.defval = $4;
currentSpec -> sigQ_SLOTS = TRUE;
currentSpec -> sigslots = TRUE;
}
| TK_SIPSLOT optname optflags optassign {
$$.atype = slot_type;
@ -2297,7 +2297,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.name = cacheName(currentSpec, $2);
$$.defval = $4;
currentSpec -> sigQ_SLOTS = TRUE;
currentSpec -> sigslots = TRUE;
}
| TK_SIPANYSLOT optname optflags optassign {
$$.atype = anyslot_type;
@ -2306,7 +2306,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.name = cacheName(currentSpec, $2);
$$.defval = $4;
currentSpec -> sigQ_SLOTS = TRUE;
currentSpec -> sigslots = TRUE;
}
| TK_SIPRXCON optname optflags {
$$.atype = rxcon_type;
@ -2317,7 +2317,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
if (findOptFlag(&$3, "SingleShot", bool_flag) != NULL)
$$.argflags |= ARG_SINGLE_SHOT;
currentSpec -> sigQ_SLOTS = TRUE;
currentSpec -> sigslots = TRUE;
}
| TK_SIPRXDIS optname optflags {
$$.atype = rxdis_type;
@ -2325,7 +2325,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.nrderefs = 0;
$$.name = cacheName(currentSpec, $2);
currentSpec -> sigQ_SLOTS = TRUE;
currentSpec -> sigslots = TRUE;
}
| TK_SIPSLOTCON '(' arglist ')' optname optflags {
$$.atype = slotcon_type;
@ -2339,7 +2339,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.u.sa = sipMalloc(sizeof (signatureDef));
*$$.u.sa = $3;
currentSpec -> sigQ_SLOTS = TRUE;
currentSpec -> sigslots = TRUE;
}
| TK_SIPSLOTDIS '(' arglist ')' optname optflags {
$$.atype = slotdis_type;
@ -2353,7 +2353,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.u.sa = sipMalloc(sizeof (signatureDef));
*$$.u.sa = $3;
currentSpec -> sigQ_SLOTS = TRUE;
currentSpec -> sigslots = TRUE;
}
| TK_QOBJECT optname optflags {
$$.atype = qobject_type;
@ -2750,7 +2750,7 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl,
spec->typedefs = NULL;
spec->exphdrcode = NULL;
spec->docs = NULL;
spec->sigQ_SLOTS = FALSE;
spec->sigslots = FALSE;
spec->genc = -1;
spec->plugins = NULL;
@ -3266,7 +3266,7 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd,
cd->pyqt4_flags = flg->fvalue.ival;
if (findOptFlag(of, "PyQt4NoQMetaObject", bool_flag) != NULL)
setPyQt4NoQMetaObject(cd);
setPyTQt4NoTQMetaObject(cd);
if (isOpaque(cd))
{
@ -3666,7 +3666,7 @@ static enumDef *newEnum(sipSpec *pt, moduleDef *mod, mappedTypeDef *mt_scope,
ed->next_alt = next_alt;
ed->module = mod;
ed->members = NULL;
ed->Q_SLOTS = NULL;
ed->slots = NULL;
ed->overs = NULL;
ed->next = pt -> enums;
@ -3959,7 +3959,7 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
ifaceFileList *iffl, **used;
type_names = type_values = NULL;
appendTypeStrings(classFQCName(tcd->cd), &tcd->sig, &td->types, NULL, &type_names, &type_values);
appendTypeStrings(classFTQCName(tcd->cd), &tcd->sig, &td->types, NULL, &type_names, &type_values);
/*
* Add a mapping from the template name to the instantiated name. If we
@ -3968,9 +3968,9 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
ad = &tcd->sig.args[tcd->sig.nrArgs++];
memset(ad, 0, sizeof (argDef));
ad->atype = defined_type;
ad->u.snd = classFQCName(tcd->cd);
ad->u.snd = classFTQCName(tcd->cd);
appendScopedName(&type_names, text2scopePart(scopedNameTail(classFQCName(tcd->cd))));
appendScopedName(&type_names, text2scopePart(scopedNameTail(classFTQCName(tcd->cd))));
appendScopedName(&type_values, text2scopePart(scopedNameToString(fqname)));
/* Create the new class. */
@ -4249,9 +4249,9 @@ static void instantiateTemplateEnums(sipSpec *pt, classTmplDef *tcd,
ed->members = emd;
}
ed->Q_SLOTS = instantiateTemplateMethods(ted->Q_SLOTS, mod);
ed->slots = instantiateTemplateMethods(ted->slots, mod);
ed->overs = instantiateTemplateOverloads(pt, ted->overs,
ted->Q_SLOTS, ed->Q_SLOTS, tcd, td, cd, used, type_names,
ted->slots, ed->slots, tcd, td, cd, used, type_names,
type_values);
ed->next = pt->enums;
@ -4360,7 +4360,7 @@ static void templateType(argDef *ad, classTmplDef *tcd, templateDef *td, classDe
}
/* Handle the class name itself. */
if (strcmp(name, scopedNameTail(classFQCName(tcd->cd))) == 0)
if (strcmp(name, scopedNameTail(classFTQCName(tcd->cd))) == 0)
{
ad->atype = class_type;
ad->u.cd = ncd;
@ -4585,7 +4585,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
scopedNameDef *snd;
int found;
snd = copyScopedName(classFQCName(scope));
snd = copyScopedName(classFTQCName(scope));
appendScopedName(&snd, copyScopedName(rel_name));
found = (compareScopedNames(fq_name, snd) == 0);
@ -4969,16 +4969,16 @@ static void newFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope,
if (isSignal(od))
setHasShadow(c_scope);
pt->sigQ_SLOTS = TRUE;
pt->sigslots = TRUE;
}
if (isSignal(od) && (methodcode != NULL || vcode != NULL))
yyerror("Cannot provide code for Q_SIGNALS");
yyerror("Cannot provide code for signals");
if (isstatic)
{
if (isSignal(od))
yyerror("Static functions cannot be Q_SIGNALS");
yyerror("Static functions cannot be signals");
if (isvirt)
yyerror("Static functions cannot be virtual");
@ -5005,8 +5005,8 @@ static void newFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope,
if (isvirt)
{
if (isSignal(od) && pluginPyQt3(pt))
yyerror("Virtual Q_SIGNALS aren't supported");
if (isSignal(od) && pluginPyTQt3(pt))
yyerror("Virtual signals aren't supported");
setIsVirtual(od);
setHasShadow(c_scope);
@ -5232,7 +5232,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope,
int nrargs; /* Nr. of arguments. */
} slot_table[] = {
{"__str__", str_slot, TRUE, 0},
{"__tqunicode__", tqunicode_slot, TRUE, 0},
{"__unicode__", tqunicode_slot, TRUE, 0},
{"__int__", int_slot, FALSE, 0},
{"__long__", long_slot, FALSE, 0},
{"__float__", float_slot, FALSE, 0},
@ -6062,7 +6062,7 @@ static const char *getDocValue(optFlags *optflgs)
/*
* Return TRUE if the PyQt3 plugin was specified.
*/
int pluginPyQt3(sipSpec *pt)
int pluginPyTQt3(sipSpec *pt)
{
return stringFind(pt->plugins, "PyQt3");
}
@ -6071,7 +6071,7 @@ int pluginPyQt3(sipSpec *pt)
/*
* Return TRUE if the PyQt4 plugin was specified.
*/
int pluginPyQt4(sipSpec *pt)
int pluginPyTQt4(sipSpec *pt)
{
return stringFind(pt->plugins, "PyQt4");
}

1
sipgen/sip.h

@ -23,6 +23,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <tqt.h>
#ifdef TRUE
#undef TRUE

Loading…
Cancel
Save