Fixed negatives in strtod(); implemented strto[l/ul/ll/ull]().

4 files changed, 306 insertions, 4 deletions

diff --git a/src/library.js b/src/library.js
index 03f23439..3fd96f5b 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3168,7 +3168,16 @@ LibraryManager.library = {
   strtod__deps: ['isspace', 'isdigit'],
   strtod: function(str, endptr) {
     // Skip space.
-    while (_isspace(str)) str++;
+    while (_isspace({{{ makeGetValue('str', 0, 'i8') }}})) str++;
+
+    // Check for a plus/minus sign.
+    var multiplier = 1;
+    if ({{{ makeGetValue('str', 0, 'i8') }}} == '-'.charCodeAt(0)) {
+      multiplier = -1;
+      str++;
+    } else if ({{{ makeGetValue('str', 0, 'i8') }}} == '+'.charCodeAt(0)) {
+      str++;
+    }
 
     var chr;
     var ret = 0;
@@ -3223,8 +3232,94 @@ LibraryManager.library = {
       {{{ makeSetValue('endptr', 0, 'str', '*') }}}
     }
 
+    return ret * multiplier;
+  },
+
+  _parseInt__deps: ['isspace', '__setErrNo', '$ERRNO_CODES'],
+  _parseInt: function(str, endptr, base, min, max, unsignBits) {
+    // Skip space.
+    while (_isspace({{{ makeGetValue('str', 0, 'i8') }}})) str++;
+
+    // Check for a plus/minus sign.
+    var multiplier = 1;
+    if ({{{ makeGetValue('str', 0, 'i8') }}} == '-'.charCodeAt(0)) {
+      multiplier = -1;
+      str++;
+    } else if ({{{ makeGetValue('str', 0, 'i8') }}} == '+'.charCodeAt(0)) {
+      str++;
+    }
+
+    // Find base.
+    var finalBase = base;
+    if (!finalBase) {
+      if ({{{ makeGetValue('str', 0, 'i8') }}} == '0'.charCodeAt(0)) {
+        if ({{{ makeGetValue('str+1', 0, 'i8') }}} == 'x'.charCodeAt(0) ||
+            {{{ makeGetValue('str+1', 0, 'i8') }}} == 'X'.charCodeAt(0)) {
+          finalBase = 16;
+          str += 2;
+        } else {
+          finalBase = 8;
+          str++;
+        }
+      }
+    }
+    if (!finalBase) finalBase = 10;
+
+    // Get digits.
+    var chr;
+    var ret = 0;
+    while ((chr = {{{ makeGetValue('str', 0, 'i8') }}}) != 0) {
+      var digit = parseInt(String.fromCharCode(chr), finalBase);
+      if (isNaN(digit)) {
+        break;
+      } else {
+        ret = ret * finalBase + digit;
+        str++;
+      }
+    }
+
+    // Apply sign.
+    ret *= multiplier;
+
+    // Set end pointer.
+    if (endptr) {
+      {{{ makeSetValue('endptr', 0, 'str', '*') }}}
+    }
+
+    // Unsign if needed.
+    if (unsignBits) {
+      if (Math.abs(ret) > max) {
+        ret = max;
+        ___setErrNo(ERRNO_CODES.ERANGE);
+      } else {
+        ret = unSign(ret, unsignBits);
+      }
+    }
+
+    // Validate range.
+    if (ret > max || ret < min) {
+      ret = ret > max ? max : min;
+      ___setErrNo(ERRNO_CODES.ERANGE);
+    }
+
     return ret;
   },
+  strtoll__deps: ['_parseInt'],
+  strtoll: function(str, endptr, base) {
+    return __parseInt(str, endptr, base, -9223372036854775808, 9223372036854775807);  // LLONG_MIN, LLONG_MAX; imprecise.
+  },
+  strtol__deps: ['_parseInt'],
+  strtol: function(str, endptr, base) {
+    return __parseInt(str, endptr, base, -2147483648, 2147483647);  // LONG_MIN, LONG_MAX.
+  },
+  strtoul__deps: ['_parseInt'],
+  strtoul: function(str, endptr, base) {
+    return __parseInt(str, endptr, base, 0, 4294967295, 32);  // ULONG_MAX.
+  },
+  strtoull__deps: ['_parseInt'],
+  strtoull: function(str, endptr, base) {
+    return __parseInt(str, endptr, base, 0, 18446744073709551615, 64);  // ULONG_MAX; imprecise.
+  },
 
   qsort__deps: ['memcpy'],
   qsort: function(base, num, size, comparator) {
diff --git a/tests/parseInt/output.txt b/tests/parseInt/output.txt
new file mode 100644
index 00000000..f487db74
--- /dev/null
+++ b/tests/parseInt/output.txt
@@ -0,0 +1,134 @@
+strtol("-9223372036854775809") = -2147483648
+ERR 34
+strtoll("-9223372036854775809") = -9223372036854776000
+ERR 34
+strtoul("-9223372036854775809") = 4294967295
+ERR 34
+strtoull("-9223372036854775809") = 9223372036854774000
+
+strtol("-9223372036854775808") = -2147483648
+ERR 34
+strtoll("-9223372036854775808") = -9223372036854776000
+ERR 34
+strtoul("-9223372036854775808") = 4294967295
+ERR 34
+strtoull("-9223372036854775808") = 9223372036854774000
+
+strtol("-9223372036854775807") = -2147483648
+ERR 34
+strtoll("-9223372036854775807") = -9223372036854776000
+ERR 34
+strtoul("-9223372036854775807") = 4294967295
+ERR 34
+strtoull("-9223372036854775807") = 9223372036854774000
+
+strtol("-2147483649") = -2147483648
+ERR 34
+strtoll("-2147483649") = -2147483649
+strtoul("-2147483649") = 2147483647
+strtoull("-2147483649") = 18446744071562068000
+
+strtol("-2147483648") = -2147483648
+strtoll("-2147483648") = -2147483648
+strtoul("-2147483648") = 2147483648
+strtoull("-2147483648") = 18446744071562068000
+
+strtol("-2147483647") = -2147483647
+strtoll("-2147483647") = -2147483647
+strtoul("-2147483647") = 2147483649
+strtoull("-2147483647") = 18446744071562068000
+
+strtol("-5") = -5
+strtoll("-5") = -5
+strtoul("-5") = 4294967291
+strtoull("-5") = 18446744073709552000
+
+strtol("-1") = -1
+strtoll("-1") = -1
+strtoul("-1") = 4294967295
+strtoull("-1") = 18446744073709552000
+
+strtol("0") = 0
+strtoll("0") = 0
+strtoul("0") = 0
+strtoull("0") = 0
+
+strtol("1") = 1
+strtoll("1") = 1
+strtoul("1") = 1
+strtoull("1") = 1
+
+strtol("5") = 5
+strtoll("5") = 5
+strtoul("5") = 5
+strtoull("5") = 5
+
+strtol("2147483646") = 2147483646
+strtoll("2147483646") = 2147483646
+strtoul("2147483646") = 2147483646
+strtoull("2147483646") = 2147483646
+
+strtol("2147483647") = 2147483647
+strtoll("2147483647") = 2147483647
+strtoul("2147483647") = 2147483647
+strtoull("2147483647") = 2147483647
+
+strtol("2147483648") = 2147483647
+ERR 34
+strtoll("2147483648") = 2147483648
+strtoul("2147483648") = 2147483648
+strtoull("2147483648") = 2147483648
+
+strtol("4294967294") = 2147483647
+ERR 34
+strtoll("4294967294") = 4294967294
+strtoul("4294967294") = 4294967294
+strtoull("4294967294") = 4294967294
+
+strtol("4294967295") = 2147483647
+ERR 34
+strtoll("4294967295") = 4294967295
+strtoul("4294967295") = 4294967295
+strtoull("4294967295") = 4294967295
+
+strtol("4294967296") = 2147483647
+ERR 34
+strtoll("4294967296") = 4294967296
+strtoul("4294967296") = 4294967295
+ERR 34
+strtoull("4294967296") = 4294967296
+
+strtol("18446744073709551614") = 2147483647
+ERR 34
+strtoll("18446744073709551614") = 9223372036854776000
+ERR 34
+strtoul("18446744073709551614") = 4294967295
+ERR 34
+strtoull("18446744073709551614") = 18446744073709552000
+
+strtol("18446744073709551615") = 2147483647
+ERR 34
+strtoll("18446744073709551615") = 9223372036854776000
+ERR 34
+strtoul("18446744073709551615") = 4294967295
+ERR 34
+strtoull("18446744073709551615") = 18446744073709552000
+
+strtol("18446744073709551616") = 2147483647
+ERR 34
+strtoll("18446744073709551616") = 9223372036854776000
+ERR 34
+strtoul("18446744073709551616") = 4294967295
+ERR 34
+strtoull("18446744073709551616") = 18446744073709552000
+
+strtol("0x12", 0, 0) = 18
+strtol("0x12", 0, 10) = 0
+strtol("012", 0, 0) = 10
+strtol("012", 0, 10) = 12
+strtol("0y12", 0, 0) = 0
+strtol("hello", 0, 30) = 14167554
+strtol("hello", 0, 10) = 0
+strtol("not-a-number") = 0
+strtol("  0x12end") = 302
+endptr - str = 7
diff --git a/tests/parseInt/src.c b/tests/parseInt/src.c
new file mode 100644
index 00000000..dde15410
--- /dev/null
+++ b/tests/parseInt/src.c
@@ -0,0 +1,64 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
+void check_error() {
+  if (errno) {
+    printf("ERR %d\n", errno);
+    errno = 0;
+  }
+}
+
+int main() {
+  char* test_values[] = {
+    "-9223372036854775809",
+    "-9223372036854775808",
+    "-9223372036854775807",
+    "-2147483649",
+    "-2147483648",
+    "-2147483647",
+    "-5",
+    "-1",
+    "0",
+    "1",
+    "5",
+    "2147483646",
+    "2147483647",
+    "2147483648",
+    "4294967294",
+    "4294967295",
+    "4294967296",
+    "18446744073709551614",
+    "18446744073709551615",
+    "18446744073709551616",
+  };
+
+  for (int i = 0; i < sizeof(test_values) / sizeof(test_values[0]); i++) {
+    printf("strtol(\"%s\") = %ld\n", test_values[i], strtol(test_values[i], 0, 0));
+    check_error();
+    printf("strtoll(\"%s\") = %lld\n", test_values[i], strtoll(test_values[i], 0, 0));
+    check_error();
+    printf("strtoul(\"%s\") = %lu\n", test_values[i], strtoul(test_values[i], 0, 0));
+    check_error();
+    printf("strtoull(\"%s\") = %llu\n", test_values[i], strtoull(test_values[i], 0, 0));
+    check_error();
+    printf("\n");
+  }
+
+  printf("strtol(\"0x12\", 0, 0) = %ld\n", strtol("0x12", 0, 0));
+  printf("strtol(\"0x12\", 0, 10) = %ld\n", strtol("0x12", 0, 10));
+  printf("strtol(\"012\", 0, 0) = %ld\n", strtol("012", 0, 0));
+  printf("strtol(\"012\", 0, 10) = %ld\n", strtol("012", 0, 10));
+  printf("strtol(\"0y12\", 0, 0) = %ld\n", strtol("0y12", 0, 0));
+  printf("strtol(\"hello\", 0, 30) = %ld\n", strtol("hello", 0, 30));
+  printf("strtol(\"hello\", 0, 10) = %ld\n", strtol("hello", 0, 10));
+  printf("strtol(\"not-a-number\") = %ld\n", strtol("not-a-number", 0, 0));
+
+  char str[] = "  0x12end";
+  char* endptr;
+  printf("strtol(\"  0x12end\") = %ld\n", strtol(str, &endptr, 0));
+  printf("endptr - str = %d\n", endptr - str);
+  check_error();
+
+  return 0;
+}
diff --git a/tests/runner.py b/tests/runner.py
index 9b7c8ec9..17efec06 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -2216,6 +2216,7 @@ if 'benchmark' not in sys.argv:
           printf("%g\n", strtod("1.0", &endptr));
           printf("%g\n", strtod("123", &endptr));
           printf("%g\n", strtod("123.456", &endptr));
+          printf("%g\n", strtod("-123.456", &endptr));
           printf("%g\n", strtod("1234567891234567890", &endptr));
           printf("%g\n", strtod("1234567891234567890e+50", &endptr));
           printf("%g\n", strtod("84e+220", &endptr));
@@ -2224,8 +2225,8 @@ if 'benchmark' not in sys.argv:
           printf("%g\n", strtod("123e-250", &endptr));
           printf("%g\n", strtod("123e-450", &endptr));
 
-          char str[] = "12.34e56end";
-          strtod(str, &endptr);
+          char str[] = "  12.34e56end";
+          printf("%g\n", strtod(str, &endptr));
           printf("%d\n", endptr - str);
           return 0;
         }
@@ -2239,6 +2240,7 @@ if 'benchmark' not in sys.argv:
         1
         123
         123.456
+        -123.456
         1.23457e+18
         1.23457e+68
         8.4e+221
@@ -2246,10 +2248,17 @@ if 'benchmark' not in sys.argv:
         1.23e-48
         1.23e-248
         0
-        8
+        1.234e+57
+        10
         '''
       self.do_test(src, re.sub(r'\n\s+', '\n', expected))
 
+    def test_parseInt(self):
+      if USE_TYPED_ARRAYS != 0: return self.skip() # Typed arrays truncate i64.
+      src = open(path_from_root('tests', 'parseInt', 'src.c'), 'r').read()
+      expected = open(path_from_root('tests', 'parseInt', 'output.txt'), 'r').read()
+      self.do_test(src, expected)
+
     def test_printf(self):
       if USE_TYPED_ARRAYS != 0: return self.skip() # Typed arrays truncate i64.
       src = open(path_from_root('tests', 'printf', 'test.c'), 'r').read()