Merge pull request #834 from cycomachead/number-functions

Implement log10 and 10^x math functions

2 files changed, 6 insertions, 6 deletions

diff --git a/blocks.js b/blocks.js
index ec01f96..0a4c5ed 100644
--- a/blocks.js
+++ b/blocks.js
@@ -1114,9 +1114,9 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
                     acos : ['acos'],
                     atan : ['atan'],
                     ln : ['ln'],
-                    // log : 'log',
-                    'e^' : ['e^']
-                    // '10^' : '10^'
+                    log : ['log'],
+                    'e^' : ['e^'],
+                    '10^' : ['10^']
                 },
                 true
             );
diff --git a/threads.js b/threads.js
index edbe2cf..cd33a43 100644
--- a/threads.js
+++ b/threads.js
@@ -2122,14 +2122,14 @@ Process.prototype.reportMonadic = function (fname, n) {
     case 'ln':
         result = Math.log(x);
         break;
-    case 'log':
-        result = 0;
+    case 'log': // base 10
+        result =  Math.log(x) / Math.LN10;
         break;
     case 'e^':
         result = Math.exp(x);
         break;
     case '10^':
-        result = 0;
+        result = Math.pow(10, x);
         break;
     default:
         nop();