Ignore:
Timestamp:
Jun 10, 2002, 1:08:04 PM (23 years ago)
Author:
darin
Message:

JavaScriptCore:

Merged in changes from KDE 3.0.1.

  • kjs/collector.cpp:
  • kjs/date_object.cpp:
  • kjs/function.cpp:
  • kjs/internal.cpp:
  • kjs/lookup.h:
  • kjs/object.cpp:
  • kjs/operations.cpp:
  • kjs/regexp.cpp:
  • kjs/regexp_object.cpp:
  • kjs/regexp_object.h:
  • kjs/string_object.cpp:
  • kjs/testkjs.cpp:
  • kjs/ustring.cpp:
  • kjs/value.cpp:
  • kjs/value.h: Do the merge, and add APPLE_CHANGES as needed to make things compile.
  • kjs/date_object.lut.h: Re-generated.

WebCore:

Merged in changes from KDE 3.0.1.

  • kwq/kdecore/kurl.h:
  • kwq/KWQKURL.mm: (operator==): New, needed by some 3.0.1 code.
  • kwq/qt/qpalette.h: Add QPalette::NColorGroups and QColorGroup::NColorRoles.
  • kwq/KWQPalette.mm: Simplify by getting rid of "private" indirection. (QPalette::color): New, needed by some 3.0.1 code.
  • kwq/KWQColorGroup.mm: Simplify by getting rid of "private" indirection.
  • kwq/qt/qstring.h:
  • kwq/KWQString.mm: (QConstString::QConstString): Change parameter to const QChar * to match Qt so we compile.
  • kwq/qt/qtextedit.h:
  • kwq/KWQTextEdit.mm: (QTextEdit::setTabStopWidth): Add unimplemented placeholder, needed by some 3.0.1 code.
  • kwq/qt/qvaluelist.h:
  • kwq/KWQValueListImpl.h:
  • kwq/KWQValueListImpl.mm: Simplify implementation.
  • WebCore-tests.exp: Update for changes in QValueList implementation.
  • kwq/kdecore/klibloader.h: Add include of <kio/global.h> to make something compile.
  • kwq/khtml/java/kjavaappletcontext.h: Add JType and constructor that takes DCOPObject*.
  • kwq/kio/global.h: Add KIO::CacheControl.
  • khtml/css/css_ruleimpl.cpp:
  • khtml/css/css_ruleimpl.h:
  • khtml/css/css_stylesheetimpl.cpp:
  • khtml/css/css_stylesheetimpl.h:
  • khtml/css/css_valueimpl.cpp:
  • khtml/css/css_valueimpl.h:
  • khtml/css/cssparser.cpp:
  • khtml/css/cssparser.h:
  • khtml/css/cssstyleselector.cpp:
  • khtml/css/cssstyleselector.h:
  • khtml/css/html4.css:
  • khtml/dom/css_rule.cpp:
  • khtml/dom/css_rule.h:
  • khtml/dom/css_stylesheet.cpp:
  • khtml/dom/css_stylesheet.h:
  • khtml/dom/css_value.cpp:
  • khtml/dom/dom2_events.cpp:
  • khtml/dom/dom2_range.cpp:
  • khtml/dom/dom2_range.h:
  • khtml/dom/dom2_views.cpp:
  • khtml/dom/dom_doc.cpp:
  • khtml/dom/dom_element.cpp:
  • khtml/dom/dom_exception.h:
  • khtml/dom/dom_node.cpp:
  • khtml/dom/dom_string.cpp:
  • khtml/dom/dom_text.cpp:
  • khtml/dom/dom_xml.cpp:
  • khtml/dom/html_base.cpp:
  • khtml/dom/html_block.cpp:
  • khtml/dom/html_document.cpp:
  • khtml/dom/html_element.cpp:
  • khtml/dom/html_element.h:
  • khtml/dom/html_form.cpp:
  • khtml/dom/html_head.cpp:
  • khtml/dom/html_image.cpp:
  • khtml/dom/html_inline.cpp:
  • khtml/dom/html_list.cpp:
  • khtml/dom/html_misc.cpp:
  • khtml/dom/html_object.cpp:
  • khtml/dom/html_table.cpp:
  • khtml/ecma/kjs_html.cpp:
  • khtml/ecma/kjs_proxy.cpp:
  • khtml/ecma/kjs_traversal.cpp:
  • khtml/ecma/kjs_window.cpp:
  • khtml/html/html_baseimpl.cpp:
  • khtml/html/html_formimpl.cpp:
  • khtml/html/html_miscimpl.h:
  • khtml/html/html_objectimpl.cpp:
  • khtml/html/html_objectimpl.h:
  • khtml/html/htmlparser.cpp:
  • khtml/html/htmlparser.h:
  • khtml/html/htmltokenizer.cpp:
  • khtml/html/htmltokenizer.h:
  • khtml/khtml_part.cpp:
  • khtml/khtmlpart_p.h:
  • khtml/khtmlview.cpp:
  • khtml/misc/helper.cpp:
  • khtml/misc/khtmllayout.h:
  • khtml/misc/loader.cpp:
  • khtml/misc/loader.h:
  • khtml/misc/loader_client.h:
  • khtml/misc/shared.h: Added.
  • khtml/rendering/bidi.cpp:
  • khtml/rendering/break_lines.cpp:
  • khtml/rendering/font.cpp:
  • khtml/rendering/render_applet.cpp:
  • khtml/rendering/render_applet.h:
  • khtml/rendering/render_container.cpp:
  • khtml/rendering/render_form.cpp:
  • khtml/rendering/render_form.h:
  • khtml/rendering/render_frames.cpp:
  • khtml/rendering/render_image.cpp:
  • khtml/rendering/render_object.cpp:
  • khtml/rendering/render_object.h:
  • khtml/rendering/render_replaced.cpp:
  • khtml/rendering/render_replaced.h:
  • khtml/rendering/render_root.cpp:
  • khtml/rendering/render_style.cpp:
  • khtml/rendering/render_style.h:
  • khtml/rendering/render_table.cpp:
  • khtml/rendering/render_table.h:
  • khtml/rendering/render_text.cpp:
  • khtml/rendering/render_text.h:
  • khtml/xml/dom2_eventsimpl.h:
  • khtml/xml/dom2_rangeimpl.h:
  • khtml/xml/dom2_traversalimpl.cpp:
  • khtml/xml/dom2_traversalimpl.h:
  • khtml/xml/dom2_viewsimpl.h:
  • khtml/xml/dom_docimpl.cpp:
  • khtml/xml/dom_docimpl.h:
  • khtml/xml/dom_elementimpl.h:
  • khtml/xml/dom_nodeimpl.cpp:
  • khtml/xml/dom_nodeimpl.h:
  • khtml/xml/dom_stringimpl.cpp:
  • khtml/xml/dom_stringimpl.h:
  • khtml/xml/xml_tokenizer.h: Merge in 3.0.1 changes and add APPLE_CHANGES as necessary to get it to compile.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/function.cpp

    r1024 r1326  
    370370                                   "0123456789@*_+-./";
    371371
    372   if (id == Eval) { // eval()
     372  switch (id) {
     373  case Eval: { // eval()
    373374    Value x = args[0];
    374375    if (x.type() != StringType)
    … …  
    423424          else
    424425              return Undefined();
    425       } else
     426      } else {
    426427          return c;
    427     }
    428   } else if (id == ParseInt) {
     428      }
     429    }
     430    break;
     431  }
     432  case ParseInt: {
    429433    String str = args[0].toString(exec);
    430434    int radix = args[1].toInt32(exec);
    … …  
    442446    else
    443447        res = Number(static_cast<long>(value)); // remove floating-point part
    444   } else if (id == ParseFloat) {
     448    break;
     449  }
     450  case ParseFloat: {
    445451    String str = args[0].toString(exec);
    446452    res = Number(str.value().toDouble( true /*tolerant*/ ));
    447   } else if (id == IsNaN) {
     453    break;
     454  }
     455  case IsNaN:
    448456    res = Boolean(isNaN(args[0].toNumber(exec)));
    449   } else if (id == IsFinite) {
     457    break;
     458  case IsFinite: {
    450459    Number n = args[0].toNumber(exec);
    451460    res = Boolean(!n.isNaN() && !n.isInf());
    452   } else if (id == Escape) {
     461    break;
     462  }
     463  case Escape: {
    453464    UString r = "", s, str = args[0].toString(exec);
    454465    const UChar *c = str.data();
    … …  
    469480    }
    470481    res = String(r);
    471   } else if (id == UnEscape) {
     482    break;
     483  }
     484  case UnEscape: {
    472485    UString s, str = args[0].toString(exec);
    473486    int k = 0, len = str.size();
    … …  
    489502    }
    490503    res = String(s);
     504    break;
     505  }
    491506  }
    492507
Note: See TracChangeset for help on using the changeset viewer.