Wollok very big integer support (using decimals)

uqbar-project · Oct 20, 2016 · 9afd7c1 · 9afd7c1
1 parent b223d58
commit 9afd7c1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/....project.wollok.tests/src/org/uqbar/project/wollok/tests/interpreter/NumberTestCase.xtend b/....project.wollok.tests/src/org/uqbar/project/wollok/tests/interpreter/NumberTestCase.xtend
@@ -425,4 +425,28 @@ class NumberTestCase extends AbstractWollokInterpreterTestCase {
 		'''.test
 	}
 
+	@Test
+	def void veryBigIntegerAdd() {
+		'''
+		var a = 100000000000000000
+		assert.equals(100000000000000001, a + 1)
+		'''.test
+	}
+
+	@Test
+	def void veryBigIntegerMultiply() {
+		'''
+		var a = 100000000000000000
+		assert.equals(100000000000000000, a * 1)
+		'''.test
+	}
+
+	@Test
+	def void veryBigIntegerDivide() {
+		'''
+		var a = 100000000000000000
+		assert.equals(100000, a / 1000000000000)
+		'''.test
+	}
+
 }
diff --git a/....project.wollok/src/org/uqbar/project/wollok/interpreter/WollokInterpreterEvaluator.xtend b/....project.wollok/src/org/uqbar/project/wollok/interpreter/WollokInterpreterEvaluator.xtend
@@ -218,7 +218,12 @@ class WollokInterpreterEvaluator implements XInterpreterEvaluator<WollokObject>
 		if (value.contains('.'))
 			doInstantiateNumber(DOUBLE, new BigDecimal(value))
 		else {
-			doInstantiateNumber(INTEGER, Integer.valueOf(value))
+			try {
+				doInstantiateNumber(INTEGER, Integer.valueOf(value))
+			} catch (NumberFormatException e) {
+				// If value is too long, use a decimal
+				doInstantiateNumber(DOUBLE, new BigDecimal(value))
+			}
 		}
 	}