Merge branch 'dev-natives-to-wollok' of github.com:uqbar-project/woll…

…ok into dev-natives-to-wollok
uqbar-project · Nov 14, 2015 · 4c70f00 · 4c70f00
2 parents 49ac673 + 6f3af86
commit 4c70f00
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 10 deletions.
diff --git a/org.uqbar.project.wollok.lib/src/wollok.wlk b/org.uqbar.project.wollok.lib/src/wollok.wlk
@@ -72,8 +72,8 @@ package lang {
 		}
 		method getX() { return x }
 		method getY() { return y }
-		method getKey() { this.getX() }
-		method getValue() { this.getY() }
+		method getKey() { return this.getX() }
+		method getValue() { return this.getY() }
 	}
 
 	class Collection {
@@ -210,6 +210,8 @@ package lang {
 
 		method toStringPrefix()
 		method toStringSufix()
+		method asList()
+		method asSet()
 
 		method newInstance()
 	}
@@ -221,10 +223,18 @@ package lang {
 	 */	
 	class Set extends Collection {
 
-		override method newInstance() = new Set()
+		override method newInstance() = #{}
 		override method toStringPrefix() = "#{"
 		override method toStringSufix() = "}"
 
+		override method asList() { 
+			val result = #[]
+			result.addAll(this)
+			return result
+		}
+
+		override method asSet() = this
+
 		method any() = this.first()
 
 		method first() native
@@ -250,7 +260,7 @@ package lang {
 
 		method get(index) native
 
-		override method newInstance() = new List()
+		override method newInstance() = #[]
 
 		method any() {
 			if (this.isEmpty()) 
@@ -261,6 +271,15 @@ package lang {
 
 		override method toStringPrefix() = "#["
 		override method toStringSufix() = "]"
+
+		override method asList() = this
+
+		override method asSet() { 
+			val result = #{}
+			result.addAll(this)
+			return result
+		}
+
 
 		// REFACTORME: DUP METHODS
 		method fold(initialValue, closure) native

diff --git a/...erpreter/collections/CollectionTest.xtend → ...ect/wollok/tests/sdk/CollectionTest.xtend b/...erpreter/collections/CollectionTest.xtend → ...ect/wollok/tests/sdk/CollectionTest.xtend
@@ -1,4 +1,4 @@
-package org.uqbar.project.wollok.tests.interpreter.collections
+package org.uqbar.project.wollok.tests.sdk
 
 import org.junit.Test
 import org.uqbar.project.wollok.tests.interpreter.AbstractWollokInterpreterTestCase

diff --git a/org.uqbar.project.wollok.tests/src/org/uqbar/project/wollok/tests/sdk/ListTest.xtend b/org.uqbar.project.wollok.tests/src/org/uqbar/project/wollok/tests/sdk/ListTest.xtend
@@ -49,8 +49,8 @@ class ListTest extends ListTestCase {
 	@Test
 	def void testContainsWithComplexObjects() {
 		'''
-			object o1 {}
-			object o2 {}
+		object o1 {}
+		object o2 {}
 			
 		program p {
 			val list = #[o1, o2]
@@ -60,5 +60,14 @@ class ListTest extends ListTestCase {
 		}'''.interpretPropagatingErrors
 	}
 
-
+	@Test
+	def void testConversions() {
+		'''
+		program p {
+			val list = #[1,2,3]
+			
+			assert.equals(#[1,2,3], list.asList())
+			assert.equals(#{1,2,3}, list.asSet())
+		}'''.interpretPropagatingErrors
+	}
 }
diff --git a/...sts/interpreter/collections/SetTest.xtend → ...ar/project/wollok/tests/sdk/SetTest.xtend b/...sts/interpreter/collections/SetTest.xtend → ...ar/project/wollok/tests/sdk/SetTest.xtend
@@ -1,4 +1,4 @@
-package org.uqbar.project.wollok.tests.interpreter.collections
+package org.uqbar.project.wollok.tests.sdk
 
 import org.junit.Test
 import org.uqbar.project.wollok.tests.interpreter.ListTestCase
@@ -67,4 +67,16 @@ class SetTest extends ListTestCase {
 		}'''.interpretPropagatingErrors
 	}
 
-}
+	@Test
+	def void testConversions() {
+		'''
+		program p {
+			val set= #{1,2,3}
+			assert.equals(#{1,2,3}, set.asSet())
+			
+			val list = set.asList()
+			assert.equals(3, list.size())
+			#[1,2,3].forEach[i|assert.equals(list.contains(i))]
+		}'''.interpretPropagatingErrors
+	}
+}