Changeset 3726

Timestamp:

05/23/05 13:42:15 (4 years ago)

Author:

iblech

svk:copy_cache_prev:

5313

Message:

Minor test fix (delegation.t) and minor cosmetical cleanups (ChangeLog?, Main, Pugs.Help).

Files:

• ChangeLog (modified) (2 diffs)
• src/Main.hs (modified) (1 diff)
• src/Pugs/Help.hs (modified) (2 diffs)
• t/oo/delegation.t (modified) (1 diff)

ChangeLog

@@ -23 +23 @@
 * `s:globally//` is now `s:global//`.
 * `&code.name` and `&code.arity` added.
-* Much better error messages, with cascading stack trace
+* Much better error messages, with cascading stack trace.
 * Several Object changes:
 ** MMD handling is now more sophisticated, and `$.chained.attr.methods` works.
@@ -55 +55 @@
 
 * Many new test and several tests refactored, we now have 5600+ tests.
-* Perl6::Rules test suite incorporate into `t/rules/`.
+* Perl6::Rules test suite incorporated into `t/rules/`.
 * Hangman IRC bot created from `hangman.p6`.
 * OO Wizard RPG game added in `examples/games/`.

src/Main.hs

@@ -290 +290 @@
         ["This is " ++ version ++ " built for " ++ getConfig "archname"
         ,""
-        ,"Summary of pugs configuration:"
-        ,"" ]
+        ,"Summary of pugs configuration:" ]
         ++ map (\x -> createConfigLine x) (map (fst) (Map.toList config))
         ++ [ "" ]

src/Pugs/Help.hs

@@ -49 +49 @@
         putStrLn "-V:item          short configuration information for item"
         putStrLn "-v or --version  version"
-        putStrLn "-l -d and -w are ignored for compatability with perl 5"
+        putStrLn "-l -d and -w are ignored for compatability with Perl 5"
 
 name :: String
@@ -102 +102 @@
 intro = putStrLn $ unlines
     [ "Welcome to Pugs -- " ++ name
-    , "Type :h for help"
+    , "Type :h for help."
     ]

t/oo/delegation.t

@@ -14 +14 @@
 # L<S12/"Delegation">
 
-eval_ok '
+ok eval('
   class Backend1 { method hi() { 42 } method cool() { 1337 } }
   class Backend2 { method hi() { 23 } method cool() {  539 } }
   class Frontend { has $.backend is rw handles "hi" }
-', "class definition worked", :todo<feature>;
+  1
+'), "class definition worked", :todo<feature>;
 
-eval_is 'Backend1.new.hi', 42, "basic sanity (1)", :todo<feature>;
-eval_is 'Backend2.new.hi', 23, "basic sanity (2)", :todo<feature>;
+is eval('Backend1.new.hi'), 42, "basic sanity (1)", :todo<feature>;
+is eval('Backend2.new.hi'), 23, "basic sanity (2)", :todo<feature>;
 
 {
   my $a;
-  eval_ok '$a = Frontend.new', "basic instantiation worked (1)", :todo<feature>;
-  eval_ok '!try { $a.hi }', "calling a method on no object didn't succeed (1)";
-  eval_ok '$a.backend = Backend1.new()', "setting a handler object (1)", :todo<feature>;
-  eval_ok '!$a ~~ Backend1',             "object wasn't isa()ed (1)", :todo<feature>;
-  eval_is '$a.hi', 42, "method was successfully handled by backend object (1)", :todo<feature>;
+  ok eval('$a = Frontend.new'), "basic instantiation worked (1)", :todo<feature>;
+  ok eval('!try { $a.hi }'), "calling a method on no object didn't succeed (1)";
+  ok eval('$a.backend = Backend1.new()'), "setting a handler object (1)", :todo<feature>;
+  ok eval('!$a ~~ Backend1'),             "object wasn't isa()ed (1)", :todo<feature>;
+  is eval('$a.hi'), 42, "method was successfully handled by backend object (1)", :todo<feature>;
 }
 
 {
   my $a;
-  eval_ok '$a = Frontend.new', "basic instantiation worked (2)", :todo<feature>;
-  eval_ok '!try { $a.hi }', "calling a method on no object didn't succeed (2)";
-  eval_ok '$a.backend = Backend2.new()', "setting a handler object (2)", :todo<feature>;
-  eval_ok '!$a ~~ Backend2',             "object wasn't isa()ed (2)", :todo<feature>;
-  eval_is '$a.hi', 23, "method was successfully handled by backend object (2)", :todo<feature>;
+  ok eval('$a = Frontend.new'), "basic instantiation worked (2)", :todo<feature>;
+  ok eval('!try { $a.hi }'), "calling a method on no object didn't succeed (2)";
+  ok eval('$a.backend = Backend2.new()'), "setting a handler object (2)", :todo<feature>;
+  ok eval('!$a ~~ Backend2'),             "object wasn't isa()ed (2)", :todo<feature>;
+  is eval('$a.hi'), 23, "method was successfully handled by backend object (2)", :todo<feature>;
 }
 
 
 # L<S12/"Delegation" /Any other kind of argument to handles is considered to be a smartmatch selector for methods/>
-eval_ok 'class ReFrontend { has $.backend is rw handles /^hi/ }',
+ok eval('class ReFrontend { has $.backend is rw handles /^hi/ }; 1'),
   "class definition using a smartmatch handle worked", :todo<feature>;
 {
   my $a;
-  eval_ok '$a = ReFrontend.new', "basic instantiation worked (3)", :todo<feature>;
-  eval_ok '!try { $a.hi }', "calling a method on no object didn't succeed (3)";
-  eval_ok '$a.backend = Backend1.new()', "setting a handler object (3)", :todo<feature>;
-  eval_ok '!$a ~~ Backend1',             "object wasn't isa()ed (3)", :todo<feature>;
-  eval_is '$a.hi', 42, "method was successfully handled by backend object (3)", :todo<feature>;
+  ok eval('$a = ReFrontend.new'), "basic instantiation worked (3)", :todo<feature>;
+  ok eval('!try { $a.hi }'), "calling a method on no object didn't succeed (3)";
+  ok eval('$a.backend = Backend1.new()'), "setting a handler object (3)", :todo<feature>;
+  ok eval('!$a ~~ Backend1'),             "object wasn't isa()ed (3)", :todo<feature>;
+  is eval('$a.hi'), 42, "method was successfully handled by backend object (3)", :todo<feature>;
 }
 
 
 # L<S12/"Delegation" /If you say/>
-eval_ok 'class ClassFrontend { has $.backend is rw handles Backend2 }',
+ok eval('class ClassFrontend { has $.backend is rw handles Backend2 }; 1'),
   "class definition using a Class handle worked", :todo<feature>;
 {
   my $a;
-  eval_ok '$a = ClassFrontend.new', "basic instantiation worked (4)", :todo<feature>;
-  eval_ok '!try { $a.hi }', "calling a method on no object didn't succeed (4)";
-  eval_ok '$a.backend = Backend1.new()', "setting a handler object (4)", :todo<feature>;
-  eval_ok '!$a ~~ Backend1',             "object wasn't isa()ed (4-1)", :todo<feature>;
-  eval_ok '!$a ~~ Backend2',             "object wasn't isa()ed (4-2)", :todo<feature>;
-  eval_is '$a.hi', 42, "method was successfully handled by backend object (4)", :todo<feature>;
+  ok eval('$a = ClassFrontend.new'), "basic instantiation worked (4)", :todo<feature>;
+  ok eval('!try { $a.hi }'), "calling a method on no object didn't succeed (4)";
+  ok eval('$a.backend = Backend1.new()'), "setting a handler object (4)", :todo<feature>;
+  ok eval('!$a ~~ Backend1'),             "object wasn't isa()ed (4-1)", :todo<feature>;
+  ok eval('!$a ~~ Backend2'),             "object wasn't isa()ed (4-2)", :todo<feature>;
+  is eval('$a.hi'), 42, "method was successfully handled by backend object (4)", :todo<feature>;
 }
 
 
 # L<S12/"Delegation" /You can specify multiple method names:/>
-eval_ok 'class MultiFrontend { has $.backend is rw handles <hi cool> }',
+ok eval('class MultiFrontend { has $.backend is rw handles <hi cool> }; 1'),
   "class definition using multiple method names worked", :todo<feature>;
 {
   my $a;
-  eval_ok '$a = MultiFrontend.new', "basic instantiation worked (5)", :todo<feature>;
-  eval_ok '!try { $a.hi   }', "calling a method on no object didn't succeed (5-1)";
-  eval_ok '!try { $a.cool }', "calling a method on no object didn't succeed (5-2)";
-  eval_ok '$a.backend = Backend1.new()', "setting a handler object (5)", :todo<feature>;
-  eval_ok '!$a ~~ Backend1',             "object wasn't isa()ed (5)", :todo<feature>;
-  eval_is '$a.hi',     42, "method was successfully handled by backend object (5-1)", :todo<feature>;
-  eval_is '$a.cool', 1337, "method was successfully handled by backend object (5-2)", :todo<feature>;
+  ok eval('$a = MultiFrontend.new'), "basic instantiation worked (5)", :todo<feature>;
+  ok eval('!try { $a.hi   }'), "calling a method on no object didn't succeed (5-1)";
+  ok eval('!try { $a.cool }'), "calling a method on no object didn't succeed (5-2)";
+  ok eval('$a.backend = Backend1.new()'), "setting a handler object (5)", :todo<feature>;
+  ok eval('!$a ~~ Backend1'),             "object wasn't isa()ed (5)", :todo<feature>;
+  is eval('$a.hi'),     42, "method was successfully handled by backend object (5-1)", :todo<feature>;
+  is eval('$a.cool'), 1337, "method was successfully handled by backend object (5-2)", :todo<feature>;
 }