diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 13:36:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 13:36:40 -0600 |
| commit | 71cbc66f6c877652370529d008263320a6cea74c (patch) | |
| tree | ea7fe01b0519e1e13c35985ba17fad7ba7e0b1ae | |
| parent | 7d27356bafd5670adcc8753ab5437b3bf8ffa4be (diff) | |
| download | sip4-tqt-71cbc66f6c877652370529d008263320a6cea74c.tar.gz sip4-tqt-71cbc66f6c877652370529d008263320a6cea74c.zip | |
Fix FTBFS
| -rw-r--r-- | sipgen/lexer.c | 267 | ||||
| -rw-r--r-- | sipgen/lexer.l | 8 | ||||
| -rw-r--r-- | sipgen/parser.c | 598 | ||||
| -rw-r--r-- | sipgen/parser.h | 12 | ||||
| -rw-r--r-- | sipgen/parser.y | 52 | ||||
| -rw-r--r-- | sipgen/sip.h | 1 |
6 files changed, 469 insertions, 469 deletions
diff --git a/sipgen/lexer.c b/sipgen/lexer.c index 74ed026..775794c 100644 --- a/sipgen/lexer.c +++ b/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" diff --git a/sipgen/lexer.l b/sipgen/lexer.l index 5c0c96b..53fd905 100644 --- a/sipgen/lexer.l +++ b/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; } diff --git a/sipgen/parser.c b/sipgen/parser.c index cf30191..e0de35e 100644 --- a/sipgen/parser.c +++ b/sipgen/parser.c @@ -68,7 +68,7 @@ /* Copy the first part of user declarations. */ /* Line 189 of yacc.c */ -#line 19 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 19 "/TEMP/sip4-tqt/sipgen/parser.y" #include <stdlib.h> #include <string.h> @@ -93,8 +93,8 @@ static int sectionFlags; /* The current section flags. */ static int currentOverIsVirt; /* Set if the overload is virtual. */ static int currentCtorIsExplicit; /* Set if the ctor is explicit. */ static int currentIsStatic; /* Set if the current is static. */ -static int currentIsSignal; /* Set if the current is TQ_SIGNAL. */ -static int currentIsSlot; /* Set if the current is TQ_SLOT. */ +static int currentIsSignal; /* Set if the current is Q_SIGNAL. */ +static int currentIsSlot; /* Set if the current is Q_SLOT. */ static int currentIsTemplate; /* Set if the current is a template. */ static char *previousFile; /* The file just parsed. */ static parserContext currentContext; /* The current context. */ @@ -198,7 +198,7 @@ static int isEnabledFeature(const char *name); /* Line 189 of yacc.c */ -#line 202 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.c" +#line 202 "y.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -307,9 +307,9 @@ static int isEnabledFeature(const char *name); 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, @@ -322,13 +322,13 @@ static int isEnabledFeature(const char *name); TK_PLATFORMS = 352, TK_FEATURE = 353, TK_LICENSE = 354, - TK_TQCHAR = 355, + TK_QCHAR = 355, TK_TRUE = 356, TK_FALSE = 357, TK_NULL = 358, TK_OPERATOR = 359, TK_THROW = 360, - TK_TQOBJECT = 361, + TK_QOBJECT = 361, TK_EXCEPTION = 362, TK_RAISECODE = 363, TK_EXPLICIT = 364, @@ -421,9 +421,9 @@ static int isEnabledFeature(const char *name); #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 @@ -436,13 +436,13 @@ static int isEnabledFeature(const char *name); #define TK_PLATFORMS 352 #define TK_FEATURE 353 #define TK_LICENSE 354 -#define TK_TQCHAR 355 +#define TK_QCHAR 355 #define TK_TRUE 356 #define TK_FALSE 357 #define TK_NULL 358 #define TK_OPERATOR 359 #define TK_THROW 360 -#define TK_TQOBJECT 361 +#define TK_QOBJECT 361 #define TK_EXCEPTION 362 #define TK_RAISECODE 363 #define TK_EXPLICIT 364 @@ -459,7 +459,7 @@ typedef union YYSTYPE { /* Line 214 of yacc.c */ -#line 147 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 147 "/TEMP/sip4-tqt/sipgen/parser.y" char qchar; char *text; @@ -483,7 +483,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 487 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.c" +#line 487 "y.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -495,7 +495,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 499 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.c" +#line 499 "y.tab.c" #ifdef short # undef short @@ -997,8 +997,8 @@ static const char *const yytname[] = "TK_STATIC", "TK_SIPSIGNAL", "TK_SIPSLOT", "TK_SIPANYSLOT", "TK_SIPRXCON", "TK_SIPRXDIS", "TK_SIPSLOTCON", "TK_SIPSLOTDIS", "TK_NUMBER", "TK_REAL", "TK_TYPEDEF", "TK_NAMESPACE", "TK_TIMELINE", - "TK_PLATFORMS", "TK_FEATURE", "TK_LICENSE", "TK_TQCHAR", "TK_TRUE", - "TK_FALSE", "TK_NULL", "TK_OPERATOR", "TK_THROW", "TK_TQOBJECT", + "TK_PLATFORMS", "TK_FEATURE", "TK_LICENSE", "TK_QCHAR", "TK_TRUE", + "TK_FALSE", "TK_NULL", "TK_OPERATOR", "TK_THROW", "TK_QOBJECT", "TK_EXCEPTION", "TK_RAISECODE", "TK_EXPLICIT", "TK_TEMPLATE", "TK_ELLIPSIS", "TK_DEFMETATYPE", "TK_DEFSUPERTYPE", "'{'", "'}'", "';'", "'('", "')'", "'!'", "'-'", "','", "'='", "'+'", "'*'", "'/'", "'&'", @@ -2460,7 +2460,7 @@ yyreduce: case 4: /* Line 1455 of yacc.c */ -#line 354 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 354 "/TEMP/sip4-tqt/sipgen/parser.y" { /* * We don't do these in parserEOF() because the parser is reading @@ -2483,7 +2483,7 @@ yyreduce: case 22: /* Line 1455 of yacc.c */ -#line 389 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 389 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tSpec->exphdrcode, (yyvsp[(1) - (1)].codeb)); @@ -2493,7 +2493,7 @@ yyreduce: case 23: /* Line 1455 of yacc.c */ -#line 393 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 393 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tModule->hdrcode, (yyvsp[(1) - (1)].codeb)); @@ -2503,7 +2503,7 @@ yyreduce: case 24: /* Line 1455 of yacc.c */ -#line 397 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 397 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tModule->cppcode, (yyvsp[(1) - (1)].codeb)); @@ -2513,7 +2513,7 @@ yyreduce: case 47: /* Line 1455 of yacc.c */ -#line 425 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 425 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2530,7 +2530,7 @@ yyreduce: case 48: /* Line 1455 of yacc.c */ -#line 438 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 438 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2543,7 +2543,7 @@ yyreduce: case 49: /* Line 1455 of yacc.c */ -#line 447 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 447 "/TEMP/sip4-tqt/sipgen/parser.y" { appendString(¤tSpec->plugins, (yyvsp[(2) - (2)].text)); } @@ -2552,7 +2552,7 @@ yyreduce: case 50: /* Line 1455 of yacc.c */ -#line 452 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 452 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2582,7 +2582,7 @@ yyreduce: case 51: /* Line 1455 of yacc.c */ -#line 478 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 478 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2625,7 +2625,7 @@ yyreduce: case 52: /* Line 1455 of yacc.c */ -#line 517 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 517 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.exceptionbase).bibase = NULL; (yyval.exceptionbase).base = NULL; @@ -2635,7 +2635,7 @@ yyreduce: case 53: /* Line 1455 of yacc.c */ -#line 521 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 521 "/TEMP/sip4-tqt/sipgen/parser.y" { exceptionDef *xd; @@ -2713,7 +2713,7 @@ yyreduce: case 54: /* Line 1455 of yacc.c */ -#line 595 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 595 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -2722,7 +2722,7 @@ yyreduce: case 55: /* Line 1455 of yacc.c */ -#line 600 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 600 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) currentMappedType = newMappedType(currentSpec, &(yyvsp[(2) - (3)].memArg), &(yyvsp[(3) - (3)].optflags)); @@ -2732,7 +2732,7 @@ yyreduce: case 57: /* Line 1455 of yacc.c */ -#line 606 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 606 "/TEMP/sip4-tqt/sipgen/parser.y" { int a; @@ -2786,7 +2786,7 @@ yyreduce: case 59: /* Line 1455 of yacc.c */ -#line 656 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 656 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2804,7 +2804,7 @@ yyreduce: case 62: /* Line 1455 of yacc.c */ -#line 674 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 674 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tMappedType->iff->hdrcode, (yyvsp[(1) - (1)].codeb)); @@ -2814,7 +2814,7 @@ yyreduce: case 63: /* Line 1455 of yacc.c */ -#line 678 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 678 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2829,7 +2829,7 @@ yyreduce: case 64: /* Line 1455 of yacc.c */ -#line 687 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 687 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2844,7 +2844,7 @@ yyreduce: case 67: /* Line 1455 of yacc.c */ -#line 700 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 700 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2862,7 +2862,7 @@ yyreduce: case 68: /* Line 1455 of yacc.c */ -#line 714 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 714 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc) yyerror("namespace definition not allowed in a C module"); @@ -2890,7 +2890,7 @@ yyreduce: case 69: /* Line 1455 of yacc.c */ -#line 735 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 735 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -2910,7 +2910,7 @@ yyreduce: case 72: /* Line 1455 of yacc.c */ -#line 755 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 755 "/TEMP/sip4-tqt/sipgen/parser.y" { qualDef *qd; @@ -2923,7 +2923,7 @@ yyreduce: case 73: /* Line 1455 of yacc.c */ -#line 762 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 762 "/TEMP/sip4-tqt/sipgen/parser.y" { qualDef *qd; int nrneeded; @@ -2947,7 +2947,7 @@ yyreduce: case 76: /* Line 1455 of yacc.c */ -#line 786 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 786 "/TEMP/sip4-tqt/sipgen/parser.y" { newQualifier(currentModule,-1,-1,(yyvsp[(1) - (1)].text),platform_qualifier); } @@ -2956,7 +2956,7 @@ yyreduce: case 77: /* Line 1455 of yacc.c */ -#line 791 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 791 "/TEMP/sip4-tqt/sipgen/parser.y" { newQualifier(currentModule,-1,-1,(yyvsp[(2) - (2)].text),feature_qualifier); } @@ -2965,7 +2965,7 @@ yyreduce: case 78: /* Line 1455 of yacc.c */ -#line 796 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 796 "/TEMP/sip4-tqt/sipgen/parser.y" { currentTimelineOrder = 0; } @@ -2974,7 +2974,7 @@ yyreduce: case 79: /* Line 1455 of yacc.c */ -#line 799 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 799 "/TEMP/sip4-tqt/sipgen/parser.y" { qualDef *qd; int nrneeded; @@ -3000,7 +3000,7 @@ yyreduce: case 82: /* Line 1455 of yacc.c */ -#line 825 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 825 "/TEMP/sip4-tqt/sipgen/parser.y" { newQualifier(currentModule,currentModule -> nrtimelines,currentTimelineOrder++,(yyvsp[(1) - (1)].text),time_qualifier); } @@ -3009,7 +3009,7 @@ yyreduce: case 83: /* Line 1455 of yacc.c */ -#line 830 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 830 "/TEMP/sip4-tqt/sipgen/parser.y" { if (skipStackPtr >= MAX_NESTED_IF) yyerror("Internal error: increase the value of MAX_NESTED_IF"); @@ -3026,7 +3026,7 @@ yyreduce: case 84: /* Line 1455 of yacc.c */ -#line 843 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 843 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = platOrFeature((yyvsp[(1) - (1)].text),FALSE); } @@ -3035,7 +3035,7 @@ yyreduce: case 85: /* Line 1455 of yacc.c */ -#line 846 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 846 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = platOrFeature((yyvsp[(2) - (2)].text),TRUE); } @@ -3044,7 +3044,7 @@ yyreduce: case 86: /* Line 1455 of yacc.c */ -#line 849 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 849 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = (platOrFeature((yyvsp[(3) - (3)].text),FALSE) || (yyvsp[(1) - (3)].boolean)); } @@ -3053,7 +3053,7 @@ yyreduce: case 87: /* Line 1455 of yacc.c */ -#line 852 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 852 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = (platOrFeature((yyvsp[(4) - (4)].text),TRUE) || (yyvsp[(1) - (4)].boolean)); } @@ -3062,7 +3062,7 @@ yyreduce: case 89: /* Line 1455 of yacc.c */ -#line 858 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 858 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = timePeriod((yyvsp[(1) - (3)].text),(yyvsp[(3) - (3)].text)); } @@ -3071,7 +3071,7 @@ yyreduce: case 90: /* Line 1455 of yacc.c */ -#line 863 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 863 "/TEMP/sip4-tqt/sipgen/parser.y" { if (skipStackPtr-- <= 0) yyerror("Too many %End directives"); @@ -3081,7 +3081,7 @@ yyreduce: case 91: /* Line 1455 of yacc.c */ -#line 869 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 869 "/TEMP/sip4-tqt/sipgen/parser.y" { optFlag *of; @@ -3112,7 +3112,7 @@ yyreduce: case 92: /* Line 1455 of yacc.c */ -#line 896 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 896 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -3127,7 +3127,7 @@ yyreduce: case 93: /* Line 1455 of yacc.c */ -#line 907 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 907 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -3142,7 +3142,7 @@ yyreduce: case 94: /* Line 1455 of yacc.c */ -#line 918 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 918 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Make sure this is the first mention of a module. */ if (currentSpec->module != currentModule) @@ -3159,7 +3159,7 @@ yyreduce: case 95: /* Line 1455 of yacc.c */ -#line 931 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 931 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Make sure this is the first mention of a module. */ if (currentSpec->module != currentModule) @@ -3176,7 +3176,7 @@ yyreduce: case 96: /* Line 1455 of yacc.c */ -#line 944 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 944 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Check the module hasn't already been defined. */ @@ -3213,7 +3213,7 @@ yyreduce: case 97: /* Line 1455 of yacc.c */ -#line 977 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 977 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = FALSE; } @@ -3222,7 +3222,7 @@ yyreduce: case 98: /* Line 1455 of yacc.c */ -#line 980 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 980 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = TRUE; } @@ -3231,7 +3231,7 @@ yyreduce: case 100: /* Line 1455 of yacc.c */ -#line 986 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 986 "/TEMP/sip4-tqt/sipgen/parser.y" { /* * The grammar design is a bit broken and this is the easiest way @@ -3251,7 +3251,7 @@ yyreduce: case 101: /* Line 1455 of yacc.c */ -#line 1002 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1002 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = -1; } @@ -3260,7 +3260,7 @@ yyreduce: case 103: /* Line 1455 of yacc.c */ -#line 1008 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1008 "/TEMP/sip4-tqt/sipgen/parser.y" { parseFile(NULL, (yyvsp[(2) - (2)].text), NULL, FALSE); } @@ -3269,7 +3269,7 @@ yyreduce: case 104: /* Line 1455 of yacc.c */ -#line 1013 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1013 "/TEMP/sip4-tqt/sipgen/parser.y" { parseFile(NULL, (yyvsp[(2) - (2)].text), NULL, TRUE); } @@ -3278,7 +3278,7 @@ yyreduce: case 105: /* Line 1455 of yacc.c */ -#line 1018 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1018 "/TEMP/sip4-tqt/sipgen/parser.y" { newImport((yyvsp[(2) - (2)].text)); } @@ -3287,7 +3287,7 @@ yyreduce: case 106: /* Line 1455 of yacc.c */ -#line 1023 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1023 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = NULL; } @@ -3296,7 +3296,7 @@ yyreduce: case 107: /* Line 1455 of yacc.c */ -#line 1026 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1026 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3305,7 +3305,7 @@ yyreduce: case 108: /* Line 1455 of yacc.c */ -#line 1031 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1031 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = NULL; } @@ -3314,7 +3314,7 @@ yyreduce: case 109: /* Line 1455 of yacc.c */ -#line 1034 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1034 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3323,7 +3323,7 @@ yyreduce: case 110: /* Line 1455 of yacc.c */ -#line 1039 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1039 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = NULL; } @@ -3332,7 +3332,7 @@ yyreduce: case 111: /* Line 1455 of yacc.c */ -#line 1042 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1042 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3341,7 +3341,7 @@ yyreduce: case 112: /* Line 1455 of yacc.c */ -#line 1047 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1047 "/TEMP/sip4-tqt/sipgen/parser.y" { appendCodeBlock(¤tModule->copying, (yyvsp[(2) - (2)].codeb)); } @@ -3350,7 +3350,7 @@ yyreduce: case 113: /* Line 1455 of yacc.c */ -#line 1052 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1052 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3359,7 +3359,7 @@ yyreduce: case 114: /* Line 1455 of yacc.c */ -#line 1057 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1057 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3368,7 +3368,7 @@ yyreduce: case 115: /* Line 1455 of yacc.c */ -#line 1062 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1062 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3377,7 +3377,7 @@ yyreduce: case 116: /* Line 1455 of yacc.c */ -#line 1067 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1067 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = NULL; } @@ -3386,7 +3386,7 @@ yyreduce: case 118: /* Line 1455 of yacc.c */ -#line 1073 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1073 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3395,7 +3395,7 @@ yyreduce: case 119: /* Line 1455 of yacc.c */ -#line 1078 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1078 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3404,7 +3404,7 @@ yyreduce: case 120: /* Line 1455 of yacc.c */ -#line 1083 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1083 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3413,7 +3413,7 @@ yyreduce: case 121: /* Line 1455 of yacc.c */ -#line 1088 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1088 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3422,7 +3422,7 @@ yyreduce: case 122: /* Line 1455 of yacc.c */ -#line 1093 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1093 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3431,7 +3431,7 @@ yyreduce: case 123: /* Line 1455 of yacc.c */ -#line 1098 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1098 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3440,7 +3440,7 @@ yyreduce: case 124: /* Line 1455 of yacc.c */ -#line 1103 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1103 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3449,7 +3449,7 @@ yyreduce: case 125: /* Line 1455 of yacc.c */ -#line 1108 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1108 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3458,7 +3458,7 @@ yyreduce: case 126: /* Line 1455 of yacc.c */ -#line 1113 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1113 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3467,7 +3467,7 @@ yyreduce: case 127: /* Line 1455 of yacc.c */ -#line 1118 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1118 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3476,7 +3476,7 @@ yyreduce: case 128: /* Line 1455 of yacc.c */ -#line 1123 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1123 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -3485,7 +3485,7 @@ yyreduce: case 129: /* Line 1455 of yacc.c */ -#line 1128 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1128 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tModule->preinitcode, (yyvsp[(2) - (2)].codeb)); @@ -3495,7 +3495,7 @@ yyreduce: case 130: /* Line 1455 of yacc.c */ -#line 1134 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1134 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tModule->initcode, (yyvsp[(2) - (2)].codeb)); @@ -3505,7 +3505,7 @@ yyreduce: case 131: /* Line 1455 of yacc.c */ -#line 1140 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1140 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tModule->postinitcode, (yyvsp[(2) - (2)].codeb)); @@ -3515,7 +3515,7 @@ yyreduce: case 132: /* Line 1455 of yacc.c */ -#line 1146 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1146 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tModule->unitcode, (yyvsp[(2) - (2)].codeb)); @@ -3525,12 +3525,12 @@ yyreduce: case 133: /* Line 1455 of yacc.c */ -#line 1152 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1152 "/TEMP/sip4-tqt/sipgen/parser.y" { /* * This is a no-op and is retained for compatibility * until the last use of it (by SIP v3) can be removed - * from PyTQt. + * from PyQt. */ } break; @@ -3538,7 +3538,7 @@ yyreduce: case 134: /* Line 1455 of yacc.c */ -#line 1161 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1161 "/TEMP/sip4-tqt/sipgen/parser.y" { if (inMainModule()) appendCodeBlock(¤tSpec -> docs,(yyvsp[(2) - (2)].codeb)); @@ -3548,7 +3548,7 @@ yyreduce: case 135: /* Line 1455 of yacc.c */ -#line 1167 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1167 "/TEMP/sip4-tqt/sipgen/parser.y" { appendCodeBlock(¤tSpec -> docs,(yyvsp[(2) - (2)].codeb)); } @@ -3557,7 +3557,7 @@ yyreduce: case 136: /* Line 1455 of yacc.c */ -#line 1172 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1172 "/TEMP/sip4-tqt/sipgen/parser.y" { if (inMainModule()) yywarning("%Makefile is ignored, please use the -b flag instead"); @@ -3567,7 +3567,7 @@ yyreduce: case 139: /* Line 1455 of yacc.c */ -#line 1182 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1182 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(1) - (2)].codeb); @@ -3582,7 +3582,7 @@ yyreduce: case 140: /* Line 1455 of yacc.c */ -#line 1193 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1193 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -3598,7 +3598,7 @@ yyreduce: case 142: /* Line 1455 of yacc.c */ -#line 1205 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1205 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.text) = NULL; } @@ -3607,7 +3607,7 @@ yyreduce: case 143: /* Line 1455 of yacc.c */ -#line 1208 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1208 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.text) = (yyvsp[(1) - (1)].text); } @@ -3616,7 +3616,7 @@ yyreduce: case 144: /* Line 1455 of yacc.c */ -#line 1213 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1213 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.text) = NULL; } @@ -3625,7 +3625,7 @@ yyreduce: case 145: /* Line 1455 of yacc.c */ -#line 1216 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1216 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.text) = (yyvsp[(1) - (1)].text); } @@ -3634,7 +3634,7 @@ yyreduce: case 152: /* Line 1455 of yacc.c */ -#line 1231 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1231 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -3666,7 +3666,7 @@ yyreduce: case 157: /* Line 1455 of yacc.c */ -#line 1267 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1267 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.valp) = NULL; } @@ -3675,7 +3675,7 @@ yyreduce: case 158: /* Line 1455 of yacc.c */ -#line 1270 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1270 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.valp) = (yyvsp[(2) - (2)].valp); } @@ -3684,7 +3684,7 @@ yyreduce: case 160: /* Line 1455 of yacc.c */ -#line 1276 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1276 "/TEMP/sip4-tqt/sipgen/parser.y" { valueDef *vd; @@ -3706,7 +3706,7 @@ yyreduce: case 161: /* Line 1455 of yacc.c */ -#line 1294 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1294 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '-'; } @@ -3715,7 +3715,7 @@ yyreduce: case 162: /* Line 1455 of yacc.c */ -#line 1297 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1297 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '+'; } @@ -3724,7 +3724,7 @@ yyreduce: case 163: /* Line 1455 of yacc.c */ -#line 1300 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1300 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '*'; } @@ -3733,7 +3733,7 @@ yyreduce: case 164: /* Line 1455 of yacc.c */ -#line 1303 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1303 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '/'; } @@ -3742,7 +3742,7 @@ yyreduce: case 165: /* Line 1455 of yacc.c */ -#line 1306 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1306 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '&'; } @@ -3751,7 +3751,7 @@ yyreduce: case 166: /* Line 1455 of yacc.c */ -#line 1309 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1309 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '|'; } @@ -3760,7 +3760,7 @@ yyreduce: case 167: /* Line 1455 of yacc.c */ -#line 1314 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1314 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '\0'; } @@ -3769,7 +3769,7 @@ yyreduce: case 168: /* Line 1455 of yacc.c */ -#line 1317 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1317 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '!'; } @@ -3778,7 +3778,7 @@ yyreduce: case 169: /* Line 1455 of yacc.c */ -#line 1320 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1320 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '~'; } @@ -3787,7 +3787,7 @@ yyreduce: case 170: /* Line 1455 of yacc.c */ -#line 1323 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1323 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '-'; } @@ -3796,7 +3796,7 @@ yyreduce: case 171: /* Line 1455 of yacc.c */ -#line 1326 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1326 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.qchar) = '+'; } @@ -3805,7 +3805,7 @@ yyreduce: case 172: /* Line 1455 of yacc.c */ -#line 1331 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1331 "/TEMP/sip4-tqt/sipgen/parser.y" { if ((yyvsp[(1) - (2)].qchar) != '\0' && (yyvsp[(2) - (2)].value).vtype == string_value) yyerror("Invalid unary operator for string"); @@ -3827,7 +3827,7 @@ yyreduce: case 174: /* Line 1455 of yacc.c */ -#line 1350 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1350 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc) yyerror("Scoped names are not allowed in a C module"); @@ -3839,7 +3839,7 @@ yyreduce: case 175: /* Line 1455 of yacc.c */ -#line 1358 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1358 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.scpvalp) = text2scopePart((yyvsp[(1) - (1)].text)); } @@ -3848,7 +3848,7 @@ yyreduce: case 176: /* Line 1455 of yacc.c */ -#line 1363 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1363 "/TEMP/sip4-tqt/sipgen/parser.y" { /* * We let the C++ compiler decide if the value is a valid one - no @@ -3863,7 +3863,7 @@ yyreduce: case 177: /* Line 1455 of yacc.c */ -#line 1372 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1372 "/TEMP/sip4-tqt/sipgen/parser.y" { fcallDef *fcd; @@ -3879,7 +3879,7 @@ yyreduce: case 178: /* Line 1455 of yacc.c */ -#line 1382 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1382 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.value).vtype = real_value; (yyval.value).u.vreal = (yyvsp[(1) - (1)].real); @@ -3889,7 +3889,7 @@ yyreduce: case 179: /* Line 1455 of yacc.c */ -#line 1386 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1386 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.value).vtype = numeric_value; (yyval.value).u.vnum = (yyvsp[(1) - (1)].number); @@ -3899,7 +3899,7 @@ yyreduce: case 180: /* Line 1455 of yacc.c */ -#line 1390 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1390 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.value).vtype = numeric_value; (yyval.value).u.vnum = 1; @@ -3909,7 +3909,7 @@ yyreduce: case 181: /* Line 1455 of yacc.c */ -#line 1394 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1394 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.value).vtype = numeric_value; (yyval.value).u.vnum = 0; @@ -3919,7 +3919,7 @@ yyreduce: case 182: /* Line 1455 of yacc.c */ -#line 1398 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1398 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.value).vtype = numeric_value; (yyval.value).u.vnum = 0; @@ -3929,7 +3929,7 @@ yyreduce: case 183: /* Line 1455 of yacc.c */ -#line 1402 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1402 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.value).vtype = string_value; (yyval.value).u.vstr = (yyvsp[(1) - (1)].text); @@ -3939,7 +3939,7 @@ yyreduce: case 184: /* Line 1455 of yacc.c */ -#line 1406 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1406 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.value).vtype = qchar_value; (yyval.value).u.vqchar = (yyvsp[(1) - (1)].qchar); @@ -3949,7 +3949,7 @@ yyreduce: case 185: /* Line 1455 of yacc.c */ -#line 1412 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1412 "/TEMP/sip4-tqt/sipgen/parser.y" { /* No values. */ @@ -3960,7 +3960,7 @@ yyreduce: case 186: /* Line 1455 of yacc.c */ -#line 1417 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1417 "/TEMP/sip4-tqt/sipgen/parser.y" { /* The single or first expression. */ @@ -3972,7 +3972,7 @@ yyreduce: case 187: /* Line 1455 of yacc.c */ -#line 1423 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1423 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Check that it wasn't ...(,expression...). */ @@ -3994,7 +3994,7 @@ yyreduce: case 188: /* Line 1455 of yacc.c */ -#line 1441 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1441 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4007,7 +4007,7 @@ yyreduce: case 189: /* Line 1455 of yacc.c */ -#line 1448 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1448 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4036,7 +4036,7 @@ yyreduce: case 190: /* Line 1455 of yacc.c */ -#line 1473 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1473 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc && (yyvsp[(2) - (2)].scpvalp)->next != NULL) yyerror("Namespaces not allowed in a C module"); @@ -4049,7 +4049,7 @@ yyreduce: case 191: /* Line 1455 of yacc.c */ -#line 1479 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1479 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4065,7 +4065,7 @@ yyreduce: case 192: /* Line 1455 of yacc.c */ -#line 1488 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1488 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) completeClass((yyvsp[(2) - (8)].scpvalp), &(yyvsp[(5) - (8)].optflags), (yyvsp[(7) - (8)].boolean)); @@ -4075,14 +4075,14 @@ yyreduce: case 193: /* Line 1455 of yacc.c */ -#line 1494 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1494 "/TEMP/sip4-tqt/sipgen/parser.y" {currentIsTemplate = TRUE;} break; case 194: /* Line 1455 of yacc.c */ -#line 1494 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1494 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec->genc) yyerror("Class templates not allowed in a C module"); @@ -4112,7 +4112,7 @@ yyreduce: case 195: /* Line 1455 of yacc.c */ -#line 1520 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1520 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.signature) = (yyvsp[(3) - (4)].signature); } @@ -4121,7 +4121,7 @@ yyreduce: case 196: /* Line 1455 of yacc.c */ -#line 1525 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1525 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec->genc) yyerror("Class definition not allowed in a C module"); @@ -4134,7 +4134,7 @@ yyreduce: case 197: /* Line 1455 of yacc.c */ -#line 1531 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1531 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4147,7 +4147,7 @@ yyreduce: case 198: /* Line 1455 of yacc.c */ -#line 1537 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1537 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) (yyval.klass) = completeClass((yyvsp[(2) - (8)].scpvalp), &(yyvsp[(5) - (8)].optflags), (yyvsp[(7) - (8)].boolean)); @@ -4157,7 +4157,7 @@ yyreduce: case 203: /* Line 1455 of yacc.c */ -#line 1551 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1551 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4200,7 +4200,7 @@ yyreduce: case 204: /* Line 1455 of yacc.c */ -#line 1590 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1590 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = FALSE; } @@ -4209,7 +4209,7 @@ yyreduce: case 205: /* Line 1455 of yacc.c */ -#line 1593 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1593 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.boolean) = TRUE; } @@ -4218,7 +4218,7 @@ yyreduce: case 216: /* Line 1455 of yacc.c */ -#line 1610 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1610 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4234,7 +4234,7 @@ yyreduce: case 217: /* Line 1455 of yacc.c */ -#line 1620 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1620 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tScope()->cppcode, (yyvsp[(1) - (1)].codeb)); @@ -4244,7 +4244,7 @@ yyreduce: case 218: /* Line 1455 of yacc.c */ -#line 1624 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1624 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) appendCodeBlock(¤tScope()->iff->hdrcode, (yyvsp[(1) - (1)].codeb)); @@ -4254,7 +4254,7 @@ yyreduce: case 219: /* Line 1455 of yacc.c */ -#line 1628 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1628 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4271,7 +4271,7 @@ yyreduce: case 220: /* Line 1455 of yacc.c */ -#line 1639 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1639 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4288,7 +4288,7 @@ yyreduce: case 221: /* Line 1455 of yacc.c */ -#line 1650 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1650 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4305,7 +4305,7 @@ yyreduce: case 222: /* Line 1455 of yacc.c */ -#line 1661 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1661 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4322,7 +4322,7 @@ yyreduce: case 223: /* Line 1455 of yacc.c */ -#line 1672 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1672 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4339,7 +4339,7 @@ yyreduce: case 224: /* Line 1455 of yacc.c */ -#line 1683 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1683 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4356,7 +4356,7 @@ yyreduce: case 225: /* Line 1455 of yacc.c */ -#line 1694 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1694 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4373,7 +4373,7 @@ yyreduce: case 226: /* Line 1455 of yacc.c */ -#line 1705 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1705 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4390,7 +4390,7 @@ yyreduce: case 227: /* Line 1455 of yacc.c */ -#line 1716 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1716 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4407,7 +4407,7 @@ yyreduce: case 231: /* Line 1455 of yacc.c */ -#line 1730 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1730 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4424,7 +4424,7 @@ yyreduce: case 232: /* Line 1455 of yacc.c */ -#line 1741 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1741 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4441,7 +4441,7 @@ yyreduce: case 233: /* Line 1455 of yacc.c */ -#line 1752 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1752 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc) yyerror("public section not allowed in a C module"); @@ -4454,7 +4454,7 @@ yyreduce: case 234: /* Line 1455 of yacc.c */ -#line 1759 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1759 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc) yyerror("protected section not allowed in a C module"); @@ -4467,7 +4467,7 @@ yyreduce: case 235: /* Line 1455 of yacc.c */ -#line 1766 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1766 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc) yyerror("private section not allowed in a C module"); @@ -4480,7 +4480,7 @@ yyreduce: case 236: /* Line 1455 of yacc.c */ -#line 1773 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1773 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc) yyerror("signals section not allowed in a C module"); @@ -4493,7 +4493,7 @@ yyreduce: case 237: /* Line 1455 of yacc.c */ -#line 1782 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1782 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = 0; } @@ -4502,7 +4502,7 @@ yyreduce: case 238: /* Line 1455 of yacc.c */ -#line 1785 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1785 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = SECT_IS_SLOT; } @@ -4511,7 +4511,7 @@ yyreduce: case 239: /* Line 1455 of yacc.c */ -#line 1790 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1790 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Note that we allow non-virtual dtors in C modules. */ @@ -4569,14 +4569,14 @@ yyreduce: case 240: /* Line 1455 of yacc.c */ -#line 1844 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1844 "/TEMP/sip4-tqt/sipgen/parser.y" {currentCtorIsExplicit = TRUE;} break; case 243: /* Line 1455 of yacc.c */ -#line 1848 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1848 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Note that we allow ctors in C modules. */ @@ -4607,7 +4607,7 @@ yyreduce: case 244: /* Line 1455 of yacc.c */ -#line 1875 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1875 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.optsignature) = NULL; } @@ -4616,7 +4616,7 @@ yyreduce: case 245: /* Line 1455 of yacc.c */ -#line 1878 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1878 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.optsignature) = sipMalloc(sizeof (signatureDef)); @@ -4627,7 +4627,7 @@ yyreduce: case 246: /* Line 1455 of yacc.c */ -#line 1885 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1885 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.optsignature) = NULL; } @@ -4636,7 +4636,7 @@ yyreduce: case 247: /* Line 1455 of yacc.c */ -#line 1888 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1888 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.optsignature) = sipMalloc(sizeof (signatureDef)); @@ -4648,7 +4648,7 @@ yyreduce: case 248: /* Line 1455 of yacc.c */ -#line 1896 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1896 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = FALSE; } @@ -4657,7 +4657,7 @@ yyreduce: case 249: /* Line 1455 of yacc.c */ -#line 1899 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1899 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = TRUE; } @@ -4666,7 +4666,7 @@ yyreduce: case 250: /* Line 1455 of yacc.c */ -#line 1904 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1904 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4690,7 +4690,7 @@ yyreduce: case 251: /* Line 1455 of yacc.c */ -#line 1922 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1922 "/TEMP/sip4-tqt/sipgen/parser.y" { /* * It looks like an assignment operator (though we don't bother to @@ -4716,7 +4716,7 @@ yyreduce: case 252: /* Line 1455 of yacc.c */ -#line 1942 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1942 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4751,7 +4751,7 @@ yyreduce: case 253: /* Line 1455 of yacc.c */ -#line 1971 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 1971 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -4833,210 +4833,210 @@ yyreduce: case 254: /* Line 1455 of yacc.c */ -#line 2049 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2049 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__add__";} break; case 255: /* Line 1455 of yacc.c */ -#line 2050 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2050 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__sub__";} break; case 256: /* Line 1455 of yacc.c */ -#line 2051 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2051 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__mul__";} break; case 257: /* Line 1455 of yacc.c */ -#line 2052 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2052 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__div__";} break; case 258: /* Line 1455 of yacc.c */ -#line 2053 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2053 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__mod__";} break; case 259: /* Line 1455 of yacc.c */ -#line 2054 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2054 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__and__";} break; case 260: /* Line 1455 of yacc.c */ -#line 2055 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2055 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__or__";} break; case 261: /* Line 1455 of yacc.c */ -#line 2056 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2056 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__xor__";} break; case 262: /* Line 1455 of yacc.c */ -#line 2057 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2057 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__lshift__";} break; case 263: /* Line 1455 of yacc.c */ -#line 2058 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2058 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__rshift__";} break; case 264: /* Line 1455 of yacc.c */ -#line 2059 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2059 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__iadd__";} break; case 265: /* Line 1455 of yacc.c */ -#line 2060 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2060 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__isub__";} break; case 266: /* Line 1455 of yacc.c */ -#line 2061 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2061 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__imul__";} break; case 267: /* Line 1455 of yacc.c */ -#line 2062 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2062 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__idiv__";} break; case 268: /* Line 1455 of yacc.c */ -#line 2063 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2063 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__imod__";} break; case 269: /* Line 1455 of yacc.c */ -#line 2064 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2064 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__iand__";} break; case 270: /* Line 1455 of yacc.c */ -#line 2065 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2065 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__ior__";} break; case 271: /* Line 1455 of yacc.c */ -#line 2066 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2066 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__ixor__";} break; case 272: /* Line 1455 of yacc.c */ -#line 2067 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2067 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__ilshift__";} break; case 273: /* Line 1455 of yacc.c */ -#line 2068 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2068 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__irshift__";} break; case 274: /* Line 1455 of yacc.c */ -#line 2069 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2069 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__invert__";} break; case 275: /* Line 1455 of yacc.c */ -#line 2070 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2070 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__call__";} break; case 276: /* Line 1455 of yacc.c */ -#line 2071 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2071 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__getitem__";} break; case 277: /* Line 1455 of yacc.c */ -#line 2072 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2072 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__lt__";} break; case 278: /* Line 1455 of yacc.c */ -#line 2073 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2073 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__le__";} break; case 279: /* Line 1455 of yacc.c */ -#line 2074 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2074 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__eq__";} break; case 280: /* Line 1455 of yacc.c */ -#line 2075 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2075 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__ne__";} break; case 281: /* Line 1455 of yacc.c */ -#line 2076 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2076 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__gt__";} break; case 282: /* Line 1455 of yacc.c */ -#line 2077 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2077 "/TEMP/sip4-tqt/sipgen/parser.y" {(yyval.text) = "__ge__";} break; case 283: /* Line 1455 of yacc.c */ -#line 2080 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2080 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = FALSE; } @@ -5045,7 +5045,7 @@ yyreduce: case 284: /* Line 1455 of yacc.c */ -#line 2083 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2083 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = TRUE; } @@ -5054,7 +5054,7 @@ yyreduce: case 285: /* Line 1455 of yacc.c */ -#line 2088 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2088 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = 0; } @@ -5063,7 +5063,7 @@ yyreduce: case 286: /* Line 1455 of yacc.c */ -#line 2091 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2091 "/TEMP/sip4-tqt/sipgen/parser.y" { if ((yyvsp[(2) - (2)].number) != 0) yyerror("Abstract virtual function '= 0' expected"); @@ -5075,7 +5075,7 @@ yyreduce: case 287: /* Line 1455 of yacc.c */ -#line 2099 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2099 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.optflags).nrFlags = 0; } @@ -5084,7 +5084,7 @@ yyreduce: case 288: /* Line 1455 of yacc.c */ -#line 2102 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2102 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.optflags) = (yyvsp[(2) - (3)].optflags); } @@ -5093,7 +5093,7 @@ yyreduce: case 289: /* Line 1455 of yacc.c */ -#line 2108 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2108 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.optflags).flags[0] = (yyvsp[(1) - (1)].flag); (yyval.optflags).nrFlags = 1; @@ -5103,7 +5103,7 @@ yyreduce: case 290: /* Line 1455 of yacc.c */ -#line 2112 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2112 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Check there is room. */ @@ -5119,7 +5119,7 @@ yyreduce: case 291: /* Line 1455 of yacc.c */ -#line 2124 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2124 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.flag).ftype = bool_flag; (yyval.flag).fname = (yyvsp[(1) - (1)].text); @@ -5129,7 +5129,7 @@ yyreduce: case 292: /* Line 1455 of yacc.c */ -#line 2128 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2128 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.flag) = (yyvsp[(3) - (3)].flag); (yyval.flag).fname = (yyvsp[(1) - (3)].text); @@ -5139,7 +5139,7 @@ yyreduce: case 293: /* Line 1455 of yacc.c */ -#line 2134 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2134 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.flag).ftype = (strchr((yyvsp[(1) - (1)].text), '.') != NULL) ? dotted_name_flag : name_flag; (yyval.flag).fvalue.sval = (yyvsp[(1) - (1)].text); @@ -5149,7 +5149,7 @@ yyreduce: case 294: /* Line 1455 of yacc.c */ -#line 2138 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2138 "/TEMP/sip4-tqt/sipgen/parser.y" { apiVersionRangeDef *avd; int from, to; @@ -5178,7 +5178,7 @@ yyreduce: case 295: /* Line 1455 of yacc.c */ -#line 2161 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2161 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.flag).ftype = string_flag; (yyval.flag).fvalue.sval = convertFeaturedString((yyvsp[(1) - (1)].text)); @@ -5188,7 +5188,7 @@ yyreduce: case 296: /* Line 1455 of yacc.c */ -#line 2165 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2165 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.flag).ftype = integer_flag; (yyval.flag).fvalue.ival = (yyvsp[(1) - (1)].number); @@ -5198,7 +5198,7 @@ yyreduce: case 297: /* Line 1455 of yacc.c */ -#line 2171 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2171 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -5207,7 +5207,7 @@ yyreduce: case 298: /* Line 1455 of yacc.c */ -#line 2176 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2176 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = NULL; } @@ -5216,7 +5216,7 @@ yyreduce: case 300: /* Line 1455 of yacc.c */ -#line 2182 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2182 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = NULL; } @@ -5225,7 +5225,7 @@ yyreduce: case 301: /* Line 1455 of yacc.c */ -#line 2185 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2185 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -5234,7 +5234,7 @@ yyreduce: case 302: /* Line 1455 of yacc.c */ -#line 2190 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2190 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = NULL; } @@ -5243,7 +5243,7 @@ yyreduce: case 303: /* Line 1455 of yacc.c */ -#line 2193 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2193 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.codeb) = (yyvsp[(2) - (2)].codeb); } @@ -5252,7 +5252,7 @@ yyreduce: case 304: /* Line 1455 of yacc.c */ -#line 2198 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2198 "/TEMP/sip4-tqt/sipgen/parser.y" { int a, nrrxcon, nrrxdis, nrslotcon, nrslotdis, nrarray, nrarraysize; @@ -5304,7 +5304,7 @@ yyreduce: case 305: /* Line 1455 of yacc.c */ -#line 2246 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2246 "/TEMP/sip4-tqt/sipgen/parser.y" { /* No arguments. */ @@ -5315,7 +5315,7 @@ yyreduce: case 306: /* Line 1455 of yacc.c */ -#line 2251 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2251 "/TEMP/sip4-tqt/sipgen/parser.y" { /* The single or first argument. */ @@ -5327,7 +5327,7 @@ yyreduce: case 307: /* Line 1455 of yacc.c */ -#line 2257 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2257 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Check that it wasn't ...(,arg...). */ if ((yyvsp[(1) - (3)].signature).nrArgs == 0) @@ -5358,7 +5358,7 @@ yyreduce: case 308: /* Line 1455 of yacc.c */ -#line 2284 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2284 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = signal_type; (yyval.memArg).argflags = ARG_IS_CONST; @@ -5373,7 +5373,7 @@ yyreduce: case 309: /* Line 1455 of yacc.c */ -#line 2293 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2293 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = slot_type; (yyval.memArg).argflags = ARG_IS_CONST; @@ -5388,7 +5388,7 @@ yyreduce: case 310: /* Line 1455 of yacc.c */ -#line 2302 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2302 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = anyslot_type; (yyval.memArg).argflags = ARG_IS_CONST; @@ -5403,7 +5403,7 @@ yyreduce: case 311: /* Line 1455 of yacc.c */ -#line 2311 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2311 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = rxcon_type; (yyval.memArg).argflags = 0; @@ -5420,7 +5420,7 @@ yyreduce: case 312: /* Line 1455 of yacc.c */ -#line 2322 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2322 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = rxdis_type; (yyval.memArg).argflags = 0; @@ -5434,7 +5434,7 @@ yyreduce: case 313: /* Line 1455 of yacc.c */ -#line 2330 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2330 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = slotcon_type; (yyval.memArg).argflags = ARG_IS_CONST; @@ -5454,7 +5454,7 @@ yyreduce: case 314: /* Line 1455 of yacc.c */ -#line 2344 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2344 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = slotdis_type; (yyval.memArg).argflags = ARG_IS_CONST; @@ -5474,7 +5474,7 @@ yyreduce: case 315: /* Line 1455 of yacc.c */ -#line 2358 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2358 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg).atype = qobject_type; (yyval.memArg).argflags = 0; @@ -5486,7 +5486,7 @@ yyreduce: case 316: /* Line 1455 of yacc.c */ -#line 2364 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2364 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg) = (yyvsp[(1) - (2)].memArg); (yyval.memArg).defval = (yyvsp[(2) - (2)].valp); @@ -5496,35 +5496,35 @@ yyreduce: case 317: /* Line 1455 of yacc.c */ -#line 2371 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2371 "/TEMP/sip4-tqt/sipgen/parser.y" {currentIsSignal = TRUE;} break; case 319: /* Line 1455 of yacc.c */ -#line 2372 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2372 "/TEMP/sip4-tqt/sipgen/parser.y" {currentIsSlot = TRUE;} break; case 322: /* Line 1455 of yacc.c */ -#line 2377 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2377 "/TEMP/sip4-tqt/sipgen/parser.y" {currentIsStatic = TRUE;} break; case 327: /* Line 1455 of yacc.c */ -#line 2387 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2387 "/TEMP/sip4-tqt/sipgen/parser.y" {currentOverIsVirt = TRUE;} break; case 330: /* Line 1455 of yacc.c */ -#line 2391 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2391 "/TEMP/sip4-tqt/sipgen/parser.y" { if (notSkipping()) { @@ -5563,7 +5563,7 @@ yyreduce: case 331: /* Line 1455 of yacc.c */ -#line 2426 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2426 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg) = (yyvsp[(2) - (4)].memArg); (yyval.memArg).nrderefs += (yyvsp[(3) - (4)].number); @@ -5574,7 +5574,7 @@ yyreduce: case 332: /* Line 1455 of yacc.c */ -#line 2431 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2431 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg) = (yyvsp[(1) - (3)].memArg); (yyval.memArg).nrderefs += (yyvsp[(2) - (3)].number); @@ -5585,7 +5585,7 @@ yyreduce: case 333: /* Line 1455 of yacc.c */ -#line 2438 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2438 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.memArg) = (yyvsp[(1) - (3)].memArg); (yyval.memArg).name = cacheName(currentSpec, (yyvsp[(2) - (3)].text)); @@ -5661,7 +5661,7 @@ yyreduce: case 334: /* Line 1455 of yacc.c */ -#line 2510 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2510 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = 0; } @@ -5670,7 +5670,7 @@ yyreduce: case 335: /* Line 1455 of yacc.c */ -#line 2513 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2513 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec -> genc) yyerror("References not allowed in a C module"); @@ -5682,7 +5682,7 @@ yyreduce: case 336: /* Line 1455 of yacc.c */ -#line 2521 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2521 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = 0; } @@ -5691,7 +5691,7 @@ yyreduce: case 337: /* Line 1455 of yacc.c */ -#line 2524 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2524 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + 1; } @@ -5700,7 +5700,7 @@ yyreduce: case 338: /* Line 1455 of yacc.c */ -#line 2529 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2529 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = defined_type; @@ -5714,7 +5714,7 @@ yyreduce: case 339: /* Line 1455 of yacc.c */ -#line 2537 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2537 "/TEMP/sip4-tqt/sipgen/parser.y" { templateDef *td; @@ -5731,7 +5731,7 @@ yyreduce: case 340: /* Line 1455 of yacc.c */ -#line 2548 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2548 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); @@ -5752,7 +5752,7 @@ yyreduce: case 341: /* Line 1455 of yacc.c */ -#line 2563 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2563 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = ushort_type; @@ -5762,7 +5762,7 @@ yyreduce: case 342: /* Line 1455 of yacc.c */ -#line 2567 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2567 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = short_type; @@ -5772,7 +5772,7 @@ yyreduce: case 343: /* Line 1455 of yacc.c */ -#line 2571 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2571 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = uint_type; @@ -5782,7 +5782,7 @@ yyreduce: case 344: /* Line 1455 of yacc.c */ -#line 2575 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2575 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = uint_type; @@ -5792,7 +5792,7 @@ yyreduce: case 345: /* Line 1455 of yacc.c */ -#line 2579 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2579 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = int_type; @@ -5802,7 +5802,7 @@ yyreduce: case 346: /* Line 1455 of yacc.c */ -#line 2583 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2583 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = long_type; @@ -5812,7 +5812,7 @@ yyreduce: case 347: /* Line 1455 of yacc.c */ -#line 2587 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2587 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = ulong_type; @@ -5822,7 +5822,7 @@ yyreduce: case 348: /* Line 1455 of yacc.c */ -#line 2591 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2591 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = longlong_type; @@ -5832,7 +5832,7 @@ yyreduce: case 349: /* Line 1455 of yacc.c */ -#line 2595 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2595 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = ulonglong_type; @@ -5842,7 +5842,7 @@ yyreduce: case 350: /* Line 1455 of yacc.c */ -#line 2599 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2599 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = float_type; @@ -5852,7 +5852,7 @@ yyreduce: case 351: /* Line 1455 of yacc.c */ -#line 2603 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2603 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = double_type; @@ -5862,7 +5862,7 @@ yyreduce: case 352: /* Line 1455 of yacc.c */ -#line 2607 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2607 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = bool_type; @@ -5872,7 +5872,7 @@ yyreduce: case 353: /* Line 1455 of yacc.c */ -#line 2611 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2611 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = sstring_type; @@ -5882,7 +5882,7 @@ yyreduce: case 354: /* Line 1455 of yacc.c */ -#line 2615 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2615 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = ustring_type; @@ -5892,7 +5892,7 @@ yyreduce: case 355: /* Line 1455 of yacc.c */ -#line 2619 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2619 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = string_type; @@ -5902,7 +5902,7 @@ yyreduce: case 356: /* Line 1455 of yacc.c */ -#line 2623 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2623 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = wstring_type; @@ -5912,7 +5912,7 @@ yyreduce: case 357: /* Line 1455 of yacc.c */ -#line 2627 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2627 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = void_type; @@ -5922,7 +5922,7 @@ yyreduce: case 358: /* Line 1455 of yacc.c */ -#line 2631 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2631 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = pyobject_type; @@ -5932,7 +5932,7 @@ yyreduce: case 359: /* Line 1455 of yacc.c */ -#line 2635 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2635 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = pytuple_type; @@ -5942,7 +5942,7 @@ yyreduce: case 360: /* Line 1455 of yacc.c */ -#line 2639 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2639 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = pylist_type; @@ -5952,7 +5952,7 @@ yyreduce: case 361: /* Line 1455 of yacc.c */ -#line 2643 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2643 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = pydict_type; @@ -5962,7 +5962,7 @@ yyreduce: case 362: /* Line 1455 of yacc.c */ -#line 2647 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2647 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = pycallable_type; @@ -5972,7 +5972,7 @@ yyreduce: case 363: /* Line 1455 of yacc.c */ -#line 2651 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2651 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = pyslice_type; @@ -5982,7 +5982,7 @@ yyreduce: case 364: /* Line 1455 of yacc.c */ -#line 2655 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2655 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = pytype_type; @@ -5992,7 +5992,7 @@ yyreduce: case 365: /* Line 1455 of yacc.c */ -#line 2659 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2659 "/TEMP/sip4-tqt/sipgen/parser.y" { memset(&(yyval.memArg), 0, sizeof (argDef)); (yyval.memArg).atype = ellipsis_type; @@ -6002,7 +6002,7 @@ yyreduce: case 366: /* Line 1455 of yacc.c */ -#line 2665 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2665 "/TEMP/sip4-tqt/sipgen/parser.y" { /* The single or first type. */ @@ -6014,7 +6014,7 @@ yyreduce: case 367: /* Line 1455 of yacc.c */ -#line 2671 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2671 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Check there is nothing after an ellipsis. */ if ((yyvsp[(1) - (3)].signature).args[(yyvsp[(1) - (3)].signature).nrArgs - 1].atype == ellipsis_type) @@ -6034,7 +6034,7 @@ yyreduce: case 368: /* Line 1455 of yacc.c */ -#line 2687 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2687 "/TEMP/sip4-tqt/sipgen/parser.y" { (yyval.throwlist) = NULL; } @@ -6043,7 +6043,7 @@ yyreduce: case 369: /* Line 1455 of yacc.c */ -#line 2690 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2690 "/TEMP/sip4-tqt/sipgen/parser.y" { if (currentSpec->genc) yyerror("Exceptions not allowed in a C module"); @@ -6055,7 +6055,7 @@ yyreduce: case 370: /* Line 1455 of yacc.c */ -#line 2698 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2698 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Empty list so use a blank. */ @@ -6067,7 +6067,7 @@ yyreduce: case 371: /* Line 1455 of yacc.c */ -#line 2704 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2704 "/TEMP/sip4-tqt/sipgen/parser.y" { /* The only or first exception. */ @@ -6080,7 +6080,7 @@ yyreduce: case 372: /* Line 1455 of yacc.c */ -#line 2711 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2711 "/TEMP/sip4-tqt/sipgen/parser.y" { /* Check that it wasn't ...(,arg...). */ @@ -6100,7 +6100,7 @@ yyreduce: /* Line 1455 of yacc.c */ -#line 6104 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.c" +#line 6104 "y.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -6312,7 +6312,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 2727 "/home/phil/hg/sip/sip-4.10.5/sipgen/parser.y" +#line 2727 "/TEMP/sip4-tqt/sipgen/parser.y" @@ -6851,10 +6851,10 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, if ((flg = findOptFlag(of, "Supertype", dotted_name_flag)) != NULL) cd->supertype = cacheName(pt, flg->fvalue.sval); - if ((flg = findOptFlag(of, "PyTQt4Flags", integer_flag)) != NULL) + if ((flg = findOptFlag(of, "PyQt4Flags", integer_flag)) != NULL) cd->pyqt4_flags = flg->fvalue.ival; - if (findOptFlag(of, "PyTQt4NoTQMetaObject", bool_flag) != NULL) + if (findOptFlag(of, "PyQt4NoQMetaObject", bool_flag) != NULL) setPyTQt4NoTQMetaObject(cd); if (isOpaque(cd)) @@ -8821,7 +8821,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}, @@ -9649,20 +9649,20 @@ static const char *getDocValue(optFlags *optflgs) /* - * Return TRUE if the PyTQt3 plugin was specified. + * Return TRUE if the PyQt3 plugin was specified. */ int pluginPyTQt3(sipSpec *pt) { - return stringFind(pt->plugins, "PyTQt3"); + return stringFind(pt->plugins, "PyQt3"); } /* - * Return TRUE if the PyTQt4 plugin was specified. + * Return TRUE if the PyQt4 plugin was specified. */ int pluginPyTQt4(sipSpec *pt) { - return stringFind(pt->plugins, "PyTQt4"); + return stringFind(pt->plugins, "PyQt4"); } diff --git a/sipgen/parser.h b/sipgen/parser.h index 2f87559..c8a3608 100644 --- a/sipgen/parser.h +++ b/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 diff --git a/sipgen/parser.y b/sipgen/parser.y index 08521e8..2991f82 100644 --- a/sipgen/parser.y +++ b/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"); } diff --git a/sipgen/sip.h b/sipgen/sip.h index 10076a6..ab2d17d 100644 --- a/sipgen/sip.h +++ b/sipgen/sip.h @@ -23,6 +23,7 @@ #include <stdio.h> #include <sys/types.h> +#include <tqt.h> #ifdef TRUE #undef TRUE |