Merge: Prepare for the android UI module

* Not all pthreads features are supported on Android, thus the changes.
* Changing the `data_store` signature is enough to support nulls because the APIs of both underlying implementations already supported them.
* Declaring the lines for <activity> in the modules allows for non-fullscreen and non-orientation-locked apps!

Pull-Request: #927
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Jean Privat <jean@pryen.org>

diff --git a/lib/standard/kernel.nit b/lib/standard/kernel.nit
index 2e9c9ae..2f2df4b 100644 (file)
--- a/lib/standard/kernel.nit
+++ b/lib/standard/kernel.nit
@@ -331,6 +331,21 @@ universal Float
                end
        end
 
+       # Compare float numbers with a given precision.
+       #
+       # Because of the loss of precision in floating numbers,
+       # the `==` method is often not the best way to compare them.
+       #
+       # ~~~
+       # assert 0.01.is_approx(0.02, 0.1)   == true
+       # assert 0.01.is_approx(0.02, 0.001) == false
+       # ~~~
+       fun is_approx(other, precision: Float): Bool
+       do
+               assert precision >= 0.0
+               return self <= other + precision and self >= other - precision
+       end
+
        redef fun max(other)
        do
                if self < other then

diff --git a/lib/standard/math.nit b/lib/standard/math.nit
index 2bbb6aa..6214a65 100644 (file)
--- a/lib/standard/math.nit
+++ b/lib/standard/math.nit
@@ -138,6 +138,14 @@ redef class Float
        #     assert 2.0.floor == 2.0
        #     assert (-1.5).floor == -2.0
        fun floor: Float `{ return floor(recv); `}
+
+       # Rounds the value of a float to its nearest integer value
+       #
+       #     assert 1.67.round == 2.0
+       #     assert 1.34.round == 1.0
+       #     assert -1.34.round == -1.0
+       #     assert -1.67.round == -2.0
+       fun round: Float is extern "round"
        
        # Returns a random `Float` in `[0.0 .. self[`.
        fun rand: Float is extern "kernel_Float_Float_rand_0"

diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 2879ac9..476608c 100644 (file)
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -901,6 +901,8 @@ redef class AMethPropdef
                                return v.bool_instance(args[0].to_f.is_nan)
                        else if pname == "is_inf_extern" then
                                return v.bool_instance(args[0].to_f.is_inf != 0)
+                       else if pname == "round" then
+                               return v.float_instance(args[0].to_f.round)
                        end
                else if cname == "NativeString" then
                        if pname == "new" then

diff --git a/tests/sav/nitg-e/fixme/base_gen_reassign_alt4.res b/tests/sav/nitg-e/fixme/base_gen_reassign_alt4.res
index 56621b6..8229d05 100644 (file)
--- a/tests/sav/nitg-e/fixme/base_gen_reassign_alt4.res
+++ b/tests/sav/nitg-e/fixme/base_gen_reassign_alt4.res
@@ -1,4 +1,4 @@
-Runtime error: Cast failed. Expected `OTHER`, got `Float` (../lib/standard/kernel.nit:374)
+Runtime error: Cast failed. Expected `OTHER`, got `Float` (../lib/standard/kernel.nit:389)
 11
 21
 31

diff --git a/tests/sav/nitg-e/fixme/base_gen_reassign_alt5.res b/tests/sav/nitg-e/fixme/base_gen_reassign_alt5.res
index 56621b6..8229d05 100644 (file)
--- a/tests/sav/nitg-e/fixme/base_gen_reassign_alt5.res
+++ b/tests/sav/nitg-e/fixme/base_gen_reassign_alt5.res
@@ -1,4 +1,4 @@
-Runtime error: Cast failed. Expected `OTHER`, got `Float` (../lib/standard/kernel.nit:374)
+Runtime error: Cast failed. Expected `OTHER`, got `Float` (../lib/standard/kernel.nit:389)
 11
 21
 31

diff --git a/tests/sav/nitg-e/fixme/base_gen_reassign_alt6.res b/tests/sav/nitg-e/fixme/base_gen_reassign_alt6.res
index 56621b6..8229d05 100644 (file)
--- a/tests/sav/nitg-e/fixme/base_gen_reassign_alt6.res
+++ b/tests/sav/nitg-e/fixme/base_gen_reassign_alt6.res
@@ -1,4 +1,4 @@
-Runtime error: Cast failed. Expected `OTHER`, got `Float` (../lib/standard/kernel.nit:374)
+Runtime error: Cast failed. Expected `OTHER`, got `Float` (../lib/standard/kernel.nit:389)
 11
 21
 31

diff --git a/tests/sav/nituml_args3.res b/tests/sav/nituml_args3.res
index af28f14..e248df6 100644 (file)
--- a/tests/sav/nituml_args3.res
+++ b/tests/sav/nituml_args3.res
@@ -41,7 +41,7 @@ Bool [
 Object -> Bool [dir=back arrowtail=open style=dashed];
 
 Float [
- label = "{Float||}"
+ label = "{Float||+ is_approx(other: Float, precision: Float): Bool\l}"
 ]
 Numeric -> Float [dir=back arrowtail=open style=dashed];
 

diff --git a/tests/sav/nituml_args4.res b/tests/sav/nituml_args4.res
index 6189897..9a7b30f 100644 (file)
--- a/tests/sav/nituml_args4.res
+++ b/tests/sav/nituml_args4.res
@@ -41,7 +41,7 @@ Bool [
 Object -> Bool [dir=back arrowtail=open style=dashed];
 
 Float [
- label = "{Float||}"
+ label = "{Float||+ is_approx(other: Float, precision: Float): Bool\l}"
 ]
 Numeric -> Float [dir=back arrowtail=open style=dashed];