From: Dragan T. <dr...@us...> - 2005-03-01 02:53:19
|
Update of /cvsroot/octaviz/octaviz/Wrapping In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18169 Modified Files: lex.yy.c vtkParse.l vtkParse.tab.c vtkWrapOctave.c Log Message: Patched (but not fixed) vtkIdType problem. Index: lex.yy.c =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/lex.yy.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- lex.yy.c 1 Mar 2005 02:13:29 -0000 1.2 +++ lex.yy.c 1 Mar 2005 02:53:06 -0000 1.3 @@ -83,14 +83,14 @@ /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST -#else /* ! __cplusplus */ +#else /* ! __cplusplus */ #if __STDC__ #define YY_USE_CONST -#endif /* __STDC__ */ [...2337 lines suppressed...] + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -2598,3 +2641,7 @@ #undef YY_DECL #endif #line 238 "vtkParse.l" + + + + Index: vtkParse.l =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/vtkParse.l,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtkParse.l 1 Mar 2005 02:13:29 -0000 1.2 +++ vtkParse.l 1 Mar 2005 02:53:06 -0000 1.3 @@ -176,7 +176,7 @@ "static" return(STATIC); "vtkFloatingPointType" return(DOUBLE); -"vtkIdType" return(LONG); +"vtkIdType" return(INT); "vtkSetMacro" return(SetMacro); "vtkGetMacro" return(GetMacro); "vtkSetStringMacro" return(SetStringMacro); Index: vtkParse.tab.c =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/vtkParse.tab.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtkParse.tab.c 1 Mar 2005 02:13:29 -0000 1.2 +++ vtkParse.tab.c 1 Mar 2005 02:53:06 -0000 1.3 @@ -169,6 +169,7 @@ Modify vtkParse.tab.c: - remove TABs + - comment out yyerrorlab stuff */ @@ -226,7 +227,7 @@ sigAllocatedLength) { currentFunction->Signature = (char *) [...1518 lines suppressed...] { if ((!strcmp(h_cls,data.ClassName))&& - currentFunction->Name && - (!strcmp(h_func,currentFunction->Name))&& - (h_type == currentFunction->ReturnType)) + currentFunction->Name && + (!strcmp(h_func,currentFunction->Name))&& + (h_type == currentFunction->ReturnType)) { currentFunction->HaveHint = 1; currentFunction->HintSize = h_value; @@ -2979,7 +2978,7 @@ case 301: case 302: case 307: case 304: case 305: case 306: case 313: look_for_hint(); - break; + break; } } Index: vtkWrapOctave.c =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/vtkWrapOctave.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtkWrapOctave.c 1 Mar 2005 02:13:29 -0000 1.2 +++ vtkWrapOctave.c 1 Mar 2005 02:53:07 -0000 1.3 @@ -498,7 +498,7 @@ fprintf(fp," if ( ( method_name == \"%s\" ) && ( nargin == %i ) )\n {\n", currentFunction->Name, required_args + 2); /* process the args */ - fprintf(fp,"\n/* %s */\n",currentFunction->Signature); + fprintf(fp,"\n/* ah %s */\n",currentFunction->Signature); for (i = 0; i < currentFunction->NumberOfArguments; i++) { output_temp(fp, i, currentFunction->ArgTypes[i], |