diff --git a/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target b/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target index 5fb6e0ce3..0e4057d12 100644 --- a/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target +++ b/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target @@ -39,10 +39,11 @@ - - - - + + + + + diff --git a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/interpreter/nativeobj/WollokJavaConversions.xtend b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/interpreter/nativeobj/WollokJavaConversions.xtend index ac543bbeb..b466cfa17 100644 --- a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/interpreter/nativeobj/WollokJavaConversions.xtend +++ b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/interpreter/nativeobj/WollokJavaConversions.xtend @@ -97,6 +97,8 @@ class WollokJavaConversions { def static dispatch WollokObject convertJavaToWollok(Long o) { evaluator.getOrCreateNumber(o.toString) } + def static dispatch WollokObject convertJavaToWollok(Float o) { evaluator.getOrCreateNumber(o.toString) } + def static dispatch WollokObject convertJavaToWollok(Integer o) { evaluator.getOrCreateNumber(o.toString) } def static dispatch WollokObject convertJavaToWollok(Double o) { evaluator.getOrCreateNumber(o.toString) } diff --git a/wollok-language b/wollok-language index a28707135..6d928a5ec 160000 --- a/wollok-language +++ b/wollok-language @@ -1 +1 @@ -Subproject commit a287071358ed17bc2efbdb320a29407e8fabba53 +Subproject commit 6d928a5ec432b0dac7530952384d824ca0e54972