View | Details | Raw Unified | Return to bug 17284 | Differences between
and this patch

Collapse All | Expand All

(-)bind.c (-2 / +16 lines)
Lines 1-8 Link Here
1
/*
1
/*
2
 *  R : A Computer Language for Statistical Data Analysis
2
 *  R : A Computer Language for Statistical Data Analysis
3
 *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
3
 *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
4
 *  Copyright (C) 1997--2016  The R Core Team
4
 *  Copyright (C) 1997--2017  The R Core Team
5
 *  Copyright (C) 2002--2016  The R Foundation
5
 *  Copyright (C) 2002--2017  The R Foundation
6
 *
6
 *
7
 *  This program is free software; you can redistribute it and/or modify
7
 *  This program is free software; you can redistribute it and/or modify
8
 *  it under the terms of the GNU General Public License as published by
8
 *  it under the terms of the GNU General Public License as published by
Lines 595-606 Link Here
595
	nameData->count = 0;
595
	nameData->count = 0;
596
	nameData->seqno = 0;
596
	nameData->seqno = 0;
597
	nameData->firstpos = -1;
597
	nameData->firstpos = -1;
598
	switch(TYPEOF(v)) {
599
	case LISTSXP:
600
	case VECSXP:
601
	case EXPRSXP:
602
	    break;
603
	default:
604
	    recurse = 0;
605
	}
598
    }
606
    }
599
    else saveseqno = 0;
607
    else saveseqno = 0;
600
608
601
    n = xlength(v);
609
    n = xlength(v);
602
    PROTECT(names = getAttrib(v, R_NamesSymbol));
610
    PROTECT(names = getAttrib(v, R_NamesSymbol));
603
611
612
    if (tag != R_NilValue &&
613
    n == 1 && !recurse && names == R_NilValue) {
614
	nameData->firstpos = (data->ans_nnames)++;
615
	nameData->count++;
616
	++(nameData->seqno);
617
    } else
604
    switch(TYPEOF(v)) {
618
    switch(TYPEOF(v)) {
605
    case NILSXP:
619
    case NILSXP:
606
	break;
620
	break;

Return to bug 17284