The R Project SVN R

Rev

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

Rev 37001 Rev 37644
Line 158... Line 158...
158
		    break;
158
		    break;
159
		}
159
		}
160
	    }
160
	    }
161
	/* Try for partial match */
161
	/* Try for partial match */
162
	if (pok && indx < 0) {
162
	if (pok && indx < 0) {
-
 
163
	    len = strlen(CHAR(STRING_ELT(s, pos)));
-
 
164
	    for(i = 0; i < length(names); i++) {
163
	    if (STRING_ELT(names, i) == NA_STRING || 
165
		if (STRING_ELT(names, i) == NA_STRING || 
164
		STRING_ELT(s, pos) == NA_STRING) {
166
		    STRING_ELT(s, pos) == NA_STRING) {
165
		/* NA matches nothing */
167
		    /* NA matches nothing */
166
	    } else {
168
		} else {
167
		len = strlen(CHAR(STRING_ELT(s, pos)));
-
 
168
		for(i = 0; i < length(names); i++) {
-
 
169
		    if(!strncmp(CHAR(STRING_ELT(names, i)),
169
		    if(!strncmp(CHAR(STRING_ELT(names, i)),
170
				CHAR(STRING_ELT(s, pos)), len)) {
170
				CHAR(STRING_ELT(s, pos)), len)) {
171
			if(indx == -1)/* first one */
171
			if(indx == -1)/* first one */
172
			    indx = i;
172
			    indx = i;
173
			else
173
			else