Skip to content

Commit

Permalink
avoid TAP parser errors in cmd_proc.
Browse files Browse the repository at this point in the history
  • Loading branch information
coke committed Jul 3, 2010
1 parent 7f26a12 commit 5a4ae42
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
5 changes: 1 addition & 4 deletions build/Makefile.in
Expand Up @@ -98,6 +98,7 @@ TEST_FILES = \
t/cmd_lset.t \
t/cmd_lsort.t \
t/cmd_namespace.t \
t/cmd_proc.t \
t/cmd_regexp.t \
t/cmd_return.t \
t/cmd_set.t \
Expand All @@ -121,10 +122,6 @@ TEST_FILES = \
t/tcl_namespace.t \
t/tcl_var_subst.t

# These t/*.t files are not yet runnable. Keep a list around so we know
# what to work on.
# t/cmd_proc.t

Makefile: Configure.pl build/Makefile.in
$(PERL) Configure.pl

Expand Down
28 changes: 16 additions & 12 deletions t/cmd_proc.t
@@ -1,7 +1,7 @@
# Copyright (C) 2004-2007, The Parrot Foundation.

source lib/test_more.tcl
plan 19
plan 18; # +1 skip

eval_is {
set a [proc me {} {
Expand Down Expand Up @@ -43,40 +43,42 @@ eval_is {
list $a $b
}
me 2 3 4
} {wrong # args: should be "me a b"} {too many args}
} {wrong # args: should be "me a b"} {too many args} {TODO NQPRX}

eval_is {
proc me {a b} {
list $a $b
}
me 2
} {wrong # args: should be "me a b"} {too few args}
} {wrong # args: should be "me a b"} {too few args} {TODO NQPRX}

eval_is {
proc test {} {}
test foo bar
} {wrong # args: should be "test"} {bad args - expected none}
} {wrong # args: should be "test"} {bad args - expected none} {TODO NQPRX}

eval_is {
proc me {a b args} {
list $a $b
}
me 2
} {wrong # args: should be "me a b ..."} {bad varargs}
} {wrong # args: should be "me a b ..."} {bad varargs} {TODO NQPRX}

eval_is {
proc me {a args} {
list $a $args
}
me 2 3 4 5 6
} {2 {3 4 5 6}} {vararg}
} {2 {3 4 5 6}} {vararg} {TODO NQPRX}

eval_is {
proc me {a args} {
list $a $args
}
me 2
} {2 {}} {vararg empty}
} {2 {}} {vararg empty} {TODO NQPRX}

if 0 { # SKIP NQPRX - breaks test_more.tcl

eval_is {
rename incr incr_old
Expand All @@ -86,12 +88,14 @@ eval_is {
rename incr {}
rename incr_old incr
set a
} {a} {using a renamed builtin}
} {a} {using a renamed builtin} {TODO NQPRX}

}

eval_is {
proc a::b {} {puts a::b}
a::b
} {can't create procedure "a::b": unknown namespace} {unknown namespace}
} {can't create procedure "a::b": unknown namespace} {unknown namespace} {TODO NQPRX}

eval_is {
proc me {{a 2}} {
Expand All @@ -104,17 +108,17 @@ eval_is {
proc me {{a 2 3}} {
return $a
}
} {too many fields in argument specifier "a 2 3"} {bad default arg spec}
} {too many fields in argument specifier "a 2 3"} {bad default arg spec} {TODO NQPRX}

eval_is {
proc test {{a 2} b} {list $a $b}
test 3
} {wrong # args: should be "test ?a? b"} {default arg with too few args}
} {wrong # args: should be "test ?a? b"} {default arg with too few args} {TODO NQPRX}

eval_is {
proc test {{a 2}} {return $a}
test 3 4
} {wrong # args: should be "test ?a?"} {default too many args}
} {wrong # args: should be "test ?a?"} {default too many args} {TODO NQPRX}

eval_is {
proc test {} {}
Expand Down

0 comments on commit 5a4ae42

Please sign in to comment.