More resilient parseInt behaviour

gfwilliams · gfwilliams · commit 00e5752f3f03 · 2014-03-03T12:20:48.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@
             Add Math.tan()
             Ensure Double/Integer have Number as a prototype (fixes: Number.prototype.n=function();(5.0).n() )
             ||/&& now doesn't use booleans (fix #251)
+            More resilient parseInt behaviour
      
      1v54 : Add 4x6 font (instead of 8x8)
             Fix occasional instability with Waveform read/write
diff --git a/src/jsutils.c b/src/jsutils.c
@@ -58,6 +58,12 @@ const char *escapeCharacter(char ch) {
 
 /* convert a number in the given radix to an int. if radix=0, autodetect */
 JsVarInt stringToIntWithRadix(const char *s, int forceRadix, bool *hasError) {
+
+  // skip whitespace (strange parseInt behaviour)
+  while (isWhitespace(*s)) s++;
+
+  const char *numberStart = s;
+
   bool isNegated = false;
   JsVarInt v = 0;
   JsVarInt radix = 10;
@@ -110,7 +116,8 @@ JsVarInt stringToIntWithRadix(const char *s, int forceRadix, bool *hasError) {
     s++;
   }
 
-  if (hasError) *hasError = *s!=0; // we're ok if we reached the end of the string
+  if (hasError)
+    *hasError = s==numberStart; // we had an error if we didn't manage to parse any chars at all
 
   if (isNegated) return -v;
   return v;
diff --git a/src/jswrap_functions.c b/src/jswrap_functions.c
@@ -82,6 +82,10 @@ JsVar *jswrap_parseInt(JsVar *v, JsVar *radixVar) {
   if (jsvIsNumeric(radixVar))
     radix = (int)jsvGetInteger(radixVar);
 
+  // shortcut for values that are already numbers
+  if ((radix==0 || radix==10) && jsvIsNumeric(v))
+    return jsvNewFromInteger(jsvGetInteger(v));
+  // otherwise convert to string
   char buffer[JS_NUMBER_BUFFER_SIZE];
   jsvGetString(v, buffer, JS_NUMBER_BUFFER_SIZE);
   bool hasError;
