ceil, round and floor return integer-typed values

unless the result is complex, in which case they still return a 'number'. fixes #721
numbas · Jul 28, 2020 · 0dcc417 · 0dcc417
1 parent bdbdc16
commit 0dcc417
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 9 deletions.
diff --git a/runtime/scripts/jme-builtins.js b/runtime/scripts/jme-builtins.js
@@ -462,9 +462,36 @@ newBuiltin('coth', [TNum], TNum, math.coth );
 newBuiltin('arcsinh', [TNum], TNum, math.arcsinh );
 newBuiltin('arccosh', [TNum], TNum, math.arccosh );
 newBuiltin('arctanh', [TNum], TNum, math.arctanh );
-newBuiltin('ceil', [TNum], TNum, math.ceil );
-newBuiltin('floor', [TNum], TNum, math.floor );
-newBuiltin('round', [TNum], TNum, math.round );
+newBuiltin('ceil', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.ceil(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
+newBuiltin('floor', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.floor(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
+newBuiltin('round', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.round(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
 newBuiltin('tonearest',[TNum,TNum], TNum, math.toNearest);
 newBuiltin('trunc', [TNum], TNum, math.trunc );
 newBuiltin('fract', [TNum], TNum, math.fract );

diff --git a/tests/jme-runtime.js b/tests/jme-runtime.js
@@ -16623,9 +16623,36 @@ newBuiltin('coth', [TNum], TNum, math.coth );
 newBuiltin('arcsinh', [TNum], TNum, math.arcsinh );
 newBuiltin('arccosh', [TNum], TNum, math.arccosh );
 newBuiltin('arctanh', [TNum], TNum, math.arctanh );
-newBuiltin('ceil', [TNum], TNum, math.ceil );
-newBuiltin('floor', [TNum], TNum, math.floor );
-newBuiltin('round', [TNum], TNum, math.round );
+newBuiltin('ceil', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.ceil(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
+newBuiltin('floor', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.floor(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
+newBuiltin('round', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.round(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
 newBuiltin('tonearest',[TNum,TNum], TNum, math.toNearest);
 newBuiltin('trunc', [TNum], TNum, math.trunc );
 newBuiltin('fract', [TNum], TNum, math.fract );

diff --git a/tests/numbas-runtime.js b/tests/numbas-runtime.js
@@ -11674,9 +11674,36 @@ newBuiltin('coth', [TNum], TNum, math.coth );
 newBuiltin('arcsinh', [TNum], TNum, math.arcsinh );
 newBuiltin('arccosh', [TNum], TNum, math.arccosh );
 newBuiltin('arctanh', [TNum], TNum, math.arctanh );
-newBuiltin('ceil', [TNum], TNum, math.ceil );
-newBuiltin('floor', [TNum], TNum, math.floor );
-newBuiltin('round', [TNum], TNum, math.round );
+newBuiltin('ceil', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.ceil(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
+newBuiltin('floor', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.floor(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
+newBuiltin('round', [TNum], TNum, null, {
+    evaluate: function(args,scope) {
+        var n = math.round(jme.castToType(args[0],'number').value);
+        if(n.complex) {
+            return new TNum(n);
+        } else {
+            return new TInt(n);
+        }
+    }
+});
 newBuiltin('tonearest',[TNum,TNum], TNum, math.toNearest);
 newBuiltin('trunc', [TNum], TNum, math.trunc );
 newBuiltin('fract', [TNum], TNum, math.fract );