[BACK]Return to pvar.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / parse

Diff for /OpenXM_contrib2/asir2000/parse/pvar.c between version 1.17 and 1.23

version 1.17, 2006/03/11 23:14:53 version 1.23, 2017/02/07 08:30:31
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.16 2006/02/08 02:11:19 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.22 2015/08/14 13:51:56 fujimoto Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 68  void mkpvs(char *fname)
Line 68  void mkpvs(char *fname)
                         buf = ALLOCA(strlen("undeclared function "+strlen(fname)+10));                          buf = ALLOCA(strlen("undeclared function "+strlen(fname)+10));
                         sprintf(buf,"undeclared function `%s'",fname);                          sprintf(buf,"undeclared function `%s'",fname);
                         yyerror(buf);                          yyerror(buf);
                           error("cannot continue to read inputs");
                 }                  }
         }          }
         pvs = (VS)MALLOC(sizeof(struct oVS));          pvs = (VS)MALLOC(sizeof(struct oVS));
Line 297  int getpvar(VS pvs,char *str,int searchonly)
Line 298  int getpvar(VS pvs,char *str,int searchonly)
         if ( searchonly )          if ( searchonly )
                 return -1;                  return -1;
         if ( pvs->asize == pvs->n )          if ( pvs->asize == pvs->n )
                 reallocarray((char **)&pvs->va,(int *)&pvs->asize,(int *)&pvs->n,(int)sizeof(struct oPV));                  asir_reallocarray((char **)&pvs->va,(int *)&pvs->asize,(int *)&pvs->n,(int)sizeof(struct oPV));
         v = &pvs->va[pvs->n];          v = &pvs->va[pvs->n];
         NAME(v) = (char *)CALLOC(strlen(str)+1,sizeof(char));          NAME(v) = (char *)CALLOC(strlen(str)+1,sizeof(char));
         strcpy(NAME(v),str); v->priv = 0;          strcpy(NAME(v),str); v->priv = 0;
Line 305  int getpvar(VS pvs,char *str,int searchonly)
Line 306  int getpvar(VS pvs,char *str,int searchonly)
         return i;          return i;
 }  }
   
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
 #define PCLOSE _pclose  #define PCLOSE _pclose
 #else  #else
 #define PCLOSE pclose  #define PCLOSE pclose
Line 316  void closecurrentinput()
Line 317  void closecurrentinput()
         if ( asir_infile && !asir_infile->fp )          if ( asir_infile && !asir_infile->fp )
                 return;                  return;
   
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
         fclose(asir_infile->fp);          fclose(asir_infile->fp);
         unlink(asir_infile->tname);          unlink(asir_infile->tname);
 #else  #else
Line 324  void closecurrentinput()
Line 325  void closecurrentinput()
                 PCLOSE(asir_infile->fp);                  PCLOSE(asir_infile->fp);
 #endif  #endif
         asir_infile = NEXT(asir_infile);          asir_infile = NEXT(asir_infile);
         resetpvs();  
 }  }
   
 void resetpvs()  void resetpvs()
Line 361  void restorepvs()
Line 361  void restorepvs()
 void storeans(pointer p)  void storeans(pointer p)
 {  {
         if ( APVS->asize == APVS->n )          if ( APVS->asize == APVS->n )
                 reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));                  asir_reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
         APVS->va[APVS->n++].priv = p;          APVS->va[APVS->n++].priv = p;
 }  }
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.23
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>