Last fixes

uqbar-project · Dec 22, 2017 · 7ec76bd · 7ec76bd
1 parent ea4895e
commit 7ec76bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/....project.wollok.launch/src/org/uqbar/project/wollok/launch/WollokLauncherParameters.xtend b/....project.wollok.launch/src/org/uqbar/project/wollok/launch/WollokLauncherParameters.xtend
@@ -75,8 +75,6 @@ class WollokLauncherParameters {
 		val parser = new OptionalGnuParser
 		val cmdLine = parser.parse(options, args, false)
 
-		args.forEach[ println(it) ]
-
 		hasRepl = cmdLine.hasOption("r")
 
 		tests = cmdLine.hasOption("t")

diff --git a/...ct.wollok/src/org/uqbar/project/wollok/interpreter/nativeobj/NumberCoercingStrategy.xtend b/...ct.wollok/src/org/uqbar/project/wollok/interpreter/nativeobj/NumberCoercingStrategy.xtend
@@ -14,6 +14,11 @@ abstract class NumberCoercingStrategy {
 	def BigDecimal adaptResult(BigDecimal value) { value }
 	def String description()
 	def String name()
+	def void warnIfScaleDoesNotMatch(BigDecimal value, BigDecimal result) {
+		if (value.scale > WollokNumbersPreferences.instance.decimalPositions) {
+			println(NLS.bind(Messages.WollokConversion_WARNING_NUMBER_VALUE_INTEGER, value, result))
+		}
+	}
 }
 
 class TruncateDecimalsCoercingStrategy extends NumberCoercingStrategy {
@@ -27,11 +32,9 @@ class TruncateDecimalsCoercingStrategy extends NumberCoercingStrategy {
 		result
 	}
 
-	override adaptValue(BigDecimal value) { 
+	override adaptValue(BigDecimal value) {
 		val result = value.setScale(WollokNumbersPreferences.instance.decimalPositions, RoundingMode.DOWN)
-		if (value.scale > WollokNumbersPreferences.instance.decimalPositions) {
-			println(NLS.bind(Messages.WollokConversion_WARNING_NUMBER_VALUE_INTEGER, value, result))
-		}
+		value.warnIfScaleDoesNotMatch(result)
 		result
 	}
 
@@ -81,7 +84,11 @@ class RoundingDecimalsCoercingStrategy extends NumberCoercingStrategy {
 	override coerceToInteger(BigDecimal value) {
 		value.intValue
 	}
-	override adaptValue(BigDecimal value) { value.setScale(WollokNumbersPreferences.instance.decimalPositions, RoundingMode.HALF_UP) }
+	override adaptValue(BigDecimal value) { 
+		val result = value.setScale(WollokNumbersPreferences.instance.decimalPositions, RoundingMode.HALF_UP)
+		value.warnIfScaleDoesNotMatch(result)
+		result
+	}
 
 	override name(){
 		"decimals"