From bf82f79f1e27b4580672af457a95f3d85ea781a4 Mon Sep 17 00:00:00 2001
From: Simon Hafner <hafnersimon@gmail.com>
Date: Thu, 21 Feb 2013 15:11:48 -0600
Subject: added tests, actually implemented $ and ==

---
 lib/system.nim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/system.nim b/lib/system.nim
index 5f9a24ba9..db78d2740 100755
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -1532,7 +1532,7 @@ iterator fieldPairs*[S: tuple|object, T: tuple|object](x: S, y: T): tuple[
   ## The current implementation also has a bug that affects symbol binding
   ## in the loop body.
 
-proc `==`*[T: tuple](x, y: T): bool = 
+proc `==`*[T: tuple|object](x, y: T): bool = 
   ## generic ``==`` operator for tuples that is lifted from the components
   ## of `x` and `y`.
   for a, b in fields(x, y):
@@ -1557,7 +1557,7 @@ proc `<`*[T: tuple](x, y: T): bool =
     if c > 0: return false
   return false
 
-proc `$`*[T: tuple](x: T): string = 
+proc `$`*[T: tuple|object](x: T): string = 
   ## generic ``$`` operator for tuples that is lifted from the components
   ## of `x`. Example:
   ##
-- 
cgit 1.4.1-2-gfad0


From e366eeaafc0b834cd57d0aa4bc16925271c4a79f Mon Sep 17 00:00:00 2001
From: Simon Hafner <hafnersimon@gmail.com>
Date: Thu, 21 Feb 2013 16:31:35 -0600
Subject: added $ for refs and removed == for ref test

== in refs should use the pointer to compare
---
 lib/system.nim        |  2 ++
 tests/run/tobject.nim | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/system.nim b/lib/system.nim
index db78d2740..3f15dbeaf 100755
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -1557,6 +1557,8 @@ proc `<`*[T: tuple](x, y: T): bool =
     if c > 0: return false
   return false
 
+proc `$`*[T: ref](x: T): string = $x[]
+
 proc `$`*[T: tuple|object](x: T): string = 
   ## generic ``$`` operator for tuples that is lifted from the components
   ## of `x`. Example:
diff --git a/tests/run/tobject.nim b/tests/run/tobject.nim
index 246f2862b..b2fd21236 100644
--- a/tests/run/tobject.nim
+++ b/tests/run/tobject.nim
@@ -7,15 +7,19 @@ proc makeObj(x: int): ref Obj =
   new(result)
   result.foo = x
 
-proc initObject(x: int): Obj = 
+proc initObj(x: int): Obj = 
   result.foo = x
 
-suite "object basic methods":
-  test "it should convert an objcet to a string":
-    var obj = makeObj(1)
+template stringTest(init: expr) =
+  test "it should convert an object to a string":
+    var obj = `init`(1)
     # Should be "obj: (foo: 1)" or similar.
     check($obj == "(foo: 1)")
-  test "it should test equality based on fields":
-    check(initObj(1) == initObj(1))
-  test "it should test equality based on fields for refs too":
-    check(makeObj(1) == makeObj(1))
+
+suite "object basic methods":
+  suite "ref":
+    stringTest(makeObj)
+  suite "value":
+    stringTest(initObj)
+    test "it should test equality based on fields":
+      check(initObj(1) == initObj(1))
-- 
cgit 1.4.1-2-gfad0


From 7168ceb5e1ec6686b13f5da1f2c9a4db07ac90ec Mon Sep 17 00:00:00 2001
From: Simon Hafner <hafnersimon@gmail.com>
Date: Thu, 21 Feb 2013 16:37:22 -0600
Subject: removed `$` for refs upon request

---
 lib/system.nim        |  2 --
 tests/run/tobject.nim | 20 +++++---------------
 2 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/system.nim b/lib/system.nim
index 3f15dbeaf..db78d2740 100755
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -1557,8 +1557,6 @@ proc `<`*[T: tuple](x, y: T): bool =
     if c > 0: return false
   return false
 
-proc `$`*[T: ref](x: T): string = $x[]
-
 proc `$`*[T: tuple|object](x: T): string = 
   ## generic ``$`` operator for tuples that is lifted from the components
   ## of `x`. Example:
diff --git a/tests/run/tobject.nim b/tests/run/tobject.nim
index b2fd21236..5fec84441 100644
--- a/tests/run/tobject.nim
+++ b/tests/run/tobject.nim
@@ -3,23 +3,13 @@ import unittest
 type Obj = object
   foo: int
 
-proc makeObj(x: int): ref Obj = 
-  new(result)
+proc makeObj(x: int): Obj = 
   result.foo = x
 
-proc initObj(x: int): Obj = 
-  result.foo = x
-
-template stringTest(init: expr) =
+suite "object basic methods":
   test "it should convert an object to a string":
-    var obj = `init`(1)
+    var obj = makeObj(1)
     # Should be "obj: (foo: 1)" or similar.
     check($obj == "(foo: 1)")
-
-suite "object basic methods":
-  suite "ref":
-    stringTest(makeObj)
-  suite "value":
-    stringTest(initObj)
-    test "it should test equality based on fields":
-      check(initObj(1) == initObj(1))
+  test "it should test equality based on fields":
+    check(makeObj(1) == makeObj(1))
-- 
cgit 1.4.1-2-gfad0