The R Project SVN R

Rev

Rev 77220 | Rev 77919 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 77220 Rev 77222
Line 967... Line 967...
967 
	namesgets(ans, getAttrib(x, R_NamesSymbol));
 967 
	namesgets(ans, getAttrib(x, R_NamesSymbol));
968 
    UNPROTECT(1);
 968 
    UNPROTECT(1);
969 
    Free(pt); Free(wpt);
 969 
    Free(pt); Free(wpt);
970 
#ifdef HAVE_PCRE2
 970 
#ifdef HAVE_PCRE2
971 
    if (tables) free((void *)tables);
 971 
    if (tables) free((void *)tables);
- 
 
 972 
    /* new PCRE2 will have pcre2_maketables_free() */
972 
#else
 973 
#else
973 
    if (tables) pcre_free((void *)tables);
 974 
    if (tables) pcre_free((void *)tables);
974 
#endif
 975 
#endif
975 
    return ans;
 976 
    return ans;
976 
}
 977 
}
Line 1281... Line 1282...
1281 
#ifdef HAVE_PCRE2
 1282 
#ifdef HAVE_PCRE2
1282 
	pcre2_match_data_free(mdata);
 1283 
	pcre2_match_data_free(mdata);
1283 
	pcre2_code_free(re);
 1284 
	pcre2_code_free(re);
1284 
	pcre2_match_context_free(mcontext);
 1285 
	pcre2_match_context_free(mcontext);
1285 
	if (tables)
 1286 
	if (tables)
- 
 
 1287 
	    /* new PCRE2 will have pcre2_maketables_free() */
1286 
	    free((void *)tables);
 1288 
	    free((void *)tables);
1287 
#else
 1289 
#else
1288 
	if (re_pe) pcre_free_study(re_pe);
 1290 
	if (re_pe) pcre_free_study(re_pe);
1289 
	pcre_free(re_pcre);
 1291 
	pcre_free(re_pcre);
1290 
	pcre_free((void *)tables);
 1292 
	pcre_free((void *)tables);
Line 2328... Line 2330...
2328 
#ifdef HAVE_PCRE2
 2330 
#ifdef HAVE_PCRE2
2329 
	pcre2_match_data_free(mdata);
 2331 
	pcre2_match_data_free(mdata);
2330 
	pcre2_code_free(re);
 2332 
	pcre2_code_free(re);
2331 
	pcre2_match_context_free(mcontext);
 2333 
	pcre2_match_context_free(mcontext);
2332 
	if (tables)
 2334 
	if (tables)
- 
 
 2335 
	    /* new PCRE2 will have pcre2_maketables_free() */
2333 
	    free((void *)tables);
 2336 
	    free((void *)tables);
2334 
#else
 2337 
#else
2335 
	if (re_pe) pcre_free_study(re_pe);
 2338 
	if (re_pe) pcre_free_study(re_pe);
2336 
	pcre_free(re_pcre);
 2339 
	pcre_free(re_pcre);
2337 
	pcre_free((void *)tables);
 2340 
	pcre_free((void *)tables);
Line 3101... Line 3104...
3101 
#ifdef HAVE_PCRE2
 3104 
#ifdef HAVE_PCRE2
3102 
	pcre2_match_data_free(mdata);
 3105 
	pcre2_match_data_free(mdata);
3103 
	pcre2_code_free(re);
 3106 
	pcre2_code_free(re);
3104 
	pcre2_match_context_free(mcontext);
 3107 
	pcre2_match_context_free(mcontext);
3105 
	if (tables)
 3108 
	if (tables)
- 
 
 3109 
	    /* new PCRE2 will have pcre2_maketables_free() */
3106 
	    free((void *)tables);
 3110 
	    free((void *)tables);
3107 
#else
 3111 
#else
3108 
	if (re_pe) pcre_free_study(re_pe);
 3112 
	if (re_pe) pcre_free_study(re_pe);
3109 
	pcre_free(re_pcre);
 3113 
	pcre_free(re_pcre);
3110 
	pcre_free((void *)tables);
 3114 
	pcre_free((void *)tables);