Commit 23377c88 authored by David Gobbi's avatar David Gobbi
Browse files

Revert "COMP: rename VTK_PARSE_POINTER to VTK_PARSE_PTR to match VTK_PARSE_REF"

This reverts commit fcec6a85.
parent fcec6a85
......@@ -2383,14 +2383,14 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 450 "vtkParse.y"
{ (yyval.integer) = VTK_PARSE_PTR + (VTK_PARSE_COUNT_START * (yyvsp[(1) - (3)].integer)) + ((yyvsp[(3) - (3)].integer) & VTK_PARSE_UNQUALIFIED_TYPE); }
{ (yyval.integer) = VTK_PARSE_POINTER + (VTK_PARSE_COUNT_START * (yyvsp[(1) - (3)].integer)) + ((yyvsp[(3) - (3)].integer) & VTK_PARSE_UNQUALIFIED_TYPE); }
break;
case 67:
/* Line 1455 of yacc.c */
#line 452 "vtkParse.y"
{ postSig("[]"); (yyval.integer) = VTK_PARSE_PTR + ((yyvsp[(4) - (4)].integer) & VTK_PARSE_UNQUALIFIED_TYPE); }
{ postSig("[]"); (yyval.integer) = VTK_PARSE_POINTER + ((yyvsp[(4) - (4)].integer) & VTK_PARSE_UNQUALIFIED_TYPE); }
break;
case 68:
......@@ -2460,7 +2460,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 466 "vtkParse.y"
{ postSig("*"); (yyval.integer) = (VTK_PARSE_REF + VTK_PARSE_PTR) + (yyvsp[(1) - (2)].integer);}
{ postSig("*"); (yyval.integer) = (VTK_PARSE_REF + VTK_PARSE_POINTER) + (yyvsp[(1) - (2)].integer);}
break;
case 78:
......@@ -2481,7 +2481,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 479 "vtkParse.y"
{ postSig("*"); (yyval.integer) = VTK_PARSE_PTR;}
{ postSig("*"); (yyval.integer) = VTK_PARSE_POINTER;}
break;
case 81:
......@@ -2495,7 +2495,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 481 "vtkParse.y"
{ (yyval.integer) = (VTK_PARSE_REF + VTK_PARSE_PTR) + (yyvsp[(2) - (2)].integer);}
{ (yyval.integer) = (VTK_PARSE_REF + VTK_PARSE_POINTER) + (yyvsp[(2) - (2)].integer);}
break;
case 83:
......@@ -3048,7 +3048,7 @@ yyreduce:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->ArgCounts[0] = 2;
output_function();
}
......@@ -3074,7 +3074,7 @@ yyreduce:
sprintf(temps,"Get%s",(yyvsp[(3) - (7)].str));
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ReturnType = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->HaveHint = 1;
currentFunction->HintSize = 2;
output_function();
......@@ -3117,7 +3117,7 @@ yyreduce:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->ArgCounts[0] = 3;
output_function();
}
......@@ -3143,7 +3143,7 @@ yyreduce:
sprintf(temps,"Get%s",(yyvsp[(3) - (7)].str));
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ReturnType = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->HaveHint = 1;
currentFunction->HintSize = 3;
output_function();
......@@ -3188,7 +3188,7 @@ yyreduce:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->ArgCounts[0] = 4;
output_function();
}
......@@ -3214,7 +3214,7 @@ yyreduce:
sprintf(temps,"Get%s",(yyvsp[(3) - (7)].str));
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ReturnType = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->HaveHint = 1;
currentFunction->HintSize = 4;
output_function();
......@@ -3263,7 +3263,7 @@ yyreduce:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->ArgCounts[0] = 6;
output_function();
}
......@@ -3289,7 +3289,7 @@ yyreduce:
sprintf(temps,"Get%s",(yyvsp[(3) - (7)].str));
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + (yyvsp[(6) - (7)].integer);
currentFunction->ReturnType = VTK_PARSE_POINTER + (yyvsp[(6) - (7)].integer);
currentFunction->HaveHint = 1;
currentFunction->HintSize = 6;
output_function();
......@@ -3318,7 +3318,7 @@ yyreduce:
currentFunction->Name = vtkstrdup(temps);
currentFunction->ReturnType = VTK_PARSE_VOID;
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + (yyvsp[(6) - (9)].integer);
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + (yyvsp[(6) - (9)].integer);
currentFunction->ArgCounts[0] = (yyvsp[(8) - (9)].integer);
output_function();
}
......@@ -3344,7 +3344,7 @@ yyreduce:
sprintf(temps,"Get%s",(yyvsp[(3) - (9)].str));
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + (yyvsp[(6) - (9)].integer);
currentFunction->ReturnType = VTK_PARSE_POINTER + (yyvsp[(6) - (9)].integer);
currentFunction->HaveHint = 1;
currentFunction->HintSize = (yyvsp[(8) - (9)].integer);
output_function();
......@@ -3912,8 +3912,8 @@ void output_function()
/* reject multi-dimensional arrays from wrappers */
for (i = 0; i < currentFunction->NumberOfArguments; i++)
{
if ((currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 2*VTK_PARSE_PTR ||
(currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 3*VTK_PARSE_PTR)
if ((currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 2*VTK_PARSE_POINTER ||
(currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 3*VTK_PARSE_POINTER)
{
currentFunction->ArrayFailure = 1;
}
......
......@@ -439,17 +439,17 @@ var: type var_id ';' {delSig();} | VAR_FUNCTION ';' {delSig();};
var_id: any_id var_array { $<integer>$ = $<integer>2; };
/*
[n] = VTK_PARSE_PTR
[n][m] = 2*VTK_PARSE_PTR
[n][m][l] = 3*VTK_PARSE_PTR
[n] = VTK_PARSE_POINTER
[n][m] = 2*VTK_PARSE_POINTER
[n][m][l] = 3*VTK_PARSE_POINTER
*/
var_array: { $<integer>$ = 0; }
| ARRAY_NUM { char temp[100]; sprintf(temp,"[%i]",$<integer>1);
postSig(temp); }
var_array { $<integer>$ = VTK_PARSE_PTR + (VTK_PARSE_COUNT_START * $<integer>1) + ($<integer>3 & VTK_PARSE_UNQUALIFIED_TYPE); }
var_array { $<integer>$ = VTK_PARSE_POINTER + (VTK_PARSE_COUNT_START * $<integer>1) + ($<integer>3 & VTK_PARSE_UNQUALIFIED_TYPE); }
| '[' maybe_other_no_semi ']' var_array
{ postSig("[]"); $<integer>$ = VTK_PARSE_PTR + ($<integer>4 & VTK_PARSE_UNQUALIFIED_TYPE); };
{ postSig("[]"); $<integer>$ = VTK_PARSE_POINTER + ($<integer>4 & VTK_PARSE_UNQUALIFIED_TYPE); };
type: const_mod type_red1 {$<integer>$ = VTK_PARSE_CONST + $<integer>2;}
| type_red1 {$<integer>$ = $<integer>1;}
......@@ -463,22 +463,22 @@ type_red1: type_red2 {$<integer>$ = $<integer>1;}
type_string1: type_string2 {$<integer>$ = $<integer>1;}
| type_string2 '&' { postSig("&"); $<integer>$ = $<integer>1;}
| type_string2 '*' { postSig("*"); $<integer>$ = (VTK_PARSE_REF + VTK_PARSE_PTR) + $<integer>1;}
| type_string2 '*' { postSig("*"); $<integer>$ = (VTK_PARSE_REF + VTK_PARSE_POINTER) + $<integer>1;}
type_string2: StdString { postSig("vtkStdString "); $<integer>$ = (VTK_PARSE_CONST | VTK_PARSE_CHAR_PTR); };
/* & is VTK_PARSE_REF
&& is VTK_PARSE_REF + VTK_PARSE_REF
* is VTK_PARSE_PTR
&* is VTK_PARSE_PTR + VTK_PARSE_REF
*& is VTK_PARSE_PTR + VTK_PARSE_REF + VTK_PARSE_REF
** is VTK_PARSE_PTR + VTK_PARSE_PTR + VTK_PARSE_REF
* is VTK_PARSE_POINTER
&* is VTK_PARSE_POINTER + VTK_PARSE_REF
*& is VTK_PARSE_POINTER + VTK_PARSE_REF + VTK_PARSE_REF
** is VTK_PARSE_POINTER + VTK_PARSE_POINTER + VTK_PARSE_REF
*/
type_indirection: '&' { postSig("&"); $<integer>$ = VTK_PARSE_REF;}
| '*' { postSig("*"); $<integer>$ = VTK_PARSE_PTR;}
| '*' { postSig("*"); $<integer>$ = VTK_PARSE_POINTER;}
| '&' type_indirection { $<integer>$ = VTK_PARSE_REF + $<integer>2;}
| '*' type_indirection { $<integer>$ = (VTK_PARSE_REF + VTK_PARSE_PTR) + $<integer>2;};
| '*' type_indirection { $<integer>$ = (VTK_PARSE_REF + VTK_PARSE_POINTER) + $<integer>2;};
type_red2: UNSIGNED {postSig("unsigned ");}
type_primitive { $<integer>$ = VTK_PARSE_UNSIGNED + $<integer>3;}
......@@ -705,7 +705,7 @@ macro:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + $<integer>6;
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + $<integer>6;
currentFunction->ArgCounts[0] = 2;
output_function();
}
......@@ -721,7 +721,7 @@ macro:
sprintf(temps,"Get%s",$<str>3);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + $<integer>6;
currentFunction->ReturnType = VTK_PARSE_POINTER + $<integer>6;
currentFunction->HaveHint = 1;
currentFunction->HintSize = 2;
output_function();
......@@ -754,7 +754,7 @@ macro:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + $<integer>6;
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + $<integer>6;
currentFunction->ArgCounts[0] = 3;
output_function();
}
......@@ -770,7 +770,7 @@ macro:
sprintf(temps,"Get%s",$<str>3);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + $<integer>6;
currentFunction->ReturnType = VTK_PARSE_POINTER + $<integer>6;
currentFunction->HaveHint = 1;
currentFunction->HintSize = 3;
output_function();
......@@ -805,7 +805,7 @@ macro:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + $<integer>6;
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + $<integer>6;
currentFunction->ArgCounts[0] = 4;
output_function();
}
......@@ -821,7 +821,7 @@ macro:
sprintf(temps,"Get%s",$<str>3);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + $<integer>6;
currentFunction->ReturnType = VTK_PARSE_POINTER + $<integer>6;
currentFunction->HaveHint = 1;
currentFunction->HintSize = 4;
output_function();
......@@ -860,7 +860,7 @@ macro:
local);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + $<integer>6;
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + $<integer>6;
currentFunction->ArgCounts[0] = 6;
output_function();
}
......@@ -876,7 +876,7 @@ macro:
sprintf(temps,"Get%s",$<str>3);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + $<integer>6;
currentFunction->ReturnType = VTK_PARSE_POINTER + $<integer>6;
currentFunction->HaveHint = 1;
currentFunction->HintSize = 6;
output_function();
......@@ -895,7 +895,7 @@ macro:
currentFunction->Name = vtkstrdup(temps);
currentFunction->ReturnType = VTK_PARSE_VOID;
currentFunction->NumberOfArguments = 1;
currentFunction->ArgTypes[0] = VTK_PARSE_PTR + $<integer>6;
currentFunction->ArgTypes[0] = VTK_PARSE_POINTER + $<integer>6;
currentFunction->ArgCounts[0] = $<integer>8;
output_function();
}
......@@ -911,7 +911,7 @@ macro:
sprintf(temps,"Get%s",$<str>3);
currentFunction->Name = vtkstrdup(temps);
currentFunction->NumberOfArguments = 0;
currentFunction->ReturnType = VTK_PARSE_PTR + $<integer>6;
currentFunction->ReturnType = VTK_PARSE_POINTER + $<integer>6;
currentFunction->HaveHint = 1;
currentFunction->HintSize = $<integer>8;
output_function();
......@@ -1259,8 +1259,8 @@ void output_function()
/* reject multi-dimensional arrays from wrappers */
for (i = 0; i < currentFunction->NumberOfArguments; i++)
{
if ((currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 2*VTK_PARSE_PTR ||
(currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 3*VTK_PARSE_PTR)
if ((currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 2*VTK_PARSE_POINTER ||
(currentFunction->ArgTypes[i] & VTK_PARSE_INDIRECT) == 3*VTK_PARSE_POINTER)
{
currentFunction->ArrayFailure = 1;
}
......
......@@ -64,7 +64,7 @@ void output_temp(FILE *fp,int i)
}
fprintf(fp,"id%i",i);
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR) &&
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER) &&
(aType != VTK_PARSE_CHAR_PTR) &&
(aType != VTK_PARSE_VTK_OBJECT_PTR))
{
......@@ -526,7 +526,7 @@ void outputFunction(FILE *fp, FileInfo *data)
if (aType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if ((aType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (((aType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR)&&
if (((aType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER)&&
(aType != VTK_PARSE_VTK_OBJECT_REF)&&
((aType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
if (aType == VTK_PARSE_UNSIGNED_CHAR_PTR) args_ok = 0;
......@@ -539,7 +539,7 @@ void outputFunction(FILE *fp, FileInfo *data)
}
if ((rType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (rType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if (((rType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR)&&
if (((rType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER)&&
(rType != VTK_PARSE_VTK_OBJECT_REF)&&
((rType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
......@@ -561,7 +561,7 @@ void outputFunction(FILE *fp, FileInfo *data)
{
aType = (currentFunction->ArgTypes[i] & VTK_PARSE_UNQUALIFIED_TYPE);
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR)&&
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER)&&
(currentFunction->ArgCounts[i] <= 0)&&
(aType != VTK_PARSE_VTK_OBJECT_PTR)&&
(aType != VTK_PARSE_CHAR_PTR)) args_ok = 0;
......
......@@ -62,7 +62,7 @@ void output_temp(FILE *fp,int i)
}
fprintf(fp,"id%i",i);
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR) &&
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER) &&
(aType != VTK_PARSE_CHAR_PTR) &&
(aType != VTK_PARSE_VTK_OBJECT_PTR))
{
......@@ -358,7 +358,7 @@ void outputFunction(FILE *fp, FileInfo *data)
if (aType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if ((currentFunction->ArgTypes[i] % VTK_PARSE_FLOAT0) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (((aType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR) &&
if (((aType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER) &&
(aType != VTK_PARSE_VTK_OBJECT_REF)&&
((aType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
if (aType == VTK_PARSE_UNSIGNED_CHAR_PTR) args_ok = 0;
......@@ -371,7 +371,7 @@ void outputFunction(FILE *fp, FileInfo *data)
}
if ((rType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (rType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if (((rType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR) &&
if (((rType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER) &&
(rType != VTK_PARSE_VTK_OBJECT_REF)&&
((rType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
......@@ -394,7 +394,7 @@ void outputFunction(FILE *fp, FileInfo *data)
{
aType = (currentFunction->ArgTypes[i] & VTK_PARSE_UNQUALIFIED_TYPE);
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR)&&
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER)&&
(currentFunction->ArgCounts[i] <= 0)&&
(aType != VTK_PARSE_VTK_OBJECT_PTR)&&
(aType != VTK_PARSE_CHAR_PTR)) args_ok = 0;
......
......@@ -73,9 +73,9 @@
#define VTK_PARSE_INDIRECT 0xF00
#define VTK_PARSE_REF 0x100
#define VTK_PARSE_PTR 0x300
#define VTK_PARSE_PTR_REF 0x500
#define VTK_PARSE_PTR_PTR 0x700
#define VTK_PARSE_POINTER 0x300
#define VTK_PARSE_POINTER_REF 0x500
#define VTK_PARSE_POINTER_POINTER 0x700
/*
* The lowest two hex digits describe the basic type,
......
......@@ -268,7 +268,7 @@ void output_temp(FILE *fp, int i, int aType, char *Id, int aCount)
case VTK_PARSE_REF:
fprintf(fp, " *"); /* act " &" */
break;
case VTK_PARSE_PTR:
case VTK_PARSE_POINTER:
if ((i == MAX_ARGS) ||
((aType & VTK_PARSE_UNQUALIFIED_TYPE) == VTK_PARSE_VTK_OBJECT_PTR) ||
((aType & VTK_PARSE_UNQUALIFIED_TYPE) == VTK_PARSE_CHAR_PTR))
......@@ -276,10 +276,10 @@ void output_temp(FILE *fp, int i, int aType, char *Id, int aCount)
fprintf(fp, " *");
}
break;
case VTK_PARSE_PTR_REF:
case VTK_PARSE_POINTER_REF:
fprintf(fp, "*&");
break;
case VTK_PARSE_PTR_PTR:
case VTK_PARSE_POINTER_POINTER:
fprintf(fp, "**");
break;
default:
......@@ -289,7 +289,7 @@ void output_temp(FILE *fp, int i, int aType, char *Id, int aCount)
fprintf(fp,"temp%i",i);
/* handle arrays */
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR)&&
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER)&&
(i != MAX_ARGS) &&
((aType & VTK_PARSE_UNQUALIFIED_TYPE) != VTK_PARSE_VTK_OBJECT_PTR) &&
((aType & VTK_PARSE_UNQUALIFIED_TYPE) != VTK_PARSE_CHAR_PTR))
......@@ -829,7 +829,7 @@ void outputFunction(FILE *fp, FileInfo *data)
if (aType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if ((aType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (((aType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR) &&
if (((aType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER) &&
(aType != VTK_PARSE_VTK_OBJECT_REF) &&
((aType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
if (aType == VTK_PARSE_UNSIGNED_CHAR_PTR) args_ok = 0;
......@@ -842,7 +842,7 @@ void outputFunction(FILE *fp, FileInfo *data)
}
if ((rType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (rType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if (((rType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR)&&
if (((rType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER)&&
(rType != VTK_PARSE_VTK_OBJECT_REF)&&
((rType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
......@@ -864,7 +864,7 @@ void outputFunction(FILE *fp, FileInfo *data)
{
aType = (currentFunction->ArgTypes[i] & VTK_PARSE_UNQUALIFIED_TYPE);
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR)&&
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER)&&
(currentFunction->ArgCounts[i] <= 0)&&
(aType != VTK_PARSE_VTK_OBJECT_PTR)&&
(aType != VTK_PARSE_CHAR_PTR)) args_ok = 0;
......
......@@ -241,7 +241,7 @@ void output_temp(FILE *fp, int i, int aType, char *Id, int aCount)
switch (aType & VTK_PARSE_INDIRECT)
{
case VTK_PARSE_REF: fprintf(fp, " *"); break; /* act " &" */
case VTK_PARSE_PTR:
case VTK_PARSE_POINTER:
if ((i == MAX_ARGS) ||
((aType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_VTK_OBJECT) ||
((aType & VTK_PARSE_UNQUALIFIED_TYPE) == VTK_PARSE_CHAR_PTR) ||
......@@ -250,14 +250,14 @@ void output_temp(FILE *fp, int i, int aType, char *Id, int aCount)
fprintf(fp, " *");
}
break;
case VTK_PARSE_PTR_REF: fprintf(fp, "*&"); break;
case VTK_PARSE_PTR_PTR: fprintf(fp, "**"); break;
case VTK_PARSE_POINTER_REF: fprintf(fp, "*&"); break;
case VTK_PARSE_POINTER_POINTER: fprintf(fp, "**"); break;
default: fprintf(fp," "); break;
}
fprintf(fp,"temp%i",i);
/* handle arrays */
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR) &&
if (((aType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER) &&
(i != MAX_ARGS) &&
((aType & VTK_PARSE_BASE_TYPE) != VTK_PARSE_VTK_OBJECT) &&
((aType & VTK_PARSE_UNQUALIFIED_TYPE) != VTK_PARSE_CHAR_PTR) &&
......@@ -1564,7 +1564,7 @@ void outputFunction(FILE *fp, FileInfo *data)
if (argType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if ((argType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (((argType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR) &&
if (((argType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER) &&
(argType != VTK_PARSE_VTK_OBJECT_REF) &&
((argType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
if (argType == VTK_PARSE_UNSIGNED_CHAR_PTR) args_ok = 0;
......@@ -1575,7 +1575,7 @@ void outputFunction(FILE *fp, FileInfo *data)
}
if ((returnType & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN) args_ok = 0;
if (returnType == VTK_PARSE_VTK_OBJECT) args_ok = 0;
if (((returnType & VTK_PARSE_INDIRECT) != VTK_PARSE_PTR) &&
if (((returnType & VTK_PARSE_INDIRECT) != VTK_PARSE_POINTER) &&
(returnType != VTK_PARSE_VTK_OBJECT_REF) &&
((returnType & VTK_PARSE_INDIRECT) != 0)) args_ok = 0;
......@@ -1596,7 +1596,7 @@ void outputFunction(FILE *fp, FileInfo *data)
{
argType = (currentFunction->ArgTypes[i] & VTK_PARSE_UNQUALIFIED_TYPE);
if (((argType & VTK_PARSE_INDIRECT) == VTK_PARSE_PTR) &&
if (((argType & VTK_PARSE_INDIRECT) == VTK_PARSE_POINTER) &&
(currentFunction->ArgCounts[i] <= 0) &&
(argType != VTK_PARSE_VTK_OBJECT_PTR) &&
(argType != VTK_PARSE_CHAR_PTR) &&
......
......@@ -160,11 +160,11 @@ void output_temp(FILE *fp, int i, int aType, char *Id, int count)
switch (aType & VTK_PARSE_INDIRECT)
{
case VTK_PARSE_REF: fprintf(fp, " *"); break; /* act " &" */
case VTK_PARSE_PTR: fprintf(fp, " *"); break;
case VTK_PARSE_PTR_REF: fprintf(fp, "*&"); break;
case VTK_PARSE_PTR_PTR: fprintf(fp, "**"); break;
default: fprintf(fp," "); break;
case VTK_PARSE_REF: fprintf(fp, " *"); break; /* act " &" */
case VTK_PARSE_POINTER: fprintf(fp, " *"); break;
case VTK_PARSE_POINTER_REF: fprintf(fp, "*&"); break;
case VTK_PARSE_POINTER_POINTER: fprintf(fp, "**"); break;
default: fprintf(fp," "); break;
}
fprintf(fp,"temp%i",i);
......@@ -699,7 +699,7 @@ void outputFunction(FILE *fp, FileInfo *data)
args_ok = 0;
}
if (((currentFunction->ReturnType & VTK_PARSE_INDIRECT)
!= VTK_PARSE_PTR) &&
!= VTK_PARSE_POINTER) &&
((currentFunction->ReturnType & VTK_PARSE_INDIRECT)
!= VTK_PARSE_REF) &&
((currentFunction->ReturnType & VTK_PARSE_INDIRECT) != 0))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment