Browse Source

Merge pull request #260 from fvaneijk/whiteSpaceFixes

White space fixes
Sébastien Ros 9 years ago
parent
commit
4d22c4a8c6

+ 2 - 1
Jint/Native/Function/FunctionConstructor.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Jint.Native.Object;
+using Jint.Native.String;
 using Jint.Parser;
 using Jint.Parser.Ast;
 using Jint.Runtime;
@@ -52,7 +53,7 @@ namespace Jint.Native.Function
             var newValues = new string[values.Length];
             for (var i = 0; i < values.Length; i++)
             {
-                newValues[i] = values[i].Trim();
+                newValues[i] = StringPrototype.TrimEx(values[i]);
             }
             return newValues;
         }

+ 3 - 2
Jint/Native/Global/GlobalObject.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text;
 using Jint.Native.Object;
+using Jint.Native.String;
 using Jint.Runtime;
 using Jint.Runtime.Interop;
 
@@ -66,7 +67,7 @@ namespace Jint.Native.Global
         public static JsValue ParseInt(JsValue thisObject, JsValue[] arguments)
         {
             string inputString = TypeConverter.ToString(arguments.At(0));
-            var s = inputString.Trim();
+            var s = StringPrototype.TrimEx(inputString);
 
             var sign = 1;
             if (!System.String.IsNullOrEmpty(s))
@@ -167,7 +168,7 @@ namespace Jint.Native.Global
         public static JsValue ParseFloat(JsValue thisObject, JsValue[] arguments)
         {
             var inputString = TypeConverter.ToString(arguments.At(0));
-            var trimmedString = inputString.TrimStart();
+            var trimmedString = StringPrototype.TrimStartEx(inputString);
 
             var sign = 1;
             if (trimmedString.Length > 0 )

+ 3 - 3
Jint/Native/String/StringPrototype.cs

@@ -85,7 +85,7 @@ namespace Jint.Native.String
                 c == MONGOLIAN_VOWEL_SEPARATOR;
         }
 
-        private static string TrimEndEx(string s)
+        public static string TrimEndEx(string s)
         {
             if (s.Length == 0)
                 return string.Empty;
@@ -104,7 +104,7 @@ namespace Jint.Native.String
                 return string.Empty;
         }
 
-        private static string TrimStartEx(string s)
+        public static string TrimStartEx(string s)
         {
             if (s.Length == 0)
                 return string.Empty;
@@ -123,7 +123,7 @@ namespace Jint.Native.String
                 return s.Substring(i);
         }
 
-        private static string TrimEx(string s)
+        public static string TrimEx(string s)
         {
             return TrimEndEx(TrimStartEx(s));
         } 

+ 2 - 1
Jint/Parser/JavascriptParser.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using Jint.Native.String;
 using Jint.Parser.Ast;
 
 namespace Jint.Parser
@@ -888,7 +889,7 @@ namespace Jint.Parser
             }
             catch (OverflowException)
             {
-                n = number.Trim().StartsWith("-") ? double.NegativeInfinity : double.PositiveInfinity;
+                n = StringPrototype.TrimEx(number).StartsWith("-") ? double.NegativeInfinity : double.PositiveInfinity;
             }
             catch (Exception)
             {

+ 2 - 1
Jint/Runtime/TypeConverter.cs

@@ -6,6 +6,7 @@ using System.Reflection;
 using Jint.Native;
 using Jint.Native.Number;
 using Jint.Native.Object;
+using Jint.Native.String;
 
 namespace Jint.Runtime
 {
@@ -134,7 +135,7 @@ namespace Jint.Runtime
 
             if (o.IsString())
             {
-                var s = o.AsString().Trim();
+                var s = StringPrototype.TrimEx(o.AsString());
 
                 if (String.IsNullOrEmpty(s))
                 {