Misc changes, fixed up Object lib and tests.

1 files changed, 23 insertions, 20 deletions

diff --git a/tests/object.nom b/tests/object.nom
index a986abf..6433c86 100644
--- a/tests/object.nom
+++ b/tests/object.nom
@@ -1,24 +1,27 @@
 use "core"
-use "lib/object2.nom"
+use "lib/object.nom"
 
-#..
-    immediately
-        define object "Dog"
-            action [bark]
-                %barks <- ("Bark!" for all 1 to (@%barks))
-                return (%barks joined with " ")
-            action [get pissed off]
-                (@%barks) +<- 1
+immediately
+    object "Dog"
+        action [bark]
+            %barks <- ("Bark!" for % in 1 to ((me).barks))
+            return: %barks joined with " "
 
-    %d <- (new Dog {barks:2})
-    as %d
-        assume ((@) = %d)
-        assume ((@%barks) = 2)
-        assume ((bark) = "Bark! Bark!")
-        get pissed off
-        assume ((@%barks) = 3)
-        assume ((bark) = "Bark! Bark! Bark!")
-    assume ("\(%d's "class")" = "Dog")
-    assume ((%d's "barks") = 3)
+        action [get pissed off]
+            ((me).barks) +<- 1
 
-    say "Object test passed."
+%d <-: new Dog {barks:2}
+as %d
+    assume: (me) = %d
+    assume: ((me).barks) = 2
+    assume: (bark) = "Bark! Bark!"
+    get pissed off
+    assume: ((me).barks) = 3
+    assume: (bark) = "Bark! Bark! Bark!"
+assume: "\(%d's "class")" = "Dog"
+assume: (%d's "barks") = 3
+
+as: new Dog {barks:1}
+    assume: (bark) = "Bark!"
+
+say "Object test passed."