The R Project SVN – R – Diff – /branches/R-classInheritance/src/main/subscript.c

     case STRSXP:
 	nx = length(x);
 	names = getAttrib(x, R_NamesSymbol);
 	if (names != R_NilValue) {
 	    /* Try for exact match */
-	    for (i = 0; i < nx; i++)
+	    for (i = 0; i < nx; i++) {
-		if (streql(translateChar(STRING_ELT(names, i)),
+		const char *tmp = translateChar(STRING_ELT(names, i));
+		if (!tmp[0]) continue;
-			   translateChar(STRING_ELT(s, pos)))) {
+		if (streql(tmp, translateChar(STRING_ELT(s, pos)))) {
 		    indx = i;
 		    break;
+		}
+	    }
 	    /* Try for partial match */
 	    if (partial && indx < 0) {
 		len = strlen(translateChar(STRING_ELT(s, pos)));
 		for(i = 0; i < nx; i++) {
-		    if(!strncmp(translateChar(STRING_ELT(names, i)),
+		    const char *tmp = translateChar(STRING_ELT(names, i));
+		    if (!tmp[0]) continue;
-				translateChar(STRING_ELT(s, pos)), len)) {
+		    if(!strncmp(tmp, translateChar(STRING_ELT(s, pos)), len)) {
 			if(indx == -1 )
 			    indx = i;
 			else
 			    indx = -2;
+		    }
 	    indx = integerOneIndex((int)dblind, len, call);
 	break;
     case STRSXP:
 	/* NA matches nothing */
 	if(STRING_ELT(s, pos) == NA_STRING) break;
+	/* "" matches nothing: see names.Rd */
+	if(!CHAR(STRING_ELT(s, pos))[0]) break;
 	/* Try for exact match */
 	ss = translateChar(STRING_ELT(s, pos));
 	for (i = 0; i < length(names); i++)
 	    if (STRING_ELT(names, i) != NA_STRING) {

The R Project SVN R