Skip to content

Commit

Permalink
Also change occurences in src/*
Browse files Browse the repository at this point in the history
  • Loading branch information
staticfloat committed Nov 10, 2013
1 parent 6d1a5f3 commit b270170
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/builtins.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,14 +305,14 @@ JL_CALLABLE(jl_f_apply)
JL_CALLABLE(jl_f_kwcall)
{
if (nargs < 3)
jl_error("internal error: malformed named argument call");
jl_error("internal error: malformed keyword argument call");
JL_TYPECHK(apply, function, args[0]);
jl_function_t *f = (jl_function_t*)args[0];
if (!jl_is_gf(f))
jl_error("function does not accept named arguments");
jl_error("function does not accept keyword arguments");
jl_function_t *sorter = ((jl_methtable_t*)f->env)->kwsorter;
if (sorter == NULL) {
jl_errorf("function %s does not accept named arguments",
jl_errorf("function %s does not accept keyword arguments",
jl_gf_name(f)->name);
}

Expand Down
6 changes: 3 additions & 3 deletions src/julia-syntax.scm
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@
,else)))
(if (null? restkw)
;; if no rest kw, give error for unrecognized
`(call (top error) "unrecognized named argument " ,elt)
`(call (top error) "unrecognized keyword argument " ,elt)
;; otherwise add to rest keywords
`(ccall 'jl_cell_1d_push Void (tuple Any Any)
,rkw (tuple ,elt
Expand Down Expand Up @@ -1262,7 +1262,7 @@
(if (pair? invalid)
(if (and (pair? (car invalid)) (eq? 'parameters (caar invalid)))
(error "more than one semicolon in argument list")
(error (string "invalid named argument " (car invalid)))))))
(error (string "invalid keyword argument " (car invalid)))))))

(define (lower-kw-call f kw pa)
(check-kw-args kw)
Expand All @@ -1271,7 +1271,7 @@
(let ((keyargs (apply append
(map (lambda (a)
(if (not (symbol? (cadr a)))
(error (string "named argument is not a symbol: " (cadr a))))
(error (string "keyword argument is not a symbol: " (cadr a))))
`((quote ,(cadr a)) ,(caddr a)))
keys))))
(if (null? restkeys)
Expand Down

0 comments on commit b270170

Please sign in to comment.