Commit 7da8adeb authored by David Gobbi's avatar David Gobbi Committed by Marcus D. Hanwell
Browse files

ENH: in the wrappers, make vtkNotUsed return the ID that it is hiding

Rationale: vtkNotUsed is only meant to hide parameters from the
compiler, in order to avoid warnings.  However, it's useful to
pass those parameters to the wrappers so that they will be included
in the signature.
parent 25e4d2ad
...@@ -1929,466 +1929,483 @@ case 14: ...@@ -1929,466 +1929,483 @@ case 14:
/* rule 14 can match eol */ /* rule 14 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 170 "vtkParse.l" #line 170 "vtkParse.l"
; {
int i; int j = 0;
while (yytext[j]!='(') { j++; }
j++; i = j;
while (yytext[j]!=')') { j++; }
yylval.str = (char *)malloc(j-i+1);
if (j > i) { strncpy(yylval.str, &yytext[i], j-i); }
yylval.str[j-i] = '\0';
return(ID);
};
YY_BREAK YY_BREAK
case 15: case 15:
/* rule 15 can match eol */ /* rule 15 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 172 "vtkParse.l" #line 181 "vtkParse.l"
{ {
sscanf(yytext+1,"%d",&yylval.integer); return(ARRAY_NUM);} sscanf(yytext+1,"%d",&yylval.integer);
return(ARRAY_NUM);
};
YY_BREAK YY_BREAK
case 16: case 16:
/* rule 16 can match eol */ /* rule 16 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 175 "vtkParse.l" #line 186 "vtkParse.l"
return(CLASS_REF); {
return(CLASS_REF);
};
YY_BREAK YY_BREAK
case 17: case 17:
/* rule 17 can match eol */ /* rule 17 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 176 "vtkParse.l" #line 190 "vtkParse.l"
return(CLASS_REF); {
return(CLASS_REF);
};
YY_BREAK YY_BREAK
case 18: case 18:
/* rule 18 can match eol */ /* rule 18 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 178 "vtkParse.l" #line 194 "vtkParse.l"
return(VAR_FUNCTION); {
return(VAR_FUNCTION);
};
YY_BREAK YY_BREAK
case 19: case 19:
/* rule 19 can match eol */ /* rule 19 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 180 "vtkParse.l" #line 198 "vtkParse.l"
return(SHORT); return(SHORT);
YY_BREAK YY_BREAK
case 20: case 20:
/* rule 20 can match eol */ /* rule 20 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 181 "vtkParse.l" #line 199 "vtkParse.l"
return(LONG); return(LONG);
YY_BREAK YY_BREAK
case 21: case 21:
/* rule 21 can match eol */ /* rule 21 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 182 "vtkParse.l" #line 200 "vtkParse.l"
return(SHORT); return(SHORT);
YY_BREAK YY_BREAK
case 22: case 22:
/* rule 22 can match eol */ /* rule 22 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 183 "vtkParse.l" #line 201 "vtkParse.l"
return(LONG); return(LONG);
YY_BREAK YY_BREAK
case 23: case 23:
/* rule 23 can match eol */ /* rule 23 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 185 "vtkParse.l" #line 203 "vtkParse.l"
return(LONG_LONG); return(LONG_LONG);
YY_BREAK YY_BREAK
case 24: case 24:
/* rule 24 can match eol */ /* rule 24 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 186 "vtkParse.l" #line 204 "vtkParse.l"
return(LONG_LONG); return(LONG_LONG);
YY_BREAK YY_BREAK
case 25: case 25:
/* rule 25 can match eol */ /* rule 25 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 187 "vtkParse.l" #line 205 "vtkParse.l"
return(LONG_LONG); return(LONG_LONG);
YY_BREAK YY_BREAK
case 26: case 26:
YY_RULE_SETUP YY_RULE_SETUP
#line 189 "vtkParse.l" #line 207 "vtkParse.l"
return(INT64__); return(INT64__);
YY_BREAK YY_BREAK
case 27: case 27:
/* rule 27 can match eol */ /* rule 27 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 191 "vtkParse.l" #line 209 "vtkParse.l"
return(SIGNED_CHAR); return(SIGNED_CHAR);
YY_BREAK YY_BREAK
case 28: case 28:
YY_RULE_SETUP YY_RULE_SETUP
#line 193 "vtkParse.l" #line 211 "vtkParse.l"
return(OSTREAM); return(OSTREAM);
YY_BREAK YY_BREAK
case 29: case 29:
YY_RULE_SETUP YY_RULE_SETUP
#line 194 "vtkParse.l" #line 212 "vtkParse.l"
return(ISTREAM); return(ISTREAM);
YY_BREAK YY_BREAK
case 30: case 30:
YY_RULE_SETUP YY_RULE_SETUP
#line 196 "vtkParse.l" #line 214 "vtkParse.l"
return(CLASS); return(CLASS);
YY_BREAK YY_BREAK
case 31: case 31:
YY_RULE_SETUP YY_RULE_SETUP
#line 197 "vtkParse.l" #line 215 "vtkParse.l"
return(CLASS); return(CLASS);
YY_BREAK YY_BREAK
case 32: case 32:
YY_RULE_SETUP YY_RULE_SETUP
#line 198 "vtkParse.l" #line 216 "vtkParse.l"
return(PUBLIC); return(PUBLIC);
YY_BREAK YY_BREAK
case 33: case 33:
YY_RULE_SETUP YY_RULE_SETUP
#line 199 "vtkParse.l" #line 217 "vtkParse.l"
return(PRIVATE); return(PRIVATE);
YY_BREAK YY_BREAK
case 34: case 34:
YY_RULE_SETUP YY_RULE_SETUP
#line 200 "vtkParse.l" #line 218 "vtkParse.l"
return(PROTECTED); return(PROTECTED);
YY_BREAK YY_BREAK
case 35: case 35:
YY_RULE_SETUP YY_RULE_SETUP
#line 201 "vtkParse.l" #line 219 "vtkParse.l"
return(INT); return(INT);
YY_BREAK YY_BREAK
case 36: case 36:
YY_RULE_SETUP YY_RULE_SETUP
#line 202 "vtkParse.l" #line 220 "vtkParse.l"
return(FLOAT); return(FLOAT);
YY_BREAK YY_BREAK
case 37: case 37:
YY_RULE_SETUP YY_RULE_SETUP
#line 203 "vtkParse.l" #line 221 "vtkParse.l"
return(SHORT); return(SHORT);
YY_BREAK YY_BREAK
case 38: case 38:
YY_RULE_SETUP YY_RULE_SETUP
#line 204 "vtkParse.l" #line 222 "vtkParse.l"
return(LONG); return(LONG);
YY_BREAK YY_BREAK
case 39: case 39:
YY_RULE_SETUP YY_RULE_SETUP
#line 205 "vtkParse.l" #line 223 "vtkParse.l"
return(DOUBLE); return(DOUBLE);
YY_BREAK YY_BREAK
case 40: case 40:
YY_RULE_SETUP YY_RULE_SETUP
#line 206 "vtkParse.l" #line 224 "vtkParse.l"
return(VOID); return(VOID);
YY_BREAK YY_BREAK
case 41: case 41:
YY_RULE_SETUP YY_RULE_SETUP
#line 207 "vtkParse.l" #line 225 "vtkParse.l"
return(CHAR); return(CHAR);
YY_BREAK YY_BREAK
case 42: case 42:
YY_RULE_SETUP YY_RULE_SETUP
#line 208 "vtkParse.l" #line 226 "vtkParse.l"
return(BOOL); return(BOOL);
YY_BREAK YY_BREAK
case 43: case 43:
YY_RULE_SETUP YY_RULE_SETUP
#line 209 "vtkParse.l" #line 227 "vtkParse.l"
return(ENUM); return(ENUM);
YY_BREAK YY_BREAK
case 44: case 44:
YY_RULE_SETUP YY_RULE_SETUP
#line 210 "vtkParse.l" #line 228 "vtkParse.l"
return(UNION); return(UNION);
YY_BREAK YY_BREAK
case 45: case 45:
YY_RULE_SETUP YY_RULE_SETUP
#line 211 "vtkParse.l" #line 229 "vtkParse.l"
return(VIRTUAL); return(VIRTUAL);
YY_BREAK YY_BREAK
case 46: case 46:
YY_RULE_SETUP YY_RULE_SETUP
#line 212 "vtkParse.l" #line 230 "vtkParse.l"
return(CONST); return(CONST);
YY_BREAK YY_BREAK
case 47: case 47:
YY_RULE_SETUP YY_RULE_SETUP
#line 213 "vtkParse.l" #line 231 "vtkParse.l"
return(MUTABLE); return(MUTABLE);
YY_BREAK YY_BREAK
case 48: case 48:
YY_RULE_SETUP YY_RULE_SETUP
#line 214 "vtkParse.l" #line 232 "vtkParse.l"
return(OPERATOR); return(OPERATOR);
YY_BREAK YY_BREAK
case 49: case 49:
YY_RULE_SETUP YY_RULE_SETUP
#line 215 "vtkParse.l" #line 233 "vtkParse.l"
return(UNSIGNED); return(UNSIGNED);
YY_BREAK YY_BREAK
case 50: case 50:
YY_RULE_SETUP YY_RULE_SETUP
#line 216 "vtkParse.l" #line 234 "vtkParse.l"
return(FRIEND); return(FRIEND);
YY_BREAK YY_BREAK
case 51: case 51:
YY_RULE_SETUP YY_RULE_SETUP
#line 217 "vtkParse.l" #line 235 "vtkParse.l"
return(INLINE); return(INLINE);
YY_BREAK YY_BREAK
case 52: case 52:
YY_RULE_SETUP YY_RULE_SETUP
#line 218 "vtkParse.l" #line 236 "vtkParse.l"
return(STATIC); return(STATIC);
YY_BREAK YY_BREAK
case 53: case 53:
YY_RULE_SETUP YY_RULE_SETUP
#line 219 "vtkParse.l" #line 237 "vtkParse.l"
return(TEMPLATE); return(TEMPLATE);
YY_BREAK YY_BREAK
case 54: case 54:
YY_RULE_SETUP YY_RULE_SETUP
#line 220 "vtkParse.l" #line 238 "vtkParse.l"
return(TYPENAME); return(TYPENAME);
YY_BREAK YY_BREAK
case 55: case 55:
YY_RULE_SETUP YY_RULE_SETUP
#line 221 "vtkParse.l" #line 239 "vtkParse.l"
return(TYPEDEF); return(TYPEDEF);
YY_BREAK YY_BREAK
case 56: case 56:
YY_RULE_SETUP YY_RULE_SETUP
#line 222 "vtkParse.l" #line 240 "vtkParse.l"
return(NAMESPACE); return(NAMESPACE);
YY_BREAK YY_BREAK
case 57: case 57:
YY_RULE_SETUP YY_RULE_SETUP
#line 223 "vtkParse.l" #line 241 "vtkParse.l"
return(USING); return(USING);
YY_BREAK YY_BREAK
case 58: case 58:
YY_RULE_SETUP YY_RULE_SETUP
#line 224 "vtkParse.l" #line 242 "vtkParse.l"
return(NEW); return(NEW);
YY_BREAK YY_BREAK
case 59: case 59:
YY_RULE_SETUP YY_RULE_SETUP
#line 225 "vtkParse.l" #line 243 "vtkParse.l"
return(DELETE); return(DELETE);
YY_BREAK YY_BREAK
case 60: case 60:
YY_RULE_SETUP YY_RULE_SETUP
#line 227 "vtkParse.l" #line 245 "vtkParse.l"
return(DOUBLE); return(DOUBLE);
YY_BREAK YY_BREAK
case 61: case 61:
YY_RULE_SETUP YY_RULE_SETUP
#line 228 "vtkParse.l" #line 246 "vtkParse.l"
return(IdType); return(IdType);
YY_BREAK YY_BREAK
case 62: case 62:
YY_RULE_SETUP YY_RULE_SETUP
#line 229 "vtkParse.l" #line 247 "vtkParse.l"
return(StdString); return(StdString);
YY_BREAK YY_BREAK
case 63: case 63:
YY_RULE_SETUP YY_RULE_SETUP
#line 230 "vtkParse.l" #line 248 "vtkParse.l"
return(UnicodeString); return(UnicodeString);
YY_BREAK YY_BREAK
case 64: case 64:
YY_RULE_SETUP YY_RULE_SETUP
#line 231 "vtkParse.l" #line 249 "vtkParse.l"
return(SetMacro); return(SetMacro);
YY_BREAK YY_BREAK
case 65: case 65:
YY_RULE_SETUP YY_RULE_SETUP
#line 232 "vtkParse.l" #line 250 "vtkParse.l"
return(GetMacro); return(GetMacro);
YY_BREAK YY_BREAK
case 66: case 66:
YY_RULE_SETUP YY_RULE_SETUP
#line 233 "vtkParse.l" #line 251 "vtkParse.l"
return(SetStringMacro); return(SetStringMacro);
YY_BREAK YY_BREAK
case 67: case 67:
YY_RULE_SETUP YY_RULE_SETUP
#line 234 "vtkParse.l" #line 252 "vtkParse.l"
return(GetStringMacro); return(GetStringMacro);
YY_BREAK YY_BREAK
case 68: case 68:
YY_RULE_SETUP YY_RULE_SETUP
#line 235 "vtkParse.l" #line 253 "vtkParse.l"
return(SetClampMacro); return(SetClampMacro);
YY_BREAK YY_BREAK
case 69: case 69:
YY_RULE_SETUP YY_RULE_SETUP
#line 236 "vtkParse.l" #line 254 "vtkParse.l"
return(SetObjectMacro); return(SetObjectMacro);
YY_BREAK YY_BREAK
case 70: case 70:
YY_RULE_SETUP YY_RULE_SETUP
#line 237 "vtkParse.l" #line 255 "vtkParse.l"
return(GetObjectMacro); return(GetObjectMacro);
YY_BREAK YY_BREAK
case 71: case 71:
YY_RULE_SETUP YY_RULE_SETUP
#line 238 "vtkParse.l" #line 256 "vtkParse.l"
return(BooleanMacro); return(BooleanMacro);
YY_BREAK YY_BREAK
case 72: case 72:
YY_RULE_SETUP YY_RULE_SETUP
#line 239 "vtkParse.l" #line 257 "vtkParse.l"
return(SetVector2Macro); return(SetVector2Macro);
YY_BREAK YY_BREAK
case 73: case 73:
YY_RULE_SETUP YY_RULE_SETUP
#line 240 "vtkParse.l" #line 258 "vtkParse.l"
return(SetVector3Macro); return(SetVector3Macro);
YY_BREAK YY_BREAK
case 74: case 74:
YY_RULE_SETUP YY_RULE_SETUP
#line 241 "vtkParse.l" #line 259 "vtkParse.l"
return(SetVector4Macro); return(SetVector4Macro);
YY_BREAK YY_BREAK
case 75: case 75:
YY_RULE_SETUP YY_RULE_SETUP
#line 242 "vtkParse.l" #line 260 "vtkParse.l"
return(SetVector6Macro); return(SetVector6Macro);
YY_BREAK YY_BREAK
case 76: case 76:
YY_RULE_SETUP YY_RULE_SETUP
#line 243 "vtkParse.l" #line 261 "vtkParse.l"
return(GetVector2Macro); return(GetVector2Macro);
YY_BREAK YY_BREAK
case 77: case 77:
YY_RULE_SETUP YY_RULE_SETUP
#line 244 "vtkParse.l" #line 262 "vtkParse.l"
return(GetVector3Macro); return(GetVector3Macro);
YY_BREAK YY_BREAK
case 78: case 78:
YY_RULE_SETUP YY_RULE_SETUP
#line 245 "vtkParse.l" #line 263 "vtkParse.l"
return(GetVector4Macro); return(GetVector4Macro);
YY_BREAK YY_BREAK
case 79: case 79:
YY_RULE_SETUP YY_RULE_SETUP
#line 246 "vtkParse.l" #line 264 "vtkParse.l"
return(GetVector6Macro); return(GetVector6Macro);
YY_BREAK YY_BREAK
case 80: case 80:
YY_RULE_SETUP YY_RULE_SETUP
#line 247 "vtkParse.l" #line 265 "vtkParse.l"
return(SetVectorMacro); return(SetVectorMacro);
YY_BREAK YY_BREAK