Skip to content

Commit

Permalink
list6, for symmetry with lang6
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/trunk@70560 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
morgan committed Apr 28, 2016
1 parent b361bdd commit 7199ea1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion doc/manual/R-exts.texi
Original file line number Diff line number Diff line change
Expand Up @@ -10276,7 +10276,7 @@ and language objects (whose internal structures just differ by
block: it constructs a pairlist from @code{u} followed by @code{v}
(which is a pairlist or @code{R_NilValue}). @code{LCONS} is a variant
that constructs a language object. Functions @code{list1} to
@code{list5} construct a pairlist from one to five items, and
@code{list6} construct a pairlist from one to six items, and
@code{lang1} to @code{lang6} do the same for a language object (a
function to call plus zero to five arguments). Functions @code{elt} and
@code{lastElt} find the @var{i}th element and the last element of a
Expand Down
7 changes: 7 additions & 0 deletions src/include/Rinlinedfuns.h
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ INLINE_FUN SEXP list5(SEXP s, SEXP t, SEXP u, SEXP v, SEXP w)
return s;
}

INLINE_FUN SEXP list6(SEXP s, SEXP t, SEXP u, SEXP v, SEXP w, SEXP x)
{
PROTECT(s);
s = CONS(s, list5(t, u, v, w, x));
UNPROTECT(1);
return s;
}

/* Destructive list append : See also ``append'' */

Expand Down
2 changes: 2 additions & 0 deletions src/include/Rinternals.h
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,7 @@ void R_orderVector1(int *indx, int n, SEXP x, Rboolean nalast, Rboolean de
#define list3 Rf_list3
#define list4 Rf_list4
#define list5 Rf_list5
#define list6 Rf_list6
#define listAppend Rf_listAppend
#define match Rf_match
#define matchE Rf_matchE
Expand Down Expand Up @@ -1332,6 +1333,7 @@ SEXP Rf_list2(SEXP, SEXP);
SEXP Rf_list3(SEXP, SEXP, SEXP);
SEXP Rf_list4(SEXP, SEXP, SEXP, SEXP);
SEXP Rf_list5(SEXP, SEXP, SEXP, SEXP, SEXP);
SEXP Rf_list6(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
SEXP Rf_listAppend(SEXP, SEXP);
SEXP Rf_mkNamed(SEXPTYPE, const char **);
SEXP Rf_mkString(const char *);
Expand Down

0 comments on commit 7199ea1

Please sign in to comment.