The R Project SVN R

Rev

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

Rev 77199 Rev 77452
Line 1652... Line 1652...
1652 
	    /* If named, do argument matching by name */
 1652 
	    /* If named, do argument matching by name */
1653 
	    if (TAG(args) != R_NilValue || TAG(CDR(args)) != R_NilValue) {
 1653 
	    if (TAG(args) != R_NilValue || TAG(CDR(args)) != R_NilValue) {
1654 
		if (do_Math2_formals == NULL)
 1654 
		if (do_Math2_formals == NULL)
1655 
		    do_Math2_formals = allocFormalsList2(install("x"),
 1655 
		    do_Math2_formals = allocFormalsList2(install("x"),
1656 
							 install("digits"));
 1656 
							 install("digits"));
1657 
		PROTECT(args = matchArgs(do_Math2_formals, args, call));
 1657 
		PROTECT(args = matchArgs_NR(do_Math2_formals, args, call));
1658 
		nprotect++;
 1658 
		nprotect++;
1659 
	    }
 1659 
	    }
1660 
	    if (length(CADR(args)) == 0)
 1660 
	    if (length(CADR(args)) == 0)
1661 
		errorcall(call, _("invalid second argument of length 0"));
 1661 
		errorcall(call, _("invalid second argument of length 0"));
1662 
	}
 1662 
	}
Line 1766... Line 1766...
1766 
    }
 1766 
    }
1767 
    else {
 1767 
    else {
1768 
	/* match argument names if supplied */
 1768 
	/* match argument names if supplied */
1769 
	/* will signal an error unless there are one or two arguments */
 1769 
	/* will signal an error unless there are one or two arguments */
1770 
	/* after the match, length(args) will be 2 */
 1770 
	/* after the match, length(args) will be 2 */
1771 
	PROTECT(args = matchArgs(do_log_formals, args, call));
 1771 
	PROTECT(args = matchArgs_NR(do_log_formals, args, call));
1772 
 
 1772 
 
1773 
	if(CAR(args) == R_MissingArg)
 1773 
	if(CAR(args) == R_MissingArg)
1774 
	    error(_("argument \"%s\" is missing, with no default"), "x");
 1774 
	    error(_("argument \"%s\" is missing, with no default"), "x");
1775 
	if (CADR(args) == R_MissingArg)
 1775 
	if (CADR(args) == R_MissingArg)
1776 
	    SETCADR(args, ScalarReal(DFLT_LOG_BASE));
 1776 
	    SETCADR(args, ScalarReal(DFLT_LOG_BASE));