Changeset 12028 in webkit for trunk/JavaScriptCore


Ignore:
Timestamp:
Jan 12, 2006, 8:58:46 AM (19 years ago)
Author:
darin
Message:

Reviewed by Geoff.

  • JavaScriptCore.xcodeproj/project.pbxproj: Removed both APPLE_CHANGES and HAVE_CONFIG_H from all targets.
  • README: Removed. This had obsolete information in it and it wasn't clear what to replace it with.
  • kjs/collector.h: Removed an APPLE_CHANGES if around something that's not really platform-specific (although it does use a platform-specific API at the moment).
  • kjs/collector.cpp: Removed a mistaken comment.
  • kjs/grammar.y:
  • kjs/internal.cpp:
  • kjs/object.h:
  • kjs/operations.cpp:
  • kjs/operations.h:
  • kjs/ustring.h: Use APPLE instead of APPLE_CHANGES for code that should be used only on Mac OS X.
  • kjs/interpreter.cpp: Removed APPLE_CHANGES ifdef around the include of the runtime.h header. Even though that header isn't needed at the moment on platforms other than Mac OS X, the conditional stuff should be in the header itself, not in this one client.
  • kjs/math_object.cpp: (MathFuncImp::callAsFunction): Removed some code inside APPLE_CHANGES. I'm pretty sure this code isn't needed on any platform where pow is implemented corrrectly according to the IEEE standard. If it is needed on some, we can add it back with an appropriate #if for the platforms where it is needed.
Location:
trunk/JavaScriptCore
Files:
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r12024 r12028  
     12006-01-12  Darin Adler  <[email protected]>
     2
     3        Reviewed by Geoff.
     4
     5        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6505
     6          retire APPLE_CHANGES from JavaScriptCore
     7
     8        * JavaScriptCore.xcodeproj/project.pbxproj: Removed both
     9        APPLE_CHANGES and HAVE_CONFIG_H from all targets.
     10
     11        * README: Removed. This had obsolete information in it
     12        and it wasn't clear what to replace it with.
     13
     14        * kjs/collector.h: Removed an APPLE_CHANGES if around something
     15        that's not really platform-specific (although it does use a
     16        platform-specific API at the moment).
     17        * kjs/collector.cpp: Removed a mistaken comment.
     18
     19        * kjs/grammar.y:
     20        * kjs/internal.cpp:
     21        * kjs/object.h:
     22        * kjs/operations.cpp:
     23        * kjs/operations.h:
     24        * kjs/ustring.h:
     25        Use __APPLE__ instead of APPLE_CHANGES for code that should be
     26        used only on Mac OS X.
     27
     28        * kjs/interpreter.cpp: Removed APPLE_CHANGES ifdef around the include
     29        of the runtime.h header. Even though that header isn't needed at the
     30        moment on platforms other than Mac OS X, the conditional stuff should
     31        be in the header itself, not in this one client.
     32
     33        * kjs/math_object.cpp: (MathFuncImp::callAsFunction): Removed some
     34        code inside APPLE_CHANGES. I'm pretty sure this code isn't needed on
     35        any platform where pow is implemented corrrectly according to the IEEE
     36        standard. If it is needed on some, we can add it back with an appropriate
     37        #if for the platforms where it is needed.
     38
    1392006-01-12  Justin Haygood  <[email protected]>
    240

  • trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r11962 r12028  
    894894                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
    895895                                GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
    896                                 GCC_PREPROCESSOR_DEFINITIONS = (
    897                                         "$(DEBUG_DEFINES)",
    898                                         APPLE_CHANGES,
    899                                         HAVE_CONFIG_H,
    900                                 );
     896                                GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
    901897                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
    902898                                GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
    … …  
    13371333                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
    13381334                                GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
    1339                                 GCC_PREPROCESSOR_DEFINITIONS = (
    1340                                         "$(DEBUG_DEFINES)",
    1341                                         APPLE_CHANGES,
    1342                                         HAVE_CONFIG_H,
    1343                                 );
     1335                                GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
    13441336                                GCC_STRICT_ALIASING = YES;
    13451337                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
    … …  
    13931385                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
    13941386                                GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
    1395                                 GCC_PREPROCESSOR_DEFINITIONS = (
    1396                                         "$(DEBUG_DEFINES)",
    1397                                         APPLE_CHANGES,
    1398                                         HAVE_CONFIG_H,
    1399                                 );
     1387                                GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
    14001388                                GCC_STRICT_ALIASING = YES;
    14011389                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
    … …  
    14491437                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
    14501438                                GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
    1451                                 GCC_PREPROCESSOR_DEFINITIONS = (
    1452                                         "$(DEBUG_DEFINES)",
    1453                                         APPLE_CHANGES,
    1454                                         HAVE_CONFIG_H,
    1455                                 );
     1439                                GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
    14561440                                GCC_STRICT_ALIASING = YES;
    14571441                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
    … …  
    15051489                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
    15061490                                GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
    1507                                 GCC_PREPROCESSOR_DEFINITIONS = (
    1508                                         "$(DEBUG_DEFINES)",
    1509                                         APPLE_CHANGES,
    1510                                         HAVE_CONFIG_H,
    1511                                 );
     1491                                GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
    15121492                                GCC_STRICT_ALIASING = YES;
    15131493                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;

  • trunk/JavaScriptCore/kjs/collector.cpp

    r11962 r12028  
    643643}
    644644
    645 #endif // APPLE_CHANGES
     645#endif
    646646
    647647} // namespace KJS

  • trunk/JavaScriptCore/kjs/collector.h

    r11962 r12028  
    7070    static size_t numGCNotAllowedObjects();
    7171    static size_t numReferencedObjects();
    72 #if APPLE_CHANGES
    7372    static const void *rootObjectClasses(); // actually returns CFSetRef
    74 #endif
    7573
    7674    class Thread;

  • trunk/JavaScriptCore/kjs/grammar.y

    r12024 r12028  
    3838/* default values for bison */
    3939#define YYDEBUG 0
    40 #if !APPLE_CHANGES
     40#if !__APPLE__ /* work around the fact that YYERROR_VERBOSE causes a compiler warning in bison code */
    4141#define YYERROR_VERBOSE
    4242#endif

  • trunk/JavaScriptCore/kjs/internal.cpp

    r11962 r12028  
    2323
    2424#include "config.h"
    25 #include <stdio.h>
    26 #include <math.h>
    27 #include <assert.h>
     25#include "internal.h"
    2826
    2927#include "array_object.h"
    … …  
    3533#include "error_object.h"
    3634#include "function_object.h"
    37 #include "internal.h"
    3835#include "lexer.h"
    3936#include "math_object.h"
    … …  
    4542#include "regexp_object.h"
    4643#include "string_object.h"
    47 
     44#include <assert.h>
    4845#include <kxmlcore/HashMap.h>
     46#include <math.h>
     47#include <stdio.h>
    4948
    5049#if WIN32
    … …  
    5857namespace KJS {
    5958
    60 #if !APPLE_CHANGES
     59#if !__APPLE__
    6160 
    6261#ifdef WORDS_BIGENDIAN
    … …  
    7473  const double Inf = *(const double*) Inf_Bytes;
    7574 
    76 #endif // APPLE_CHANGES
     75#endif
    7776
    7877// ------------------------------ UndefinedImp ---------------------------------

  • trunk/JavaScriptCore/kjs/interpreter.cpp

    r11962 r12028  
    2424
    2525#include "config.h"
    26 #include "value.h"
    27 #include "object.h"
    28 #include "types.h"
    2926#include "interpreter.h"
    30 #if APPLE_CHANGES
    31 #include "runtime.h"
    32 #endif
    3327
    3428#include <assert.h>
    … …  
    3630#include <stdio.h>
    3731
     32#include "collector.h"
     33#include "context.h"
     34#include "error_object.h"
    3835#include "internal.h"
    39 #include "collector.h"
     36#include "nodes.h"
     37#include "object.h"
    4038#include "operations.h"
    41 #include "error_object.h"
    42 #include "nodes.h"
    43 #include "context.h"
    44 
    45 using namespace KJS;
     39#include "runtime.h"
     40#include "types.h"
     41#include "value.h"
     42
     43namespace KJS {
    4644
    4745// ------------------------------ Context --------------------------------------
    … …  
    367365  return result->interpreter();
    368366}
     367
     368}

  • trunk/JavaScriptCore/kjs/math_object.cpp

    r11962 r12028  
    238238    if (isNaN(arg2))
    239239      result = NaN;
    240 #if !APPLE_CHANGES
    241     else if (arg2 == 0)
    242       result = 1;
    243 #endif
    244240    else if (isNaN(arg) && arg2 != 0)
    245241      result = NaN;
    246 #if !APPLE_CHANGES
    247     else if (::fabs(arg) > 1 && KJS::isPosInf(arg2))
    248       result = Inf;
    249     else if (::fabs(arg) > 1 && KJS::isNegInf(arg2))
    250       result = +0;
    251 #endif
    252242    else if (::fabs(arg) == 1 && KJS::isInf(arg2))
    253243      result = NaN;
    254 #if !APPLE_CHANGES
    255     else if (::fabs(arg) < 1 && KJS::isPosInf(arg2))
    256       result = +0;
    257     else if (::fabs(arg) < 1 && KJS::isNegInf(arg2))
    258       result = Inf;
    259 #endif
    260244    else
    261245      result = ::pow(arg, arg2);

  • trunk/JavaScriptCore/kjs/object.h

    r11962 r12028  
    3030// maximum global call stack size. Protects against accidental or
    3131// malicious infinite recursions. Define to -1 if you want no limit.
    32 #if APPLE_CHANGES
     32#if __APPLE__
    3333// Given OS X stack sizes we run out of stack at about 350 levels.
    3434// If we improve our stack usage, we can bump this number.

  • trunk/JavaScriptCore/kjs/operations.cpp

    r11962 r12028  
    4444namespace KJS {
    4545
    46 #if !APPLE_CHANGES
     46#if !__APPLE__
    4747
    4848bool isNaN(double d)

  • trunk/JavaScriptCore/kjs/operations.h

    r11962 r12028  
    2929  class JSValue;
    3030
    31 #if APPLE_CHANGES
     31#if __APPLE__
    3232  inline bool isNaN(double d) { return isnan(d); }
    3333  inline bool isInf(double d) { return isinf(d); }

  • trunk/JavaScriptCore/kjs/ustring.h

    r11962 r12028  
    2929#include <kxmlcore/PassRefPtr.h>
    3030
    31 #if APPLE_CHANGES
     31#if __APPLE__
    3232#include <sys/types.h>
    3333#ifndef KWQ_UNSIGNED_TYPES_DEFINED
    … …  
    4545namespace DOM {
    4646  class DOMString;
    47 };
     47}
    4848class KJScript;
    4949class QString;
Note: See TracChangeset for help on using the changeset viewer.