Changeset 798 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Mar 21, 2002, 4:31:57 PM (23 years ago)

Author:

mjs

Message:

Merged changes from LABYRINTH_KDE_3_MERGE branch.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (16 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ +1 @@
+// -*- c-basic-offset: 2 -*-
 /*
  *  This file is part of the KDE libraries
@@ -17 +18 @@
  *  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  *  Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
@@ -35 +38 @@
 #include "ustring.h"
 #include "operations.h"
+#include <math.h>
 
 namespace KJS {
@@ -122 +126 @@
 
 UChar::UChar(const UCharReference &c)
-#ifdef KJS_SWAPPED_CHAR
-  : lo(c.low()), hi(c.high())
-#else
-  : hi(c.high()), lo(c.low())
-#endif
+    : uc( c.unicode() )
 {
 }
@@ -132 +132 @@
 UChar UChar::toLower() const
 {
-  if (islower(lo) && hi == 0)
+  // ### properly supprot unicode tolower
+  if (uc >= 256 || islower(uc))
     return *this;
 
-  return UChar(0, tolower(lo));
+  return UChar(tolower(uc));
 }
 
 UChar UChar::toUpper() const
 {
-  if (isupper(lo) && hi == 0)
+  if (uc >= 256 || isupper(uc))
     return *this;
 
-  return UChar(0, toupper(lo));
+  return UChar(toupper(uc));
 }
 
@@ -237 +238 @@
 {
   char buf[40];
-  sprintf(buf, "%.16g", d);     // does the right thing
+
+  if (d == -0)
+    strcpy(buf,"0");
+  else if (KJS::isNaN(d))
+    strcpy(buf,"NaN");
+  else if (KJS::isPosInf(d))
+    strcpy(buf,"Infinity");
+  else if (KJS::isNegInf(d))
+    strcpy(buf,"-Infinity");
+  else
+    sprintf(buf, "%.16g", d);   // does the right thing
+
+  // ECMA 3rd ed. 9.8.1 9 e: "with no leading zeros"
+  int buflen = strlen(buf);
+  if (buflen >= 4 && buf[buflen-4] == 'e' && buf[buflen-2] == '0') {
+    buf[buflen-2] = buf[buflen-1];
+    buf[buflen-1] = 0;
+  }
+
   return UString(buf);
 }
@@ -265 +284 @@
   statBuffer = new char[size()+1];
   for(int i = 0; i < size(); i++)
-    statBuffer[i] = data()[i].lo;
+    statBuffer[i] = data()[i].low();
   statBuffer[size()] = '\0';
 
@@ -277 +296 @@
   UChar *d = new UChar[l];
   for (int i = 0; i < l; i++)
-    d[i].lo = c[i];
+    d[i].uc = c[i];
   rep = Rep::create(d, l);
 
@@ -287 +306 @@
   str.rep->ref();
   release();
-  rep = str.rep;  
+  rep = str.rep;
 
   return *this;
@@ -301 +320 @@
   const UChar *u = data();
   for(int i = 0; i < size(); i++, u++)
-    if (u->hi)
+    if (u->uc > 0xFF)
       return false;
 
@@ -321 +340 @@
 }
 
-double UString::toDouble() const
+double UString::toDouble( bool tolerant ) const
 {
   double d;
@@ -355 +374 @@
     char *end;
     d = strtod(c, &end);
-    if (d != 0.0 || end != c) {
+    if ((d != 0.0 || end != c) && d != HUGE_VAL && d != -HUGE_VAL) {
       c = end;
     } else {
@@ -376 +395 @@
   while (isspace(*c))
     c++;
-  if (*c != '\0')
+  // don't allow anything after - unless tolerant=true
+  if ( !tolerant && *c != '\0')
     d = NaN;
 
@@ -474 +494 @@
 }
 
-bool KJS::operator==(const UChar &c1, const UChar &c2)
-{
-  return ((c1.lo == c2.lo) & (c1.hi == c2.hi));
-}
-
 bool KJS::operator==(const UString& s1, const UString& s2)
 {
@@ -498 +513 @@
   const UChar *u = s1.data();
   while (*s2) {
-    if (u->lo != *s2 || u->hi != 0)
+    if (u->uc != *s2 )
       return false;
     s2++;
@@ -505 +520 @@
 
   return true;
-}
-
-bool KJS::operator==(const char *s1, const UString& s2)
-{
-  return operator==(s2, s1);
 }