From f6ebb92af94d65c3f2f1c7ba3d92a1e7414eab8a Mon Sep 17 00:00:00 2001 From: PalumboN Date: Fri, 1 Oct 2021 18:28:20 -0300 Subject: [PATCH 1/2] Fix native gettter: sound.volume() --- .../wollok/interpreter/nativeobj/WollokJavaConversions.xtend | 2 ++ wollok-language | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 From 1d26d137322ecc315a9d14211b8b1150d2ae9b44 Mon Sep 17 00:00:00 2001 From: PalumboN Date: Sun, 10 Oct 2021 13:31:18 -0300 Subject: [PATCH 2/2] Update egit plugin --- .../org.uqbar.project.wollok.targetplatform.target | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 @@ - - - - + + + + +