1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
8398
8399
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
8410
8411
8412
8413
8414
8415
8416
8417
8418
8419
8420
8421
8422
8423
8424
8425
8426
8427
8428
8429
8430
8431
8432
8433
8434
8435
8436
8437
8438
8439
8440
8441
8442
8443
8444
8445
8446
8447
8448
8449
8450
8451
8452
8453
8454
8455
8456
8457
8458
8459
8460
8461
8462
8463
8464
8465
8466
8467
8468
8469
8470
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
8481
8482
8483
8484
8485
8486
8487
8488
8489
8490
8491
8492
8493
8494
8495
8496
8497
8498
8499
8500
8501
8502
8503
8504
8505
8506
8507
8508
8509
8510
8511
8512
8513
8514
8515
8516
8517
8518
8519
8520
8521
8522
8523
8524
8525
8526
8527
8528
8529
8530
8531
8532
8533
8534
8535
8536
8537
8538
8539
8540
8541
8542
8543
8544
8545
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
8556
8557
8558
8559
8560
8561
8562
8563
8564
8565
8566
8567
8568
8569
8570
8571
8572
8573
8574
8575
8576
8577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
8606
8607
8608
8609
8610
8611
8612
8613
8614
8615
8616
8617
8618
8619
8620
8621
8622
8623
8624
8625
8626
8627
8628
8629
8630
8631
8632
8633
8634
8635
8636
8637
8638
8639
8640
8641
8642
8643
8644
8645
8646
8647
8648
8649
8650
8651
8652
8653
8654
8655
8656
8657
8658
8659
8660
8661
8662
8663
8664
8665
8666
8667
8668
8669
8670
8671
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
8682
8683
8684
8685
8686
8687
8688
8689
8690
8691
8692
8693
8694
8695
8696
8697
8698
8699
8700
8701
8702
8703
8704
8705
8706
8707
8708
8709
8710
8711
8712
8713
8714
8715
8716
8717
8718
8719
8720
8721
8722
8723
8724
8725
8726
8727
8728
8729
8730
8731
8732
8733
8734
8735
8736
8737
8738
8739
8740
8741
8742
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
8753
8754
8755
8756
8757
8758
8759
8760
8761
8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
8787
8788
8789
8790
8791
8792
8793
8794
8795
8796
8797
8798
8799
8800
8801
8802
8803
8804
8805
8806
8807
8808
8809
8810
8811
8812
8813
8814
8815
8816
8817
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
8828
8829
8830
8831
8832
8833
8834
8835
8836
8837
8838
8839
8840
8841
8842
8843
8844
8845
8846
8847
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
8858
8859
8860
8861
8862
8863
8864
8865
8866
8867
8868
8869
8870
8871
8872
8873
8874
8875
8876
8877
8878
8879
8880
8881
8882
8883
8884
8885
8886
8887
8888
8889
8890
8891
8892
8893
8894
8895
8896
8897
8898
8899
8900
8901
8902
8903
8904
8905
8906
8907
8908
8909
8910
8911
8912
8913
8914
8915
8916
8917
8918
8919
8920
8921
8922
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
8933
8934
8935
8936
8937
8938
8939
8940
8941
8942
8943
8944
8945
8946
8947
8948
8949
8950
8951
8952
8953
8954
8955
8956
8957
8958
8959
8960
8961
8962
8963
8964
8965
8966
8967
8968
8969
8970
8971
8972
8973
8974
8975
8976
8977
8978
8979
8980
8981
8982
8983
8984
8985
8986
8987
8988
8989
8990
8991
8992
8993
8994
8995
8996
8997
8998
8999
9000
9001
9002
9003
9004
9005
9006
9007
9008
9009
9010
9011
9012
9013
9014
9015
9016
9017
9018
9019
9020
9021
9022
9023
9024
9025
9026
9027
9028
9029
9030
9031
9032
9033
9034
9035
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045
9046
9047
9048
9049
9050
9051
9052
9053
9054
9055
9056
9057
9058
9059
9060
9061
9062
9063
9064
9065
9066
9067
9068
9069
9070
9071
9072
9073
9074
9075
9076
9077
9078
9079
9080
9081
9082
9083
9084
9085
9086
9087
9088
9089
9090
9091
9092
9093
9094
9095
9096
9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
9114
9115
9116
9117
9118
9119
9120
9121
9122
9123
9124
9125
9126
9127
9128
9129
9130
9131
9132
9133
9134
9135
9136
9137
9138
9139
9140
9141
9142
9143
9144
9145
9146
9147
9148
9149
9150
9151
9152
9153
9154
9155
9156
9157
9158
9159
9160
9161
9162
9163
9164
9165
9166
9167
9168
9169
9170
9171
9172
9173
9174
9175
9176
9177
9178
9179
9180
9181
9182
9183
9184
9185
9186
9187
9188
9189
9190
9191
9192
9193
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219
9220
9221
9222
9223
9224
9225
9226
9227
9228
9229
9230
9231
9232
9233
9234
9235
9236
9237
9238
9239
9240
9241
9242
9243
9244
9245
9246
9247
9248
9249
9250
9251
9252
9253
9254
9255
9256
9257
9258
9259
9260
9261
9262
9263
9264
9265
9266
9267
9268
9269
9270
9271
9272
9273
9274
9275
9276
9277
9278
9279
9280
9281
9282
9283
9284
9285
9286
9287
9288
9289
9290
9291
9292
9293
9294
9295
9296
9297
9298
9299
9300
9301
9302
9303
9304
9305
9306
9307
9308
9309
9310
9311
9312
9313
9314
9315
9316
9317
9318
9319
9320
9321
9322
9323
9324
9325
9326
9327
9328
9329
9330
9331
9332
9333
9334
9335
9336
9337
9338
9339
9340
9341
9342
9343
9344
9345
9346
9347
9348
9349
9350
9351
9352
9353
9354
9355
9356
9357
9358
9359
9360
9361
9362
9363
9364
9365
9366
9367
9368
9369
9370
9371
9372
9373
9374
9375
9376
9377
9378
9379
9380
9381
9382
9383
9384
9385
9386
9387
9388
9389
9390
9391
9392
9393
9394
9395
9396
9397
9398
9399
9400
9401
9402
9403
9404
9405
9406
9407
9408
9409
9410
9411
9412
9413
9414
9415
9416
9417
9418
9419
9420
9421
9422
9423
9424
9425
9426
9427
9428
9429
9430
9431
9432
9433
9434
9435
9436
9437
9438
9439
9440
9441
9442
9443
9444
9445
9446
9447
9448
9449
9450
9451
9452
9453
9454
9455
9456
9457
9458
9459
9460
9461
9462
9463
9464
9465
9466
9467
9468
9469
9470
9471
9472
9473
9474
9475
9476
9477
9478
9479
9480
9481
9482
9483
9484
9485
9486
9487
9488
9489
9490
9491
9492
9493
9494
9495
9496
9497
9498
9499
9500
9501
9502
9503
9504
9505
9506
9507
9508
9509
9510
9511
9512
9513
9514
9515
9516
9517
9518
9519
9520
9521
9522
9523
9524
9525
9526
9527
9528
9529
9530
9531
9532
9533
9534
9535
9536
9537
9538
9539
9540
9541
9542
9543
9544
9545
9546
9547
9548
9549
9550
9551
9552
9553
9554
9555
9556
9557
9558
9559
9560
9561
9562
9563
9564
9565
9566
9567
9568
9569
9570
9571
9572
9573
9574
9575
9576
9577
9578
9579
9580
9581
9582
9583
9584
9585
9586
9587
9588
9589
9590
9591
9592
9593
9594
9595
9596
9597
9598
9599
9600
9601
9602
9603
9604
9605
9606
9607
9608
9609
9610
9611
9612
9613
9614
9615
9616
9617
9618
9619
9620
9621
9622
9623
9624
9625
9626
9627
9628
9629
9630
9631
9632
9633
9634
9635
9636
9637
9638
9639
9640
9641
9642
9643
9644
9645
9646
9647
9648
9649
9650
9651
9652
9653
9654
9655
9656
9657
9658
9659
9660
9661
9662
9663
9664
9665
9666
9667
9668
9669
9670
9671
9672
9673
9674
9675
9676
9677
9678
9679
9680
9681
9682
9683
9684
9685
9686
9687
9688
9689
9690
9691
9692
9693
9694
9695
9696
9697
9698
9699
9700
9701
9702
9703
9704
9705
9706
9707
9708
9709
9710
9711
9712
9713
9714
9715
9716
9717
9718
9719
9720
9721
9722
9723
9724
9725
9726
9727
9728
9729
9730
9731
9732
9733
9734
9735
9736
9737
9738
9739
9740
9741
9742
9743
9744
9745
9746
9747
9748
9749
9750
9751
9752
9753
9754
9755
9756
9757
9758
9759
9760
9761
9762
9763
9764
9765
9766
9767
9768
9769
9770
9771
9772
9773
9774
9775
9776
9777
9778
9779
9780
9781
9782
9783
9784
9785
9786
9787
9788
9789
9790
9791
9792
9793
9794
9795
9796
9797
9798
9799
9800
9801
9802
9803
9804
9805
9806
9807
9808
9809
9810
9811
9812
9813
9814
9815
9816
9817
9818
9819
9820
9821
9822
9823
9824
9825
9826
9827
9828
9829
9830
9831
9832
9833
9834
9835
9836
9837
9838
9839
9840
9841
9842
9843
9844
9845
9846
9847
9848
9849
9850
9851
9852
9853
9854
9855
9856
9857
9858
9859
9860
9861
9862
9863
9864
9865
9866
9867
9868
9869
9870
9871
9872
9873
9874
9875
9876
9877
9878
9879
9880
9881
9882
9883
9884
9885
9886
9887
9888
9889
9890
9891
9892
9893
9894
9895
9896
9897
9898
9899
9900
9901
9902
9903
9904
9905
9906
9907
9908
9909
9910
9911
9912
9913
9914
9915
9916
9917
9918
9919
9920
9921
9922
9923
9924
9925
9926
9927
9928
9929
9930
9931
9932
9933
9934
9935
9936
9937
9938
9939
9940
9941
9942
9943
9944
9945
9946
9947
9948
9949
9950
9951
9952
9953
9954
9955
9956
9957
9958
9959
9960
9961
9962
9963
9964
9965
9966
9967
9968
9969
9970
9971
9972
9973
9974
9975
9976
9977
9978
9979
9980
9981
9982
9983
9984
9985
9986
9987
9988
9989
9990
9991
9992
9993
9994
9995
9996
9997
9998
9999
10000
10001
10002
10003
10004
10005
10006
10007
10008
10009
10010
10011
10012
10013
10014
10015
10016
10017
10018
10019
10020
10021
10022
10023
10024
10025
10026
10027
10028
10029
10030
10031
10032
10033
10034
10035
10036
10037
10038
10039
10040
10041
10042
10043
10044
10045
10046
10047
10048
10049
10050
10051
10052
10053
10054
10055
10056
10057
10058
10059
10060
10061
10062
10063
10064
10065
10066
10067
10068
10069
10070
10071
10072
10073
10074
10075
10076
10077
10078
10079
10080
10081
10082
10083
10084
10085
10086
10087
10088
10089
10090
10091
10092
10093
10094
10095
10096
10097
10098
10099
10100
10101
10102
10103
10104
10105
10106
10107
10108
10109
10110
10111
10112
10113
10114
10115
10116
10117
10118
10119
10120
10121
10122
10123
10124
10125
10126
10127
10128
10129
10130
10131
10132
10133
10134
10135
10136
10137
10138
10139
10140
10141
10142
10143
10144
10145
10146
10147
10148
10149
10150
10151
10152
10153
10154
10155
10156
10157
10158
10159
10160
10161
10162
10163
10164
10165
10166
10167
10168
10169
10170
10171
10172
10173
10174
10175
10176
10177
10178
10179
10180
10181
10182
10183
10184
10185
10186
10187
10188
10189
10190
10191
10192
10193
10194
10195
10196
10197
10198
10199
10200
10201
10202
10203
10204
10205
10206
10207
10208
10209
10210
10211
10212
10213
10214
10215
10216
10217
10218
10219
10220
10221
10222
10223
10224
10225
10226
10227
10228
10229
10230
10231
10232
10233
10234
10235
10236
10237
10238
10239
10240
10241
10242
10243
10244
10245
10246
10247
10248
10249
10250
10251
10252
10253
10254
10255
10256
10257
10258
10259
10260
10261
10262
10263
10264
10265
10266
10267
10268
10269
10270
10271
10272
10273
10274
10275
10276
10277
10278
10279
10280
10281
10282
10283
10284
10285
10286
10287
10288
10289
10290
10291
10292
10293
10294
10295
10296
10297
10298
10299
10300
10301
10302
10303
10304
10305
10306
10307
10308
10309
10310
10311
10312
10313
10314
10315
10316
10317
10318
10319
10320
10321
10322
10323
10324
10325
10326
10327
10328
10329
10330
10331
10332
10333
10334
10335
10336
10337
10338
10339
10340
10341
10342
10343
10344
10345
10346
10347
10348
10349
10350
10351
10352
10353
10354
10355
10356
10357
10358
10359
10360
10361
10362
10363
10364
10365
10366
10367
10368
10369
10370
10371
10372
10373
10374
10375
10376
10377
10378
10379
10380
10381
10382
10383
10384
10385
10386
10387
10388
10389
10390
10391
10392
10393
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
10405
10406
10407
10408
10409
10410
10411
10412
10413
10414
10415
10416
10417
10418
10419
10420
10421
10422
10423
10424
10425
10426
10427
10428
10429
10430
10431
10432
10433
10434
10435
10436
10437
10438
10439
10440
10441
10442
10443
10444
10445
10446
10447
10448
10449
10450
10451
10452
10453
10454
10455
10456
10457
10458
10459
10460
10461
10462
10463
10464
10465
10466
10467
10468
10469
10470
10471
10472
10473
10474
10475
10476
10477
10478
10479
10480
10481
10482
10483
10484
10485
10486
10487
10488
10489
10490
10491
10492
10493
10494
10495
10496
10497
10498
10499
10500
10501
10502
10503
10504
10505
10506
10507
10508
10509
10510
10511
10512
10513
10514
10515
10516
10517
10518
10519
10520
10521
10522
10523
10524
10525
10526
10527
10528
10529
10530
10531
10532
10533
10534
10535
10536
10537
10538
10539
10540
10541
10542
10543
10544
10545
10546
10547
10548
10549
10550
10551
10552
10553
10554
10555
10556
10557
10558
10559
10560
10561
10562
10563
10564
10565
10566
10567
10568
10569
10570
10571
10572
10573
10574
10575
10576
10577
10578
10579
10580
10581
10582
10583
10584
10585
10586
10587
10588
10589
10590
10591
10592
10593
10594
10595
10596
10597
10598
10599
10600
10601
10602
10603
10604
10605
10606
10607
10608
10609
10610
10611
10612
10613
10614
10615
10616
10617
10618
10619
10620
10621
10622
10623
10624
10625
10626
10627
10628
10629
10630
10631
10632
10633
10634
10635
10636
10637
10638
10639
10640
10641
10642
10643
10644
10645
10646
10647
10648
10649
10650
10651
10652
10653
10654
10655
10656
10657
10658
10659
10660
10661
10662
10663
10664
10665
10666
10667
10668
10669
10670
10671
10672
10673
10674
10675
10676
10677
10678
10679
10680
10681
10682
10683
10684
10685
10686
10687
10688
10689
10690
10691
10692
10693
10694
10695
10696
10697
10698
10699
10700
10701
10702
10703
10704
10705
10706
10707
10708
10709
10710
10711
10712
10713
10714
10715
10716
10717
10718
10719
10720
10721
10722
10723
10724
10725
10726
10727
10728
10729
10730
10731
10732
10733
10734
10735
10736
10737
10738
10739
10740
10741
10742
10743
10744
10745
10746
10747
10748
10749
10750
10751
10752
10753
10754
10755
10756
10757
10758
10759
10760
10761
10762
10763
10764
10765
10766
10767
10768
10769
10770
10771
10772
10773
10774
10775
10776
10777
10778
10779
10780
10781
10782
10783
10784
10785
10786
10787
10788
10789
10790
10791
10792
10793
10794
10795
10796
10797
10798
10799
10800
10801
10802
10803
10804
10805
10806
10807
10808
10809
10810
10811
10812
10813
10814
10815
10816
10817
10818
10819
10820
10821
10822
10823
10824
10825
10826
10827
10828
10829
10830
10831
10832
10833
10834
10835
10836
10837
10838
10839
10840
10841
10842
10843
10844
10845
10846
10847
10848
10849
10850
10851
10852
10853
10854
10855
10856
10857
10858
10859
10860
10861
10862
10863
10864
10865
10866
10867
10868
10869
10870
10871
10872
10873
10874
10875
10876
10877
10878
10879
10880
10881
10882
10883
10884
10885
10886
10887
10888
10889
10890
10891
10892
10893
10894
10895
10896
10897
10898
10899
10900
10901
10902
10903
10904
10905
10906
10907
10908
10909
10910
10911
10912
10913
10914
10915
10916
10917
10918
10919
10920
10921
10922
10923
10924
10925
10926
10927
10928
10929
10930
10931
10932
10933
10934
10935
10936
10937
10938
10939
10940
10941
10942
10943
10944
10945
10946
10947
10948
10949
10950
10951
10952
10953
10954
10955
10956
10957
10958
10959
10960
10961
10962
10963
10964
10965
10966
10967
10968
10969
10970
10971
10972
10973
10974
10975
10976
10977
10978
10979
10980
10981
10982
10983
10984
10985
10986
10987
10988
10989
10990
10991
10992
10993
10994
10995
10996
10997
10998
10999
11000
11001
11002
11003
11004
11005
11006
11007
11008
11009
11010
11011
11012
11013
11014
11015
11016
11017
11018
11019
11020
11021
11022
11023
11024
11025
11026
11027
11028
11029
11030
11031
11032
11033
11034
11035
11036
11037
11038
11039
11040
11041
11042
11043
11044
11045
11046
11047
11048
11049
11050
11051
11052
11053
11054
11055
11056
11057
11058
11059
11060
11061
11062
11063
11064
11065
11066
11067
11068
11069
11070
11071
11072
11073
11074
11075
11076
11077
11078
11079
11080
11081
11082
11083
11084
11085
11086
11087
11088
11089
11090
11091
11092
11093
11094
11095
11096
11097
11098
11099
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
11110
11111
11112
11113
11114
11115
11116
11117
11118
11119
11120
11121
11122
11123
11124
11125
11126
11127
11128
11129
11130
11131
11132
11133
11134
11135
11136
11137
11138
11139
11140
11141
11142
11143
11144
11145
11146
11147
11148
11149
11150
11151
11152
11153
11154
11155
11156
11157
11158
11159
11160
11161
11162
11163
11164
11165
11166
11167
11168
11169
11170
11171
11172
11173
11174
11175
11176
11177
11178
11179
11180
11181
11182
11183
11184
11185
11186
11187
11188
11189
11190
11191
11192
11193
11194
11195
11196
11197
11198
11199
11200
11201
11202
11203
11204
11205
11206
11207
11208
11209
11210
11211
11212
11213
11214
11215
11216
11217
11218
11219
11220
11221
11222
11223
11224
11225
11226
11227
11228
11229
11230
11231
11232
11233
11234
11235
11236
11237
11238
11239
11240
11241
11242
11243
11244
11245
11246
11247
11248
11249
11250
11251
11252
11253
11254
11255
11256
11257
11258
11259
11260
11261
11262
11263
11264
11265
11266
11267
11268
11269
11270
11271
11272
11273
11274
11275
11276
11277
11278
11279
11280
11281
11282
11283
11284
11285
11286
11287
11288
11289
11290
11291
11292
11293
11294
11295
11296
11297
11298
11299
11300
11301
11302
11303
11304
11305
11306
11307
11308
11309
11310
11311
11312
11313
11314
11315
11316
11317
11318
11319
11320
11321
11322
11323
11324
11325
11326
11327
11328
11329
11330
11331
11332
11333
11334
11335
11336
11337
11338
11339
11340
11341
11342
11343
11344
11345
11346
11347
11348
11349
11350
11351
11352
11353
11354
11355
11356
11357
11358
11359
11360
11361
11362
11363
11364
11365
11366
11367
11368
11369
11370
11371
11372
11373
11374
11375
11376
11377
11378
11379
11380
11381
11382
11383
11384
11385
11386
11387
11388
11389
11390
11391
11392
11393
11394
11395
11396
11397
11398
11399
11400
11401
11402
11403
11404
11405
11406
11407
11408
11409
11410
11411
11412
11413
11414
11415
11416
11417
11418
11419
11420
11421
11422
11423
11424
11425
11426
11427
11428
11429
11430
11431
11432
11433
11434
11435
11436
11437
11438
11439
11440
11441
11442
11443
11444
11445
11446
11447
11448
11449
11450
11451
11452
11453
11454
11455
11456
11457
11458
11459
11460
11461
11462
11463
11464
11465
11466
11467
11468
11469
11470
11471
11472
11473
11474
11475
11476
11477
11478
11479
11480
11481
11482
11483
11484
11485
11486
11487
11488
11489
11490
11491
11492
11493
11494
11495
11496
11497
11498
11499
11500
11501
11502
11503
11504
11505
11506
11507
11508
11509
11510
11511
11512
11513
11514
11515
11516
11517
11518
11519
11520
11521
11522
11523
11524
11525
11526
11527
11528
11529
11530
11531
11532
11533
11534
11535
11536
11537
11538
11539
11540
11541
11542
11543
11544
11545
11546
11547
11548
11549
11550
11551
11552
11553
11554
11555
11556
11557
11558
11559
11560
11561
11562
11563
11564
11565
11566
11567
11568
11569
11570
11571
11572
11573
11574
11575
11576
11577
11578
11579
11580
11581
11582
11583
11584
11585
11586
11587
11588
11589
11590
11591
11592
11593
11594
11595
11596
11597
11598
11599
11600
11601
11602
11603
11604
11605
11606
11607
11608
11609
11610
11611
11612
11613
11614
11615
11616
11617
11618
11619
11620
11621
11622
11623
11624
11625
11626
11627
11628
11629
11630
11631
11632
11633
11634
11635
11636
11637
11638
11639
11640
11641
11642
11643
11644
11645
11646
11647
11648
11649
11650
11651
11652
11653
11654
11655
11656
11657
11658
11659
11660
11661
11662
11663
11664
11665
11666
11667
11668
11669
11670
11671
11672
11673
11674
11675
11676
11677
11678
11679
11680
11681
11682
11683
11684
11685
11686
11687
11688
11689
11690
11691
11692
11693
11694
11695
11696
11697
11698
11699
11700
11701
11702
11703
11704
11705
11706
11707
11708
11709
11710
11711
11712
11713
11714
11715
11716
11717
11718
11719
11720
11721
11722
11723
11724
11725
11726
11727
11728
11729
11730
11731
11732
11733
11734
11735
11736
11737
11738
11739
11740
11741
11742
11743
11744
11745
11746
11747
11748
11749
11750
11751
11752
11753
11754
11755
11756
11757
11758
11759
11760
11761
11762
11763
11764
11765
11766
11767
11768
11769
11770
11771
11772
11773
11774
11775
11776
11777
11778
11779
11780
11781
11782
11783
11784
11785
11786
11787
11788
11789
11790
11791
11792
11793
11794
11795
11796
11797
11798
11799
11800
11801
11802
11803
11804
11805
11806
11807
11808
11809
11810
11811
11812
11813
11814
11815
11816
11817
11818
11819
11820
11821
11822
11823
11824
11825
11826
11827
11828
11829
11830
11831
11832
11833
11834
11835
11836
11837
11838
11839
11840
11841
11842
11843
11844
11845
11846
11847
11848
11849
11850
11851
11852
11853
11854
11855
11856
11857
11858
11859
11860
11861
11862
11863
11864
11865
11866
11867
11868
11869
11870
11871
11872
11873
11874
11875
11876
11877
11878
11879
11880
11881
11882
11883
11884
11885
11886
11887
11888
11889
11890
11891
11892
11893
11894
11895
11896
11897
11898
11899
11900
11901
11902
11903
11904
11905
11906
11907
11908
11909
11910
11911
11912
11913
11914
11915
11916
11917
11918
11919
11920
11921
11922
11923
11924
11925
11926
11927
11928
11929
11930
11931
11932
11933
11934
11935
11936
11937
11938
11939
11940
11941
11942
11943
11944
11945
11946
11947
11948
11949
11950
11951
11952
11953
11954
11955
11956
11957
11958
11959
11960
11961
11962
11963
11964
11965
11966
11967
11968
11969
11970
11971
11972
11973
11974
11975
11976
11977
11978
11979
11980
11981
11982
11983
11984
11985
11986
11987
11988
11989
11990
11991
11992
11993
11994
11995
11996
11997
11998
11999
12000
12001
12002
12003
12004
12005
12006
12007
12008
12009
12010
12011
12012
12013
12014
12015
12016
12017
12018
12019
12020
12021
12022
12023
12024
12025
12026
12027
12028
12029
12030
12031
12032
12033
12034
12035
12036
12037
12038
12039
12040
12041
12042
12043
12044
12045
12046
12047
12048
12049
12050
12051
12052
12053
12054
12055
12056
12057
12058
12059
12060
12061
12062
12063
12064
12065
12066
12067
12068
12069
12070
12071
12072
12073
12074
12075
12076
12077
12078
12079
12080
12081
12082
12083
12084
12085
12086
12087
12088
12089
12090
12091
12092
12093
12094
12095
12096
12097
12098
12099
12100
12101
12102
12103
12104
12105
12106
12107
12108
12109
12110
12111
12112
12113
12114
12115
12116
12117
12118
12119
12120
12121
12122
12123
12124
12125
12126
12127
12128
12129
12130
12131
12132
12133
12134
12135
12136
12137
12138
12139
12140
12141
12142
12143
12144
12145
12146
12147
12148
12149
12150
12151
12152
12153
12154
12155
12156
12157
12158
12159
12160
12161
12162
12163
12164
12165
12166
12167
12168
12169
12170
12171
12172
12173
12174
12175
12176
12177
12178
12179
12180
12181
12182
12183
12184
12185
12186
12187
12188
12189
12190
12191
12192
12193
12194
12195
12196
12197
12198
12199
12200
12201
12202
12203
12204
12205
12206
12207
12208
12209
12210
12211
12212
12213
12214
12215
12216
12217
12218
12219
12220
12221
12222
12223
12224
12225
12226
12227
12228
12229
12230
12231
12232
12233
12234
12235
12236
12237
12238
12239
12240
12241
12242
12243
12244
12245
12246
12247
12248
12249
12250
12251
12252
12253
12254
12255
12256
12257
12258
12259
12260
12261
12262
12263
12264
12265
12266
12267
12268
12269
12270
12271
12272
12273
12274
12275
12276
12277
12278
12279
12280
12281
12282
12283
12284
12285
12286
12287
12288
12289
12290
12291
12292
12293
12294
12295
12296
12297
12298
12299
12300
12301
12302
12303
12304
12305
12306
12307
12308
12309
12310
12311
12312
12313
12314
12315
12316
12317
12318
12319
12320
12321
12322
12323
12324
12325
12326
12327
12328
12329
12330
12331
12332
12333
12334
12335
12336
12337
12338
12339
12340
12341
12342
12343
12344
12345
12346
12347
12348
12349
12350
12351
12352
12353
12354
12355
12356
12357
12358
12359
12360
12361
12362
12363
12364
12365
12366
12367
12368
12369
12370
12371
12372
12373
12374
12375
12376
12377
12378
12379
12380
12381
12382
12383
12384
12385
12386
12387
12388
12389
12390
12391
12392
12393
12394
12395
12396
12397
12398
12399
12400
12401
12402
12403
12404
12405
12406
12407
12408
12409
12410
12411
12412
12413
12414
12415
12416
12417
12418
12419
12420
12421
12422
12423
12424
12425
12426
12427
12428
12429
12430
12431
12432
12433
12434
12435
12436
12437
12438
12439
12440
12441
12442
12443
12444
12445
12446
12447
12448
12449
12450
12451
12452
12453
12454
12455
12456
12457
12458
12459
12460
12461
12462
12463
12464
12465
12466
12467
12468
12469
12470
12471
12472
12473
12474
12475
12476
12477
12478
12479
12480
12481
12482
12483
12484
12485
12486
12487
12488
12489
12490
12491
12492
12493
12494
12495
12496
12497
12498
12499
12500
12501
12502
12503
12504
12505
12506
12507
12508
12509
12510
12511
12512
12513
12514
12515
12516
12517
12518
12519
12520
12521
12522
12523
12524
12525
12526
12527
12528
12529
12530
12531
12532
12533
12534
12535
12536
12537
12538
12539
12540
12541
12542
12543
12544
12545
12546
12547
12548
12549
12550
12551
12552
12553
12554
12555
12556
12557
12558
12559
12560
12561
12562
12563
12564
12565
12566
12567
12568
12569
12570
12571
12572
12573
12574
12575
12576
12577
12578
12579
12580
12581
12582
12583
12584
12585
12586
12587
12588
12589
12590
12591
12592
12593
12594
12595
12596
12597
12598
12599
12600
12601
12602
12603
12604
12605
12606
12607
12608
12609
12610
12611
12612
12613
12614
12615
12616
12617
12618
12619
12620
12621
12622
12623
12624
12625
12626
12627
12628
12629
12630
12631
12632
12633
12634
12635
12636
12637
12638
12639
12640
12641
12642
12643
12644
12645
12646
12647
12648
12649
12650
12651
12652
12653
12654
12655
12656
12657
12658
12659
12660
12661
12662
12663
12664
12665
12666
12667
12668
12669
12670
12671
12672
12673
12674
12675
12676
12677
12678
12679
12680
12681
12682
12683
12684
12685
12686
12687
12688
12689
12690
12691
12692
12693
12694
12695
12696
12697
12698
12699
12700
12701
12702
12703
12704
12705
12706
12707
12708
12709
12710
12711
12712
12713
12714
12715
12716
12717
12718
12719
12720
12721
12722
12723
12724
12725
12726
12727
12728
12729
12730
12731
12732
12733
12734
12735
12736
12737
12738
12739
12740
12741
12742
12743
12744
12745
12746
12747
12748
12749
12750
12751
12752
12753
12754
12755
12756
12757
12758
12759
12760
12761
12762
12763
12764
12765
12766
12767
12768
12769
12770
12771
12772
12773
12774
12775
12776
12777
12778
12779
12780
12781
12782
12783
12784
12785
12786
12787
12788
12789
12790
12791
12792
12793
12794
12795
12796
12797
12798
12799
12800
12801
12802
12803
12804
12805
12806
12807
12808
12809
12810
12811
12812
12813
12814
12815
12816
12817
12818
12819
12820
12821
12822
12823
12824
12825
12826
12827
12828
12829
12830
12831
12832
12833
12834
12835
12836
12837
12838
12839
12840
12841
12842
12843
12844
12845
12846
12847
12848
12849
12850
12851
12852
12853
12854
12855
12856
12857
12858
12859
12860
12861
12862
12863
12864
12865
12866
12867
12868
12869
12870
12871
12872
12873
12874
12875
12876
12877
12878
12879
12880
12881
12882
12883
12884
12885
12886
12887
12888
12889
12890
12891
12892
12893
12894
12895
12896
12897
12898
12899
12900
12901
12902
12903
12904
12905
12906
12907
12908
12909
12910
12911
12912
12913
12914
12915
12916
12917
12918
12919
12920
12921
12922
12923
12924
12925
12926
12927
12928
12929
12930
12931
12932
12933
12934
12935
12936
12937
12938
12939
12940
12941
12942
12943
12944
12945
12946
12947
12948
12949
12950
12951
12952
12953
12954
12955
12956
12957
12958
12959
12960
12961
12962
12963
12964
12965
12966
12967
12968
12969
12970
12971
12972
12973
12974
12975
12976
12977
12978
12979
12980
12981
12982
12983
12984
12985
12986
12987
12988
12989
12990
12991
12992
12993
12994
12995
12996
12997
12998
12999
13000
13001
13002
13003
13004
13005
13006
13007
13008
13009
13010
13011
13012
13013
13014
13015
13016
13017
13018
13019
13020
13021
13022
13023
13024
13025
13026
13027
13028
13029
13030
13031
13032
13033
13034
13035
13036
13037
13038
13039
13040
13041
13042
13043
13044
13045
13046
13047
13048
13049
13050
13051
13052
13053
13054
13055
13056
13057
13058
13059
13060
13061
13062
13063
13064
13065
13066
13067
13068
13069
13070
13071
13072
13073
13074
13075
13076
13077
13078
13079
13080
13081
13082
13083
13084
13085
13086
13087
13088
13089
13090
13091
13092
13093
13094
13095
13096
13097
13098
13099
13100
13101
13102
13103
13104
13105
13106
13107
13108
13109
13110
13111
13112
13113
13114
13115
13116
13117
13118
13119
13120
13121
13122
13123
13124
13125
13126
13127
13128
13129
13130
13131
13132
13133
13134
13135
13136
13137
13138
13139
13140
13141
13142
13143
13144
13145
13146
13147
13148
13149
13150
13151
13152
13153
13154
13155
13156
13157
13158
13159
13160
13161
13162
13163
13164
13165
13166
13167
13168
13169
13170
13171
13172
13173
13174
13175
13176
13177
13178
13179
13180
13181
13182
13183
13184
13185
13186
13187
13188
13189
13190
13191
13192
13193
13194
13195
13196
13197
13198
13199
13200
13201
13202
13203
13204
13205
13206
13207
13208
13209
13210
13211
13212
13213
13214
13215
13216
13217
13218
13219
13220
13221
13222
13223
13224
13225
13226
13227
13228
13229
13230
13231
13232
13233
13234
13235
13236
13237
13238
13239
13240
13241
13242
13243
13244
13245
13246
13247
13248
13249
13250
13251
13252
13253
13254
13255
13256
13257
13258
13259
13260
13261
13262
13263
13264
13265
13266
13267
13268
13269
13270
13271
13272
13273
13274
13275
13276
13277
13278
13279
13280
13281
13282
13283
13284
13285
13286
13287
13288
13289
13290
13291
13292
13293
13294
13295
13296
13297
13298
13299
13300
13301
13302
13303
13304
13305
13306
13307
13308
13309
13310
13311
13312
13313
13314
13315
13316
13317
13318
13319
13320
13321
13322
13323
13324
13325
13326
13327
13328
13329
13330
13331
13332
13333
13334
13335
13336
13337
13338
13339
13340
13341
13342
13343
13344
13345
13346
13347
13348
13349
13350
13351
13352
13353
13354
13355
13356
13357
13358
13359
13360
13361
13362
13363
13364
13365
13366
13367
13368
13369
13370
13371
13372
13373
13374
13375
13376
13377
13378
13379
13380
13381
13382
13383
13384
13385
13386
13387
13388
13389
13390
13391
13392
13393
13394
13395
13396
13397
13398
13399
13400
13401
13402
13403
13404
13405
13406
13407
13408
13409
13410
13411
13412
13413
13414
13415
13416
13417
13418
13419
13420
13421
13422
13423
13424
13425
13426
13427
13428
13429
13430
13431
13432
13433
13434
13435
13436
13437
13438
13439
13440
13441
13442
13443
13444
13445
13446
13447
13448
13449
13450
13451
13452
13453
13454
13455
13456
13457
13458
13459
13460
13461
13462
13463
13464
13465
13466
13467
13468
13469
13470
13471
13472
13473
13474
13475
13476
13477
13478
13479
13480
13481
13482
13483
13484
13485
13486
13487
13488
13489
13490
13491
13492
13493
13494
13495
13496
13497
13498
13499
13500
13501
13502
13503
13504
13505
13506
13507
13508
13509
13510
13511
13512
13513
13514
13515
13516
13517
13518
13519
13520
13521
13522
13523
13524
13525
13526
13527
13528
13529
13530
13531
13532
13533
13534
13535
13536
13537
13538
13539
13540
13541
13542
13543
13544
13545
13546
13547
13548
13549
13550
13551
13552
13553
13554
13555
13556
13557
13558
13559
13560
13561
13562
13563
13564
13565
13566
13567
13568
13569
13570
13571
13572
13573
13574
13575
13576
13577
13578
13579
13580
13581
13582
13583
13584
13585
13586
13587
13588
13589
13590
13591
13592
13593
13594
13595
13596
13597
13598
13599
13600
13601
13602
13603
13604
13605
13606
13607
13608
13609
13610
13611
13612
13613
13614
13615
13616
13617
13618
13619
13620
13621
13622
13623
13624
13625
13626
13627
13628
13629
13630
13631
13632
13633
13634
13635
13636
13637
13638
13639
13640
13641
13642
13643
13644
13645
13646
13647
13648
13649
13650
13651
13652
13653
13654
13655
13656
13657
13658
13659
13660
13661
13662
13663
13664
13665
13666
13667
13668
13669
13670
13671
13672
13673
13674
13675
13676
13677
13678
13679
13680
13681
13682
13683
13684
13685
13686
13687
13688
13689
13690
13691
13692
13693
13694
13695
13696
13697
13698
13699
13700
13701
13702
13703
13704
13705
13706
13707
13708
13709
13710
13711
13712
13713
13714
13715
13716
13717
13718
13719
13720
13721
13722
13723
13724
13725
13726
13727
13728
13729
13730
13731
13732
13733
13734
13735
13736
13737
13738
13739
13740
13741
13742
13743
13744
13745
13746
13747
13748
13749
13750
13751
13752
13753
13754
13755
13756
13757
13758
13759
13760
13761
13762
13763
13764
13765
13766
13767
13768
13769
13770
13771
13772
13773
13774
13775
13776
13777
13778
13779
13780
13781
13782
13783
13784
13785
13786
13787
13788
13789
13790
13791
13792
13793
13794
13795
13796
13797
13798
13799
13800
13801
13802
13803
13804
13805
13806
13807
13808
13809
13810
13811
13812
13813
13814
13815
13816
13817
13818
13819
13820
13821
13822
13823
13824
13825
13826
13827
13828
13829
13830
13831
13832
13833
13834
13835
13836
13837
13838
13839
13840
13841
13842
13843
13844
13845
13846
13847
13848
13849
13850
13851
13852
13853
13854
13855
13856
13857
13858
13859
13860
13861
13862
13863
13864
13865
13866
13867
13868
13869
13870
13871
13872
13873
13874
13875
13876
13877
13878
13879
13880
13881
13882
13883
13884
13885
13886
13887
13888
13889
13890
13891
13892
13893
13894
13895
13896
13897
13898
13899
13900
13901
13902
13903
13904
13905
13906
13907
13908
13909
13910
13911
13912
13913
13914
13915
13916
13917
13918
13919
13920
13921
13922
13923
13924
13925
13926
13927
13928
13929
13930
13931
13932
13933
13934
13935
13936
13937
13938
13939
13940
13941
13942
13943
13944
13945
13946
13947
13948
13949
13950
13951
13952
13953
13954
13955
13956
13957
13958
13959
13960
13961
13962
13963
13964
13965
13966
13967
13968
13969
13970
13971
13972
13973
13974
13975
13976
13977
13978
13979
13980
13981
13982
13983
13984
13985
13986
13987
13988
13989
13990
13991
13992
13993
13994
13995
13996
13997
13998
13999
14000
14001
14002
14003
14004
14005
14006
14007
14008
14009
14010
14011
14012
14013
14014
14015
14016
14017
14018
14019
14020
14021
14022
14023
14024
14025
14026
14027
14028
14029
14030
14031
14032
14033
14034
14035
14036
14037
14038
14039
14040
14041
14042
14043
14044
14045
14046
14047
14048
14049
14050
14051
14052
14053
14054
14055
14056
14057
14058
14059
14060
14061
14062
14063
14064
14065
14066
14067
14068
14069
14070
14071
14072
14073
14074
14075
14076
14077
14078
14079
14080
14081
14082
14083
14084
14085
14086
14087
14088
14089
14090
14091
14092
14093
14094
14095
14096
14097
14098
14099
14100
14101
14102
14103
14104
14105
14106
14107
14108
14109
14110
14111
14112
14113
14114
14115
14116
14117
14118
14119
14120
14121
14122
14123
14124
14125
14126
14127
14128
14129
14130
14131
14132
14133
14134
14135
14136
14137
14138
14139
14140
14141
14142
14143
14144
14145
14146
14147
14148
14149
14150
14151
14152
14153
14154
14155
14156
14157
14158
14159
14160
14161
14162
14163
14164
14165
14166
14167
14168
14169
14170
14171
14172
14173
14174
14175
14176
14177
14178
14179
14180
14181
14182
14183
14184
14185
14186
14187
14188
14189
14190
14191
14192
14193
14194
14195
14196
14197
14198
14199
14200
14201
14202
14203
14204
14205
14206
14207
14208
14209
14210
14211
14212
14213
14214
14215
14216
14217
14218
14219
14220
14221
14222
14223
14224
14225
14226
14227
14228
14229
14230
14231
14232
14233
14234
14235
14236
14237
14238
14239
14240
14241
14242
14243
14244
14245
14246
14247
14248
14249
14250
14251
14252
14253
14254
14255
14256
14257
14258
14259
14260
14261
14262
14263
14264
14265
14266
14267
14268
14269
14270
14271
14272
14273
14274
14275
14276
14277
14278
14279
14280
14281
14282
14283
14284
14285
14286
14287
14288
14289
14290
14291
14292
14293
14294
14295
14296
14297
14298
14299
14300
14301
14302
14303
14304
14305
14306
14307
14308
14309
14310
14311
14312
14313
14314
14315
14316
14317
14318
14319
14320
14321
14322
14323
14324
14325
14326
14327
14328
14329
14330
14331
14332
14333
14334
14335
14336
14337
14338
14339
14340
14341
14342
14343
14344
14345
14346
14347
14348
14349
14350
14351
14352
14353
14354
14355
14356
14357
14358
14359
14360
14361
14362
14363
14364
14365
14366
14367
14368
14369
14370
14371
14372
14373
14374
14375
14376
14377
14378
14379
14380
14381
14382
14383
14384
14385
14386
14387
14388
14389
14390
14391
14392
14393
14394
14395
14396
14397
14398
14399
14400
14401
14402
14403
14404
14405
14406
14407
14408
14409
14410
14411
14412
14413
14414
14415
14416
14417
14418
14419
14420
14421
14422
14423
14424
14425
14426
14427
14428
14429
14430
14431
14432
14433
14434
14435
14436
14437
14438
14439
14440
14441
14442
14443
14444
14445
14446
14447
14448
14449
14450
14451
14452
14453
14454
14455
14456
14457
14458
14459
14460
14461
14462
14463
14464
14465
14466
14467
14468
14469
14470
14471
14472
14473
14474
14475
14476
14477
14478
14479
14480
14481
14482
14483
14484
14485
14486
14487
14488
14489
14490
14491
14492
14493
14494
14495
14496
14497
14498
14499
14500
14501
14502
14503
14504
14505
14506
14507
14508
14509
14510
14511
14512
14513
14514
14515
14516
14517
14518
14519
14520
14521
14522
14523
14524
14525
14526
14527
14528
14529
14530
14531
14532
14533
14534
14535
14536
14537
14538
14539
14540
14541
14542
14543
14544
14545
14546
14547
14548
14549
14550
14551
14552
14553
14554
14555
14556
14557
14558
14559
14560
14561
14562
14563
14564
14565
14566
14567
14568
14569
14570
14571
14572
14573
14574
14575
14576
14577
14578
14579
14580
14581
14582
14583
14584
14585
14586
14587
14588
14589
14590
14591
14592
14593
14594
14595
14596
14597
14598
14599
14600
14601
14602
14603
14604
14605
14606
14607
14608
14609
14610
14611
14612
14613
14614
14615
14616
14617
14618
14619
14620
14621
14622
14623
14624
14625
14626
14627
14628
14629
14630
14631
14632
14633
14634
14635
14636
14637
14638
14639
14640
14641
14642
14643
14644
14645
14646
14647
14648
14649
14650
14651
14652
14653
14654
14655
14656
14657
14658
14659
14660
14661
14662
14663
14664
14665
14666
14667
14668
14669
14670
14671
14672
14673
14674
14675
14676
14677
14678
14679
14680
14681
14682
14683
14684
14685
14686
14687
14688
14689
14690
14691
14692
14693
14694
14695
14696
14697
14698
14699
14700
14701
14702
14703
14704
14705
14706
14707
14708
14709
14710
14711
14712
14713
14714
14715
14716
14717
14718
14719
14720
14721
14722
14723
14724
14725
14726
14727
14728
14729
14730
14731
14732
14733
14734
14735
14736
14737
14738
14739
14740
14741
14742
14743
14744
14745
14746
14747
14748
14749
14750
14751
14752
14753
14754
14755
14756
14757
14758
14759
14760
14761
14762
14763
14764
14765
14766
14767
14768
14769
14770
14771
14772
14773
14774
14775
14776
14777
14778
14779
14780
14781
14782
14783
14784
14785
14786
14787
14788
14789
14790
14791
14792
14793
14794
14795
14796
14797
14798
14799
14800
14801
14802
14803
14804
14805
14806
14807
14808
14809
14810
14811
14812
14813
14814
14815
14816
14817
14818
14819
14820
14821
14822
14823
14824
14825
14826
14827
14828
14829
14830
14831
14832
14833
14834
14835
14836
14837
14838
14839
14840
14841
14842
14843
14844
14845
14846
14847
14848
14849
14850
14851
14852
14853
14854
14855
14856
14857
14858
14859
14860
14861
14862
14863
14864
14865
14866
14867
14868
14869
14870
14871
14872
14873
14874
14875
14876
14877
14878
14879
14880
14881
14882
14883
14884
14885
14886
14887
14888
14889
14890
14891
14892
14893
14894
14895
14896
14897
14898
14899
14900
14901
14902
14903
14904
14905
14906
14907
14908
14909
14910
14911
14912
14913
14914
14915
14916
14917
14918
14919
14920
14921
14922
14923
14924
14925
14926
14927
14928
14929
14930
14931
14932
14933
14934
14935
14936
14937
14938
14939
14940
14941
14942
14943
14944
14945
14946
14947
14948
14949
14950
14951
14952
14953
14954
14955
14956
14957
14958
14959
14960
14961
14962
14963
14964
14965
14966
14967
14968
14969
14970
14971
14972
14973
14974
14975
14976
14977
14978
14979
14980
14981
14982
14983
14984
14985
14986
14987
14988
14989
14990
14991
14992
14993
14994
14995
14996
14997
14998
14999
15000
15001
15002
15003
15004
15005
15006
15007
15008
15009
15010
15011
15012
15013
15014
15015
15016
15017
15018
15019
15020
15021
15022
15023
15024
15025
15026
15027
15028
15029
15030
15031
15032
15033
15034
15035
15036
15037
15038
15039
15040
15041
15042
15043
15044
15045
15046
15047
15048
15049
15050
15051
15052
15053
15054
15055
15056
15057
15058
15059
15060
15061
15062
15063
15064
15065
15066
15067
15068
15069
15070
15071
15072
15073
15074
15075
15076
15077
15078
15079
15080
15081
15082
15083
15084
15085
15086
15087
15088
15089
15090
15091
15092
15093
15094
15095
15096
15097
15098
15099
15100
15101
15102
15103
15104
15105
15106
15107
15108
15109
15110
15111
15112
15113
15114
15115
15116
15117
15118
15119
15120
15121
15122
15123
15124
15125
15126
15127
15128
15129
15130
15131
15132
15133
15134
15135
15136
15137
15138
15139
15140
15141
15142
15143
15144
15145
15146
15147
15148
15149
15150
15151
15152
15153
15154
15155
15156
15157
15158
15159
15160
15161
15162
15163
15164
15165
15166
15167
15168
15169
15170
15171
15172
15173
15174
15175
15176
15177
15178
15179
15180
15181
15182
15183
15184
15185
15186
15187
15188
15189
15190
15191
15192
15193
15194
15195
15196
15197
15198
15199
15200
15201
15202
15203
15204
15205
15206
15207
15208
15209
15210
15211
15212
15213
15214
15215
15216
15217
15218
15219
15220
15221
15222
15223
15224
15225
15226
15227
15228
15229
15230
15231
15232
15233
15234
15235
15236
15237
15238
15239
15240
15241
15242
15243
15244
15245
15246
15247
15248
15249
15250
15251
15252
15253
15254
15255
15256
15257
15258
15259
15260
15261
15262
15263
15264
15265
15266
15267
15268
15269
15270
15271
15272
15273
15274
15275
15276
15277
15278
15279
15280
15281
15282
15283
15284
15285
15286
15287
15288
15289
15290
15291
15292
15293
15294
15295
15296
15297
15298
15299
15300
15301
15302
15303
15304
15305
15306
15307
15308
15309
15310
15311
15312
15313
15314
15315
15316
15317
15318
15319
15320
15321
15322
15323
15324
15325
15326
15327
15328
15329
15330
15331
15332
15333
15334
15335
15336
15337
15338
15339
15340
15341
15342
15343
15344
15345
15346
15347
15348
15349
15350
15351
15352
15353
15354
15355
15356
15357
15358
15359
15360
15361
15362
15363
15364
15365
15366
15367
15368
15369
15370
15371
15372
15373
15374
15375
15376
15377
15378
15379
15380
15381
15382
15383
15384
15385
15386
15387
15388
15389
15390
15391
15392
15393
15394
15395
15396
15397
15398
15399
15400
15401
15402
15403
15404
15405
15406
15407
15408
15409
15410
15411
15412
15413
15414
15415
15416
15417
15418
15419
15420
15421
15422
15423
15424
15425
15426
15427
15428
15429
15430
15431
15432
15433
15434
15435
15436
15437
15438
15439
15440
15441
15442
15443
15444
15445
15446
15447
15448
15449
15450
15451
15452
15453
15454
15455
15456
15457
15458
15459
15460
15461
15462
15463
15464
15465
15466
15467
15468
15469
15470
15471
15472
15473
15474
15475
15476
15477
15478
15479
15480
15481
15482
15483
15484
15485
15486
15487
15488
15489
15490
15491
15492
15493
15494
15495
15496
15497
15498
15499
15500
15501
15502
15503
15504
15505
15506
15507
15508
15509
15510
15511
15512
15513
15514
15515
15516
15517
15518
15519
15520
15521
15522
15523
15524
15525
15526
15527
15528
15529
15530
15531
15532
15533
15534
15535
15536
15537
15538
15539
15540
15541
15542
15543
15544
15545
15546
15547
15548
15549
15550
15551
15552
15553
15554
15555
15556
15557
15558
15559
15560
15561
15562
15563
15564
15565
15566
15567
15568
15569
15570
15571
15572
15573
15574
15575
15576
15577
15578
15579
15580
15581
15582
15583
15584
15585
15586
15587
15588
15589
15590
15591
15592
15593
15594
15595
15596
15597
15598
15599
15600
15601
15602
15603
15604
15605
15606
15607
15608
15609
15610
15611
15612
15613
15614
15615
15616
15617
15618
15619
15620
15621
15622
15623
15624
15625
15626
15627
15628
15629
15630
15631
15632
15633
15634
15635
15636
15637
15638
15639
15640
15641
15642
15643
15644
15645
15646
15647
15648
15649
15650
15651
15652
15653
15654
15655
15656
15657
15658
15659
15660
15661
15662
15663
15664
15665
15666
15667
15668
15669
15670
15671
15672
15673
15674
15675
15676
15677
15678
15679
15680
15681
15682
15683
15684
15685
15686
15687
15688
15689
15690
15691
15692
15693
15694
15695
15696
15697
15698
15699
15700
15701
15702
15703
15704
15705
15706
15707
15708
15709
15710
15711
15712
15713
15714
15715
15716
15717
15718
15719
15720
15721
15722
15723
15724
15725
15726
15727
15728
15729
15730
15731
15732
15733
15734
15735
15736
15737
15738
15739
15740
15741
15742
15743
15744
15745
15746
15747
15748
15749
15750
15751
15752
15753
15754
15755
15756
15757
15758
15759
15760
15761
15762
15763
15764
15765
15766
15767
15768
15769
15770
15771
15772
15773
15774
15775
15776
15777
15778
15779
15780
15781
15782
15783
15784
15785
15786
15787
15788
15789
15790
15791
15792
15793
15794
15795
15796
15797
15798
15799
15800
15801
15802
15803
15804
15805
15806
15807
15808
15809
15810
15811
15812
15813
15814
15815
15816
15817
15818
15819
15820
15821
15822
15823
15824
15825
15826
15827
15828
15829
15830
15831
15832
15833
15834
15835
15836
15837
15838
15839
15840
15841
15842
15843
15844
15845
15846
15847
15848
15849
15850
15851
15852
15853
15854
15855
15856
15857
15858
15859
15860
15861
15862
15863
15864
15865
15866
15867
15868
15869
15870
15871
15872
15873
15874
15875
15876
15877
15878
15879
15880
15881
15882
15883
15884
15885
15886
15887
15888
15889
15890
15891
15892
15893
15894
15895
15896
15897
15898
15899
15900
15901
15902
15903
15904
15905
15906
15907
15908
15909
15910
15911
15912
15913
15914
15915
15916
15917
15918
15919
15920
15921
15922
15923
15924
15925
15926
15927
15928
15929
15930
15931
15932
15933
15934
15935
15936
15937
15938
15939
15940
15941
15942
15943
15944
15945
15946
15947
15948
15949
15950
15951
15952
15953
15954
15955
15956
15957
15958
15959
15960
15961
15962
15963
15964
15965
15966
15967
15968
15969
15970
15971
15972
15973
15974
15975
15976
15977
15978
15979
15980
15981
15982
15983
15984
15985
15986
15987
15988
15989
15990
15991
15992
15993
15994
15995
15996
15997
15998
15999
16000
16001
16002
16003
16004
16005
16006
16007
16008
16009
16010
16011
16012
16013
16014
16015
16016
16017
16018
16019
16020
16021
16022
16023
16024
16025
16026
16027
16028
16029
16030
16031
16032
16033
16034
16035
16036
16037
16038
16039
16040
16041
16042
16043
16044
16045
16046
16047
16048
16049
16050
16051
16052
16053
16054
16055
16056
16057
16058
16059
16060
16061
16062
16063
16064
16065
16066
16067
16068
16069
16070
16071
16072
16073
16074
16075
16076
16077
16078
16079
16080
16081
16082
16083
16084
16085
16086
16087
16088
16089
16090
16091
16092
16093
16094
16095
16096
16097
16098
16099
16100
16101
16102
16103
16104
16105
16106
16107
16108
16109
16110
16111
16112
16113
16114
16115
16116
16117
16118
16119
16120
16121
16122
16123
16124
16125
16126
16127
16128
16129
16130
16131
16132
16133
16134
16135
16136
16137
16138
16139
16140
16141
16142
16143
16144
16145
16146
16147
16148
16149
16150
16151
16152
16153
16154
16155
16156
16157
16158
16159
16160
16161
16162
16163
16164
16165
16166
16167
16168
16169
16170
16171
16172
16173
16174
16175
16176
16177
16178
16179
16180
16181
16182
16183
16184
16185
16186
16187
16188
16189
16190
16191
16192
16193
16194
16195
16196
16197
16198
16199
16200
16201
16202
16203
16204
16205
16206
16207
16208
16209
16210
16211
16212
16213
16214
16215
16216
16217
16218
16219
16220
16221
16222
16223
16224
16225
16226
16227
16228
16229
16230
16231
16232
16233
16234
16235
16236
16237
16238
16239
16240
16241
16242
16243
16244
16245
16246
16247
16248
16249
16250
16251
16252
16253
16254
16255
16256
16257
16258
16259
16260
16261
16262
16263
16264
16265
16266
16267
16268
16269
16270
16271
16272
16273
16274
16275
16276
16277
16278
16279
16280
16281
16282
16283
16284
16285
16286
16287
16288
16289
16290
16291
16292
16293
16294
16295
16296
16297
16298
16299
16300
16301
16302
16303
16304
16305
16306
16307
16308
16309
16310
16311
16312
16313
16314
16315
16316
16317
16318
16319
16320
16321
16322
16323
16324
16325
16326
16327
16328
16329
16330
16331
16332
16333
16334
16335
16336
16337
16338
16339
16340
16341
16342
16343
16344
16345
16346
16347
16348
16349
16350
16351
16352
16353
16354
16355
16356
16357
16358
16359
16360
16361
16362
16363
16364
16365
16366
16367
16368
16369
16370
16371
16372
16373
16374
16375
16376
16377
16378
16379
16380
16381
16382
16383
16384
16385
16386
16387
16388
16389
16390
16391
16392
16393
16394
16395
16396
16397
16398
16399
16400
16401
16402
16403
16404
16405
16406
16407
16408
16409
16410
16411
16412
16413
16414
16415
16416
16417
16418
16419
16420
16421
16422
16423
16424
16425
16426
16427
16428
16429
16430
16431
16432
16433
16434
16435
16436
16437
16438
16439
16440
16441
16442
16443
16444
16445
16446
16447
16448
16449
16450
16451
16452
16453
16454
16455
16456
16457
16458
16459
16460
16461
16462
16463
16464
16465
16466
16467
16468
16469
16470
16471
16472
16473
16474
16475
16476
16477
16478
16479
16480
16481
16482
16483
16484
16485
16486
16487
16488
16489
16490
16491
16492
16493
16494
16495
16496
16497
16498
16499
16500
16501
16502
16503
16504
16505
16506
16507
16508
16509
16510
16511
16512
16513
16514
16515
16516
16517
16518
16519
16520
16521
16522
16523
16524
16525
16526
16527
16528
16529
16530
16531
16532
16533
16534
16535
16536
16537
16538
16539
16540
16541
16542
16543
16544
16545
16546
16547
16548
16549
16550
16551
16552
16553
16554
16555
16556
16557
16558
16559
16560
16561
16562
16563
16564
16565
16566
16567
16568
16569
16570
16571
16572
16573
16574
16575
16576
16577
16578
16579
16580
16581
16582
16583
16584
16585
16586
16587
16588
16589
16590
16591
16592
16593
16594
16595
16596
16597
16598
16599
16600
16601
16602
16603
16604
16605
16606
16607
16608
16609
16610
16611
16612
16613
16614
16615
16616
16617
16618
16619
16620
16621
16622
16623
16624
16625
16626
16627
16628
16629
16630
16631
16632
16633
16634
16635
16636
16637
16638
16639
16640
16641
16642
16643
16644
16645
16646
16647
16648
16649
16650
16651
16652
16653
16654
16655
16656
16657
16658
16659
16660
16661
16662
16663
16664
16665
16666
16667
16668
16669
16670
16671
16672
16673
16674
16675
16676
16677
16678
16679
16680
16681
16682
16683
16684
16685
16686
16687
16688
16689
16690
16691
16692
16693
16694
16695
16696
16697
16698
16699
16700
16701
16702
16703
16704
16705
16706
16707
16708
16709
16710
16711
16712
16713
16714
16715
16716
16717
16718
16719
16720
16721
16722
16723
16724
16725
16726
16727
16728
16729
16730
16731
16732
16733
16734
16735
16736
16737
16738
16739
16740
16741
16742
16743
16744
16745
16746
16747
16748
16749
16750
16751
16752
16753
16754
16755
16756
16757
16758
16759
16760
16761
16762
16763
16764
16765
16766
16767
16768
16769
16770
16771
16772
16773
16774
16775
16776
16777
16778
16779
16780
16781
16782
16783
16784
16785
16786
16787
16788
16789
16790
16791
16792
16793
16794
16795
16796
16797
16798
16799
16800
16801
16802
16803
16804
16805
16806
16807
16808
16809
16810
16811
16812
16813
16814
16815
16816
16817
16818
16819
16820
16821
16822
16823
16824
16825
16826
16827
16828
16829
16830
16831
16832
16833
16834
16835
16836
16837
16838
16839
16840
16841
16842
16843
16844
16845
16846
16847
16848
16849
16850
16851
16852
16853
16854
16855
16856
16857
16858
16859
16860
16861
16862
16863
16864
16865
16866
16867
16868
16869
16870
16871
16872
16873
16874
16875
16876
16877
16878
16879
16880
16881
16882
16883
16884
16885
16886
16887
16888
16889
16890
16891
16892
16893
16894
16895
16896
16897
16898
16899
16900
16901
16902
16903
16904
16905
16906
16907
16908
16909
16910
16911
16912
16913
16914
16915
16916
16917
16918
16919
16920
16921
16922
16923
16924
16925
16926
16927
16928
16929
16930
16931
16932
16933
16934
16935
16936
16937
16938
16939
16940
16941
16942
16943
16944
16945
16946
16947
16948
16949
16950
16951
16952
16953
16954
16955
16956
16957
16958
16959
16960
16961
16962
16963
16964
16965
16966
16967
16968
16969
16970
16971
16972
16973
16974
16975
16976
16977
16978
16979
16980
16981
16982
16983
16984
16985
16986
16987
16988
16989
16990
16991
16992
16993
16994
16995
16996
16997
16998
16999
17000
17001
17002
17003
17004
17005
17006
17007
17008
17009
17010
17011
17012
17013
17014
17015
17016
17017
17018
17019
17020
17021
17022
17023
17024
17025
17026
17027
17028
17029
17030
17031
17032
17033
17034
17035
17036
17037
17038
17039
17040
17041
17042
17043
17044
17045
17046
17047
17048
17049
17050
17051
17052
17053
17054
17055
17056
17057
17058
17059
17060
17061
17062
17063
17064
17065
17066
17067
17068
17069
17070
17071
17072
17073
17074
17075
17076
17077
17078
17079
17080
17081
17082
17083
17084
17085
17086
17087
17088
17089
17090
17091
17092
17093
17094
17095
17096
17097
17098
17099
17100
17101
17102
17103
17104
17105
17106
17107
17108
17109
17110
17111
17112
17113
17114
17115
17116
17117
17118
17119
17120
17121
17122
17123
17124
17125
17126
17127
17128
17129
17130
17131
17132
17133
17134
17135
17136
17137
17138
17139
17140
17141
17142
17143
17144
17145
17146
17147
17148
17149
17150
17151
17152
17153
17154
17155
17156
17157
17158
17159
17160
17161
17162
17163
17164
17165
17166
17167
17168
17169
17170
17171
17172
17173
17174
17175
17176
17177
17178
17179
17180
17181
17182
17183
17184
17185
17186
17187
17188
17189
17190
17191
17192
17193
17194
17195
17196
17197
17198
17199
17200
17201
17202
17203
17204
17205
17206
17207
17208
17209
17210
17211
17212
17213
17214
17215
17216
17217
17218
17219
17220
17221
17222
17223
17224
17225
17226
17227
17228
17229
17230
17231
17232
17233
17234
17235
17236
17237
17238
17239
17240
17241
17242
17243
17244
17245
17246
17247
17248
17249
17250
17251
17252
17253
17254
17255
17256
17257
17258
17259
17260
17261
17262
17263
17264
17265
17266
17267
17268
17269
17270
17271
17272
17273
17274
17275
17276
17277
17278
17279
17280
17281
17282
17283
17284
17285
17286
17287
17288
17289
17290
17291
17292
17293
17294
17295
17296
17297
17298
17299
17300
17301
17302
17303
17304
17305
17306
17307
17308
17309
17310
17311
17312
17313
17314
17315
17316
17317
17318
17319
17320
17321
17322
17323
17324
17325
17326
17327
17328
17329
17330
17331
17332
17333
17334
17335
17336
17337
17338
17339
17340
17341
17342
17343
17344
17345
17346
17347
17348
17349
17350
17351
17352
17353
17354
17355
17356
17357
17358
17359
17360
17361
17362
17363
17364
17365
17366
17367
17368
17369
17370
17371
17372
17373
17374
17375
17376
17377
17378
17379
17380
17381
17382
17383
17384
17385
17386
17387
17388
17389
17390
17391
17392
17393
17394
17395
17396
17397
17398
17399
17400
17401
17402
17403
17404
17405
17406
17407
17408
17409
17410
17411
17412
17413
17414
17415
17416
17417
17418
17419
17420
17421
17422
17423
17424
17425
17426
17427
17428
17429
17430
17431
17432
17433
17434
17435
17436
17437
17438
17439
17440
17441
17442
17443
17444
17445
17446
17447
17448
17449
17450
17451
17452
17453
17454
17455
17456
17457
17458
17459
17460
17461
17462
17463
17464
17465
17466
17467
17468
17469
17470
17471
17472
17473
17474
17475
17476
17477
17478
17479
17480
17481
17482
17483
17484
17485
17486
17487
17488
17489
17490
17491
17492
17493
17494
17495
17496
17497
17498
17499
17500
17501
17502
17503
17504
17505
17506
17507
17508
17509
17510
17511
17512
17513
17514
17515
17516
17517
17518
17519
17520
17521
17522
17523
17524
17525
17526
17527
17528
17529
17530
17531
17532
17533
17534
17535
17536
17537
17538
17539
17540
17541
17542
17543
17544
17545
17546
17547
17548
17549
17550
17551
17552
17553
17554
17555
17556
17557
17558
17559
17560
17561
17562
17563
17564
17565
17566
17567
17568
17569
17570
17571
17572
17573
17574
17575
17576
17577
17578
17579
17580
17581
17582
17583
17584
17585
17586
17587
17588
17589
17590
17591
17592
17593
17594
17595
17596
17597
17598
17599
17600
17601
17602
17603
17604
17605
17606
17607
17608
17609
17610
17611
17612
17613
17614
17615
17616
17617
17618
17619
17620
17621
17622
17623
17624
17625
17626
17627
17628
17629
17630
17631
17632
17633
17634
17635
17636
17637
17638
17639
17640
17641
17642
17643
17644
17645
17646
17647
17648
17649
17650
17651
17652
17653
17654
17655
17656
17657
17658
17659
17660
17661
17662
17663
17664
17665
17666
17667
17668
17669
17670
17671
17672
17673
17674
17675
17676
17677
17678
17679
17680
17681
17682
17683
17684
17685
17686
17687
17688
17689
17690
17691
17692
17693
17694
17695
17696
17697
17698
17699
17700
17701
17702
17703
17704
17705
17706
17707
17708
17709
17710
17711
17712
17713
17714
17715
17716
17717
17718
17719
17720
17721
17722
17723
17724
17725
17726
17727
17728
17729
17730
17731
17732
17733
17734
17735
17736
17737
17738
17739
17740
17741
17742
17743
17744
17745
17746
17747
17748
17749
17750
17751
17752
17753
17754
17755
17756
17757
17758
17759
17760
17761
17762
17763
17764
17765
17766
17767
17768
17769
17770
17771
17772
17773
17774
17775
17776
17777
17778
17779
17780
17781
17782
17783
17784
17785
17786
17787
17788
17789
17790
17791
17792
17793
17794
17795
17796
17797
17798
17799
17800
17801
17802
17803
17804
17805
17806
17807
17808
17809
17810
17811
17812
17813
17814
17815
17816
17817
17818
17819
17820
17821
17822
17823
17824
17825
17826
17827
17828
17829
17830
17831
17832
17833
17834
17835
17836
17837
17838
17839
17840
17841
17842
17843
17844
17845
17846
17847
17848
17849
17850
17851
17852
17853
17854
17855
17856
17857
17858
17859
17860
17861
17862
17863
17864
17865
17866
17867
17868
17869
17870
17871
17872
17873
17874
17875
17876
17877
17878
17879
17880
17881
17882
17883
17884
17885
17886
17887
17888
17889
17890
17891
17892
17893
17894
17895
17896
17897
17898
17899
17900
17901
17902
17903
17904
17905
17906
17907
17908
17909
17910
17911
17912
17913
17914
17915
17916
17917
17918
17919
17920
17921
17922
17923
17924
17925
17926
17927
17928
17929
17930
17931
17932
17933
17934
17935
17936
17937
17938
17939
17940
17941
17942
17943
17944
17945
17946
17947
17948
17949
17950
17951
17952
17953
17954
17955
17956
17957
17958
17959
17960
17961
17962
17963
17964
17965
17966
17967
17968
17969
17970
17971
17972
17973
17974
17975
17976
17977
17978
17979
17980
17981
17982
17983
17984
17985
17986
17987
17988
17989
17990
17991
17992
17993
17994
17995
17996
17997
17998
17999
18000
18001
18002
18003
18004
18005
18006
18007
18008
18009
18010
18011
18012
18013
18014
18015
18016
18017
18018
18019
18020
18021
18022
18023
18024
18025
18026
18027
18028
18029
18030
18031
18032
18033
18034
18035
18036
18037
18038
18039
18040
18041
18042
18043
18044
18045
18046
18047
18048
18049
18050
18051
18052
18053
18054
18055
18056
18057
18058
18059
18060
18061
18062
18063
18064
18065
18066
18067
18068
18069
18070
18071
18072
18073
18074
18075
18076
18077
18078
18079
18080
18081
18082
18083
18084
18085
18086
18087
18088
18089
18090
18091
18092
18093
18094
18095
18096
18097
18098
18099
18100
18101
18102
18103
18104
18105
18106
18107
18108
18109
18110
18111
18112
18113
18114
18115
18116
18117
18118
18119
18120
18121
18122
18123
18124
18125
18126
18127
18128
18129
18130
18131
18132
18133
18134
18135
18136
18137
18138
18139
18140
18141
18142
18143
18144
18145
18146
18147
18148
18149
18150
18151
18152
18153
18154
18155
18156
18157
18158
18159
18160
18161
18162
18163
18164
18165
18166
18167
18168
18169
18170
18171
18172
18173
18174
18175
18176
18177
18178
18179
18180
18181
18182
18183
18184
18185
18186
18187
18188
18189
18190
18191
18192
18193
18194
18195
18196
18197
18198
18199
18200
18201
18202
18203
18204
18205
18206
18207
18208
18209
18210
18211
18212
18213
18214
18215
18216
18217
18218
18219
18220
18221
18222
18223
18224
18225
18226
18227
18228
18229
18230
18231
18232
18233
18234
18235
18236
18237
18238
18239
18240
18241
18242
18243
18244
18245
18246
18247
18248
18249
18250
18251
18252
18253
18254
18255
18256
18257
18258
18259
18260
18261
18262
18263
18264
18265
18266
18267
18268
18269
18270
18271
18272
18273
18274
18275
18276
18277
18278
18279
18280
18281
18282
18283
18284
18285
18286
18287
18288
18289
18290
18291
18292
18293
18294
18295
18296
18297
18298
18299
18300
18301
18302
18303
18304
18305
18306
18307
18308
18309
18310
18311
18312
18313
18314
18315
18316
18317
18318
18319
18320
18321
18322
18323
18324
18325
18326
18327
18328
18329
18330
18331
18332
18333
18334
18335
18336
18337
18338
18339
18340
18341
18342
18343
18344
18345
18346
18347
18348
18349
18350
18351
18352
18353
18354
18355
18356
18357
18358
18359
18360
18361
18362
18363
18364
18365
18366
18367
18368
18369
18370
18371
18372
18373
18374
18375
18376
18377
18378
18379
18380
18381
18382
18383
18384
18385
18386
18387
18388
18389
18390
18391
18392
18393
18394
18395
18396
18397
18398
18399
18400
18401
18402
18403
18404
18405
18406
18407
18408
18409
18410
18411
18412
18413
18414
18415
18416
18417
18418
18419
18420
18421
18422
18423
18424
18425
18426
18427
18428
18429
18430
18431
18432
18433
18434
18435
18436
18437
18438
18439
18440
18441
18442
18443
18444
18445
18446
18447
18448
18449
18450
18451
18452
18453
18454
18455
18456
18457
18458
18459
18460
18461
18462
18463
18464
18465
18466
18467
18468
18469
18470
18471
18472
18473
18474
18475
18476
18477
18478
18479
18480
18481
18482
18483
18484
18485
18486
18487
18488
18489
18490
18491
18492
18493
18494
18495
18496
18497
18498
18499
18500
18501
18502
18503
18504
18505
18506
18507
18508
18509
18510
18511
18512
18513
18514
18515
18516
18517
18518
18519
18520
18521
18522
18523
18524
18525
18526
18527
18528
18529
18530
18531
18532
18533
18534
18535
18536
18537
18538
18539
18540
18541
18542
18543
18544
18545
18546
18547
18548
18549
18550
18551
18552
18553
18554
18555
18556
18557
18558
18559
18560
18561
18562
18563
18564
18565
18566
18567
18568
18569
18570
18571
18572
18573
18574
18575
18576
18577
18578
18579
18580
18581
18582
18583
18584
18585
18586
18587
18588
18589
18590
18591
18592
18593
18594
18595
18596
18597
18598
18599
18600
18601
18602
18603
18604
18605
18606
18607
18608
18609
18610
18611
18612
18613
18614
18615
18616
18617
18618
18619
18620
18621
18622
18623
18624
18625
18626
18627
18628
18629
18630
18631
18632
18633
18634
18635
18636
18637
18638
18639
18640
18641
18642
18643
18644
18645
18646
18647
18648
18649
18650
18651
18652
18653
18654
18655
18656
18657
18658
18659
18660
18661
18662
18663
18664
18665
18666
18667
18668
18669
18670
18671
18672
18673
18674
18675
18676
18677
18678
18679
18680
18681
18682
18683
18684
18685
18686
18687
18688
18689
18690
18691
18692
18693
18694
18695
18696
18697
18698
18699
18700
18701
18702
18703
18704
18705
18706
18707
18708
18709
18710
18711
18712
18713
18714
18715
18716
18717
18718
18719
18720
18721
18722
18723
18724
18725
18726
18727
18728
18729
18730
18731
18732
18733
18734
18735
18736
18737
18738
18739
18740
18741
18742
18743
18744
18745
18746
18747
18748
18749
18750
18751
18752
18753
18754
18755
18756
18757
18758
18759
18760
18761
18762
18763
18764
18765
18766
18767
18768
18769
18770
18771
18772
18773
18774
18775
18776
18777
18778
18779
18780
18781
18782
18783
18784
18785
18786
18787
18788
18789
18790
18791
18792
18793
18794
18795
18796
18797
18798
18799
18800
18801
18802
18803
18804
18805
18806
18807
18808
18809
18810
18811
18812
18813
18814
18815
18816
18817
18818
18819
18820
18821
18822
18823
18824
18825
18826
18827
18828
18829
18830
18831
18832
18833
18834
18835
18836
18837
18838
18839
18840
18841
18842
18843
18844
18845
18846
18847
18848
18849
18850
18851
18852
18853
18854
18855
18856
18857
18858
18859
18860
18861
18862
18863
18864
18865
18866
18867
18868
18869
18870
18871
18872
18873
18874
18875
18876
18877
18878
18879
18880
18881
18882
18883
18884
18885
18886
18887
18888
18889
18890
18891
18892
18893
18894
18895
18896
18897
18898
18899
18900
18901
18902
18903
18904
18905
18906
18907
18908
18909
18910
18911
18912
18913
18914
18915
18916
18917
18918
18919
18920
18921
18922
18923
18924
18925
18926
18927
18928
18929
18930
18931
18932
18933
18934
18935
18936
18937
18938
18939
18940
18941
18942
18943
18944
18945
18946
18947
18948
18949
18950
18951
18952
18953
18954
18955
18956
18957
18958
18959
18960
18961
18962
18963
18964
18965
18966
18967
18968
18969
18970
18971
18972
18973
18974
18975
18976
18977
18978
18979
18980
18981
18982
18983
18984
18985
18986
18987
18988
18989
18990
18991
18992
18993
18994
18995
18996
18997
18998
18999
19000
19001
19002
19003
19004
19005
19006
19007
19008
19009
19010
19011
19012
19013
19014
19015
19016
19017
19018
19019
19020
19021
19022
19023
19024
19025
19026
19027
19028
19029
19030
19031
19032
19033
19034
19035
19036
19037
19038
19039
19040
19041
19042
19043
19044
19045
19046
19047
19048
19049
19050
19051
19052
19053
19054
19055
19056
19057
19058
19059
19060
19061
19062
19063
19064
19065
19066
19067
19068
19069
19070
19071
19072
19073
19074
19075
19076
19077
19078
19079
19080
19081
19082
19083
19084
19085
19086
19087
19088
19089
19090
19091
19092
19093
19094
19095
19096
19097
19098
19099
19100
19101
19102
19103
19104
19105
19106
19107
19108
19109
19110
19111
19112
19113
19114
19115
19116
19117
19118
19119
19120
19121
19122
19123
19124
19125
19126
19127
19128
19129
19130
19131
19132
19133
19134
19135
19136
19137
19138
19139
19140
19141
19142
19143
19144
19145
19146
19147
19148
19149
19150
19151
19152
19153
19154
19155
19156
19157
19158
19159
19160
19161
19162
19163
19164
19165
19166
19167
19168
19169
19170
19171
19172
19173
19174
19175
19176
19177
19178
19179
19180
19181
19182
19183
19184
19185
19186
19187
19188
19189
19190
19191
19192
19193
19194
19195
19196
19197
19198
19199
19200
19201
19202
19203
19204
19205
19206
19207
19208
19209
19210
19211
19212
19213
19214
19215
19216
19217
19218
19219
19220
19221
19222
19223
19224
19225
19226
19227
19228
19229
19230
19231
19232
19233
19234
19235
19236
19237
19238
19239
19240
19241
19242
19243
19244
19245
19246
19247
19248
19249
19250
19251
19252
19253
19254
19255
19256
19257
19258
19259
19260
19261
19262
19263
19264
19265
19266
19267
19268
19269
19270
19271
19272
19273
19274
19275
19276
19277
19278
19279
19280
19281
19282
19283
19284
19285
19286
19287
19288
19289
19290
19291
19292
19293
19294
19295
19296
19297
19298
19299
19300
19301
19302
19303
19304
19305
19306
19307
19308
19309
19310
19311
19312
19313
19314
19315
19316
19317
19318
19319
19320
19321
19322
19323
19324
19325
19326
19327
19328
19329
19330
19331
19332
19333
19334
19335
19336
19337
19338
19339
19340
19341
19342
19343
19344
19345
19346
19347
19348
19349
19350
19351
19352
19353
19354
19355
19356
19357
19358
19359
19360
19361
19362
19363
19364
19365
19366
19367
19368
19369
19370
19371
19372
19373
19374
19375
19376
19377
19378
19379
19380
19381
19382
19383
19384
19385
19386
19387
19388
19389
19390
19391
19392
19393
19394
19395
19396
19397
19398
19399
19400
19401
19402
19403
19404
19405
19406
19407
19408
19409
19410
19411
19412
19413
19414
19415
19416
19417
19418
19419
19420
19421
19422
19423
19424
19425
19426
19427
19428
19429
19430
19431
19432
19433
19434
19435
19436
19437
19438
19439
19440
19441
19442
19443
19444
19445
19446
19447
19448
19449
19450
19451
19452
19453
19454
19455
19456
19457
19458
19459
19460
19461
19462
19463
19464
19465
19466
19467
19468
19469
19470
19471
19472
19473
19474
19475
19476
19477
19478
19479
19480
19481
19482
19483
19484
19485
19486
19487
19488
19489
19490
19491
19492
19493
19494
19495
19496
19497
19498
19499
19500
19501
19502
19503
19504
19505
19506
19507
19508
19509
19510
19511
19512
19513
19514
19515
19516
19517
19518
19519
19520
19521
19522
19523
19524
19525
19526
19527
19528
19529
19530
19531
19532
19533
19534
19535
19536
19537
19538
19539
19540
19541
19542
19543
19544
19545
19546
19547
19548
19549
19550
19551
19552
19553
19554
19555
19556
19557
19558
19559
19560
19561
19562
19563
19564
19565
19566
19567
19568
19569
19570
19571
19572
19573
19574
19575
19576
19577
19578
19579
19580
19581
19582
19583
19584
19585
19586
19587
19588
19589
19590
19591
19592
19593
19594
19595
19596
19597
19598
19599
19600
19601
19602
19603
19604
19605
19606
19607
19608
19609
19610
19611
19612
19613
19614
19615
19616
19617
19618
19619
19620
19621
19622
19623
19624
19625
19626
19627
19628
19629
19630
19631
19632
19633
19634
19635
19636
19637
19638
19639
19640
19641
19642
19643
19644
19645
19646
19647
19648
19649
19650
19651
19652
19653
19654
19655
19656
19657
19658
19659
19660
19661
19662
19663
19664
19665
19666
19667
19668
19669
19670
19671
19672
19673
19674
19675
19676
19677
19678
19679
19680
19681
19682
19683
19684
19685
19686
19687
19688
19689
19690
19691
19692
19693
19694
19695
19696
19697
19698
19699
19700
19701
19702
19703
19704
19705
19706
19707
19708
19709
19710
19711
19712
19713
19714
19715
19716
19717
19718
19719
19720
19721
19722
19723
19724
19725
19726
19727
19728
19729
19730
19731
19732
19733
19734
19735
19736
19737
19738
19739
19740
19741
19742
19743
19744
19745
19746
19747
19748
19749
19750
19751
19752
19753
19754
19755
19756
19757
19758
19759
19760
19761
19762
19763
19764
19765
19766
19767
19768
19769
19770
19771
19772
19773
19774
19775
19776
19777
19778
19779
19780
19781
19782
19783
19784
19785
19786
19787
19788
19789
19790
19791
19792
19793
19794
19795
19796
19797
19798
19799
19800
19801
19802
19803
19804
19805
19806
19807
19808
19809
19810
19811
19812
19813
19814
19815
19816
19817
19818
19819
19820
19821
19822
19823
19824
19825
19826
19827
19828
19829
19830
19831
19832
19833
19834
19835
19836
19837
19838
19839
19840
19841
19842
19843
19844
19845
19846
19847
19848
19849
19850
19851
19852
19853
19854
19855
19856
19857
19858
19859
19860
19861
19862
19863
19864
19865
19866
19867
19868
19869
19870
19871
19872
19873
19874
19875
19876
19877
19878
19879
19880
19881
19882
19883
19884
19885
19886
19887
19888
19889
19890
19891
19892
19893
19894
19895
19896
19897
19898
19899
19900
19901
19902
19903
19904
19905
19906
19907
19908
19909
19910
19911
19912
19913
19914
19915
19916
19917
19918
19919
19920
19921
19922
19923
19924
19925
19926
19927
19928
19929
19930
19931
19932
19933
19934
19935
19936
19937
19938
19939
19940
19941
19942
19943
19944
19945
19946
19947
19948
19949
19950
19951
19952
19953
19954
19955
19956
19957
19958
19959
19960
19961
19962
19963
19964
19965
19966
19967
19968
19969
19970
19971
19972
19973
19974
19975
19976
19977
19978
19979
19980
19981
19982
19983
19984
19985
19986
19987
19988
19989
19990
19991
19992
19993
19994
19995
19996
19997
19998
19999
20000
20001
20002
20003
20004
20005
20006
20007
20008
20009
20010
20011
20012
20013
20014
20015
20016
20017
20018
20019
20020
20021
20022
20023
20024
20025
20026
20027
20028
20029
20030
20031
20032
20033
20034
20035
20036
20037
20038
20039
20040
20041
20042
20043
20044
20045
20046
20047
20048
20049
20050
20051
20052
20053
20054
20055
20056
20057
20058
20059
20060
20061
20062
20063
20064
20065
20066
20067
20068
20069
20070
20071
20072
20073
20074
20075
20076
20077
20078
20079
20080
20081
20082
20083
20084
20085
20086
20087
20088
20089
20090
20091
20092
20093
20094
20095
20096
20097
20098
20099
20100
20101
20102
20103
20104
20105
20106
20107
20108
20109
20110
20111
20112
20113
20114
20115
20116
20117
20118
20119
20120
20121
20122
20123
20124
20125
20126
20127
20128
20129
20130
20131
20132
20133
20134
20135
20136
20137
20138
20139
20140
20141
20142
20143
20144
20145
20146
20147
20148
20149
20150
20151
20152
20153
20154
20155
20156
20157
20158
20159
20160
20161
20162
20163
20164
20165
20166
20167
20168
20169
20170
20171
20172
20173
20174
20175
20176
20177
20178
20179
20180
20181
20182
20183
20184
20185
20186
20187
20188
20189
20190
20191
20192
20193
20194
20195
20196
20197
20198
20199
20200
20201
20202
20203
20204
20205
20206
20207
20208
20209
20210
20211
20212
20213
20214
20215
20216
20217
20218
20219
20220
20221
20222
20223
20224
20225
20226
20227
20228
20229
20230
20231
20232
20233
20234
20235
20236
20237
20238
20239
20240
20241
20242
20243
20244
20245
20246
20247
20248
20249
20250
20251
20252
20253
20254
20255
20256
20257
20258
20259
20260
20261
20262
20263
20264
20265
20266
20267
20268
20269
20270
20271
20272
20273
20274
20275
20276
20277
20278
20279
20280
20281
20282
20283
20284
20285
20286
20287
20288
20289
20290
20291
20292
20293
20294
20295
20296
20297
20298
20299
20300
20301
20302
20303
20304
20305
20306
20307
20308
20309
20310
20311
20312
20313
20314
20315
20316
20317
20318
20319
20320
20321
20322
20323
20324
20325
20326
20327
20328
20329
20330
20331
20332
20333
20334
20335
20336
20337
20338
20339
20340
20341
20342
20343
20344
20345
20346
20347
20348
20349
20350
20351
20352
20353
20354
20355
20356
20357
20358
20359
20360
20361
20362
20363
20364
20365
20366
20367
20368
20369
20370
20371
20372
20373
20374
20375
20376
20377
20378
20379
20380
20381
20382
20383
20384
20385
20386
20387
20388
20389
20390
20391
20392
20393
20394
20395
20396
20397
20398
20399
20400
20401
20402
20403
20404
20405
20406
20407
20408
20409
20410
20411
20412
20413
20414
20415
20416
20417
20418
20419
20420
20421
20422
20423
20424
20425
20426
20427
20428
20429
20430
20431
20432
20433
20434
20435
20436
20437
20438
20439
20440
20441
20442
20443
20444
20445
20446
20447
20448
20449
20450
20451
20452
20453
20454
20455
20456
20457
20458
20459
20460
20461
20462
20463
20464
20465
20466
20467
20468
20469
20470
20471
20472
20473
20474
20475
20476
20477
20478
20479
20480
20481
20482
20483
20484
20485
20486
20487
20488
20489
20490
20491
20492
20493
20494
20495
20496
20497
20498
20499
20500
20501
20502
20503
20504
20505
20506
20507
20508
20509
20510
20511
20512
20513
20514
20515
20516
20517
20518
20519
20520
20521
20522
20523
20524
20525
20526
20527
20528
20529
20530
20531
20532
20533
20534
20535
20536
20537
20538
20539
20540
20541
20542
20543
20544
20545
20546
20547
20548
20549
20550
20551
20552
20553
20554
20555
20556
20557
20558
20559
20560
20561
20562
20563
20564
20565
20566
20567
20568
20569
20570
20571
20572
20573
20574
20575
20576
20577
20578
20579
20580
20581
20582
20583
20584
20585
20586
20587
20588
20589
20590
20591
20592
20593
20594
20595
20596
20597
20598
20599
20600
20601
20602
20603
20604
20605
20606
20607
20608
20609
20610
20611
20612
20613
20614
20615
20616
20617
20618
20619
20620
20621
20622
20623
20624
20625
20626
20627
20628
20629
20630
20631
20632
20633
20634
20635
20636
20637
20638
20639
20640
20641
20642
20643
20644
20645
20646
20647
20648
20649
20650
20651
20652
20653
20654
20655
20656
20657
20658
20659
20660
20661
20662
20663
20664
20665
20666
20667
20668
20669
20670
20671
20672
20673
20674
20675
20676
20677
20678
20679
20680
20681
20682
20683
20684
20685
20686
20687
20688
20689
20690
20691
20692
20693
20694
20695
20696
20697
20698
20699
20700
20701
20702
20703
20704
20705
20706
20707
20708
20709
20710
20711
20712
20713
20714
20715
20716
20717
20718
20719
20720
20721
20722
20723
20724
20725
20726
20727
20728
20729
20730
20731
20732
20733
20734
20735
20736
20737
20738
20739
20740
20741
20742
20743
20744
20745
20746
20747
20748
20749
20750
20751
20752
20753
20754
20755
20756
20757
20758
20759
20760
20761
20762
20763
20764
20765
20766
20767
20768
20769
20770
20771
20772
20773
20774
20775
20776
20777
20778
20779
20780
20781
20782
20783
20784
20785
20786
20787
20788
20789
20790
20791
20792
20793
20794
20795
20796
20797
20798
20799
20800
20801
20802
20803
20804
20805
20806
20807
20808
20809
20810
20811
20812
20813
20814
20815
20816
20817
20818
20819
20820
20821
20822
20823
20824
20825
20826
20827
20828
20829
20830
20831
20832
20833
20834
20835
20836
20837
20838
20839
20840
20841
20842
20843
20844
20845
20846
20847
20848
20849
20850
20851
20852
20853
20854
20855
20856
20857
20858
20859
20860
20861
20862
20863
20864
20865
20866
20867
20868
20869
20870
20871
20872
20873
20874
20875
20876
20877
20878
20879
20880
20881
20882
20883
20884
20885
20886
20887
20888
20889
20890
20891
20892
20893
20894
20895
20896
20897
20898
20899
20900
20901
20902
20903
20904
20905
20906
20907
20908
20909
20910
20911
20912
20913
20914
20915
20916
20917
20918
20919
20920
20921
20922
20923
20924
20925
20926
20927
20928
20929
20930
20931
20932
20933
20934
20935
20936
20937
20938
20939
20940
20941
20942
20943
20944
20945
20946
20947
20948
20949
20950
20951
20952
20953
20954
20955
20956
20957
20958
20959
20960
20961
20962
20963
20964
20965
20966
20967
20968
20969
20970
20971
20972
20973
20974
20975
20976
20977
20978
20979
20980
20981
20982
20983
20984
20985
20986
20987
20988
20989
20990
20991
20992
20993
20994
20995
20996
20997
20998
20999
21000
21001
21002
21003
21004
21005
21006
21007
21008
21009
21010
21011
21012
21013
21014
21015
21016
21017
21018
21019
21020
21021
21022
21023
21024
21025
21026
21027
21028
21029
21030
21031
21032
21033
21034
21035
21036
21037
21038
21039
21040
21041
21042
21043
21044
21045
21046
21047
21048
21049
21050
21051
21052
21053
21054
21055
21056
21057
21058
21059
21060
21061
21062
21063
21064
21065
21066
21067
21068
21069
21070
21071
21072
21073
21074
21075
21076
21077
21078
21079
21080
21081
21082
21083
21084
21085
21086
21087
21088
21089
21090
21091
21092
21093
21094
21095
21096
21097
21098
21099
21100
21101
21102
21103
21104
21105
21106
21107
21108
21109
21110
21111
21112
21113
21114
21115
21116
21117
21118
21119
21120
21121
21122
21123
21124
21125
21126
21127
21128
21129
21130
21131
21132
21133
21134
21135
21136
21137
21138
21139
21140
21141
21142
21143
21144
21145
21146
21147
21148
21149
21150
21151
21152
21153
21154
21155
21156
21157
21158
21159
21160
21161
21162
21163
21164
21165
21166
21167
21168
21169
21170
21171
21172
21173
21174
21175
21176
21177
21178
21179
21180
21181
21182
21183
21184
21185
21186
21187
21188
21189
21190
21191
21192
21193
21194
21195
21196
21197
21198
21199
21200
21201
21202
21203
21204
21205
21206
21207
21208
21209
21210
21211
21212
21213
21214
21215
21216
21217
21218
21219
21220
21221
21222
21223
21224
21225
21226
21227
21228
21229
21230
21231
21232
21233
21234
21235
21236
21237
21238
21239
21240
21241
21242
21243
21244
21245
21246
21247
21248
21249
21250
21251
21252
21253
21254
21255
21256
21257
21258
21259
21260
21261
21262
21263
21264
21265
21266
21267
21268
21269
21270
21271
21272
21273
21274
21275
21276
21277
21278
21279
21280
21281
21282
21283
21284
21285
21286
21287
21288
21289
21290
21291
21292
21293
21294
21295
21296
21297
21298
21299
21300
21301
21302
21303
21304
21305
21306
21307
21308
21309
21310
21311
21312
21313
21314
21315
21316
21317
21318
21319
21320
21321
21322
21323
21324
21325
21326
21327
21328
21329
21330
21331
21332
21333
21334
21335
21336
21337
21338
21339
21340
21341
21342
21343
21344
21345
21346
21347
21348
21349
21350
21351
21352
21353
21354
21355
21356
21357
21358
21359
21360
21361
21362
21363
21364
21365
21366
21367
21368
21369
21370
21371
21372
21373
21374
21375
21376
21377
21378
21379
21380
21381
21382
21383
21384
21385
21386
21387
21388
21389
21390
21391
21392
21393
21394
21395
21396
21397
21398
21399
21400
21401
21402
21403
21404
21405
21406
21407
21408
21409
21410
21411
21412
21413
21414
21415
21416
21417
21418
21419
21420
21421
21422
21423
21424
21425
21426
21427
21428
21429
21430
21431
21432
21433
21434
21435
21436
21437
21438
21439
21440
21441
21442
21443
21444
21445
21446
21447
21448
21449
21450
21451
21452
21453
21454
21455
21456
21457
21458
21459
21460
21461
21462
21463
21464
21465
21466
21467
21468
21469
21470
21471
21472
21473
21474
21475
21476
21477
21478
21479
21480
21481
21482
21483
21484
21485
21486
21487
21488
21489
21490
21491
21492
21493
21494
21495
21496
21497
21498
21499
21500
21501
21502
21503
21504
21505
21506
21507
21508
21509
21510
21511
21512
21513
21514
21515
21516
21517
21518
21519
21520
21521
21522
21523
21524
21525
21526
21527
21528
21529
21530
21531
21532
21533
21534
21535
21536
21537
21538
21539
21540
21541
21542
21543
21544
21545
21546
21547
21548
21549
21550
21551
21552
21553
21554
21555
21556
21557
21558
21559
21560
21561
21562
21563
21564
21565
21566
21567
21568
21569
21570
21571
21572
21573
21574
21575
21576
21577
21578
21579
21580
21581
21582
21583
21584
21585
21586
21587
21588
21589
21590
21591
21592
21593
21594
21595
21596
21597
21598
21599
21600
21601
21602
21603
21604
21605
21606
21607
21608
21609
21610
21611
21612
21613
21614
21615
21616
21617
21618
21619
21620
21621
21622
21623
21624
21625
21626
21627
21628
21629
21630
21631
21632
21633
21634
21635
21636
21637
21638
21639
21640
21641
21642
21643
21644
21645
21646
21647
21648
21649
21650
21651
21652
21653
21654
21655
21656
21657
21658
21659
21660
21661
21662
21663
21664
21665
21666
21667
21668
21669
21670
21671
21672
21673
21674
21675
21676
21677
21678
21679
21680
21681
21682
21683
21684
21685
21686
21687
21688
21689
21690
21691
21692
21693
21694
21695
21696
21697
21698
21699
21700
21701
21702
21703
21704
21705
21706
21707
21708
21709
21710
21711
21712
21713
21714
21715
21716
21717
21718
21719
21720
21721
21722
21723
21724
21725
21726
21727
21728
21729
21730
21731
21732
21733
21734
21735
21736
21737
21738
21739
21740
21741
21742
21743
21744
21745
21746
21747
21748
21749
21750
21751
21752
21753
21754
21755
21756
21757
21758
21759
21760
21761
21762
21763
21764
21765
21766
21767
21768
21769
21770
21771
21772
21773
21774
21775
21776
21777
21778
21779
21780
21781
21782
21783
21784
21785
21786
21787
21788
21789
21790
21791
21792
21793
21794
21795
21796
21797
21798
21799
21800
21801
21802
21803
21804
21805
21806
21807
21808
21809
21810
21811
21812
21813
21814
21815
21816
21817
21818
21819
21820
21821
21822
21823
21824
21825
21826
21827
21828
21829
21830
21831
21832
21833
21834
21835
21836
21837
21838
21839
21840
21841
21842
21843
21844
21845
21846
21847
21848
21849
21850
21851
21852
21853
21854
21855
21856
21857
21858
21859
21860
21861
21862
21863
21864
21865
21866
21867
21868
21869
21870
21871
21872
21873
21874
21875
21876
21877
21878
21879
21880
21881
21882
21883
21884
21885
21886
21887
21888
21889
21890
21891
21892
21893
21894
21895
21896
21897
21898
21899
21900
21901
21902
21903
21904
21905
21906
21907
21908
21909
21910
21911
21912
21913
21914
21915
21916
21917
21918
21919
21920
21921
21922
21923
21924
21925
21926
21927
21928
21929
21930
21931
21932
21933
21934
21935
21936
21937
21938
21939
21940
21941
21942
21943
21944
21945
21946
21947
21948
21949
21950
21951
21952
21953
21954
21955
21956
21957
21958
21959
21960
21961
21962
21963
21964
21965
21966
21967
21968
21969
21970
21971
21972
21973
21974
21975
21976
21977
21978
21979
21980
21981
21982
21983
21984
21985
21986
21987
21988
21989
21990
21991
21992
21993
21994
21995
21996
21997
21998
21999
22000
22001
22002
22003
22004
22005
22006
22007
22008
22009
22010
22011
22012
22013
22014
22015
22016
22017
22018
22019
22020
22021
22022
22023
22024
22025
22026
22027
22028
22029
22030
22031
22032
22033
22034
22035
22036
22037
22038
22039
22040
22041
22042
22043
22044
22045
22046
22047
22048
22049
22050
22051
22052
22053
22054
22055
22056
22057
22058
22059
22060
22061
22062
22063
22064
22065
22066
22067
22068
22069
22070
22071
22072
22073
22074
22075
22076
22077
22078
22079
22080
22081
22082
22083
22084
22085
22086
22087
22088
22089
22090
22091
22092
22093
22094
22095
22096
22097
22098
22099
22100
22101
22102
22103
22104
22105
22106
22107
22108
22109
22110
22111
22112
22113
22114
22115
22116
22117
22118
22119
22120
22121
22122
22123
22124
22125
22126
22127
22128
22129
22130
22131
22132
22133
22134
22135
22136
22137
22138
22139
22140
22141
22142
22143
22144
22145
22146
22147
22148
22149
22150
22151
22152
22153
22154
22155
22156
22157
22158
22159
22160
22161
22162
22163
22164
22165
22166
22167
22168
22169
22170
22171
22172
22173
22174
22175
22176
22177
22178
22179
22180
22181
22182
22183
22184
22185
22186
22187
22188
22189
22190
22191
22192
22193
22194
22195
22196
22197
22198
22199
22200
22201
22202
22203
22204
22205
22206
22207
22208
22209
22210
22211
22212
22213
22214
22215
22216
22217
22218
22219
22220
22221
22222
22223
22224
22225
22226
22227
22228
22229
22230
22231
22232
22233
22234
22235
22236
22237
22238
22239
22240
22241
22242
22243
22244
22245
22246
22247
22248
22249
22250
22251
22252
22253
22254
22255
22256
22257
22258
22259
22260
22261
22262
22263
22264
22265
22266
22267
22268
22269
22270
22271
22272
22273
22274
22275
22276
22277
22278
22279
22280
22281
22282
22283
22284
22285
22286
22287
22288
22289
22290
22291
22292
22293
22294
22295
22296
22297
22298
22299
22300
22301
22302
22303
22304
22305
22306
22307
22308
22309
22310
22311
22312
22313
22314
22315
22316
22317
22318
22319
22320
22321
22322
22323
22324
22325
22326
22327
22328
22329
22330
22331
22332
22333
22334
22335
22336
22337
22338
22339
22340
22341
22342
22343
22344
22345
22346
22347
22348
22349
22350
22351
22352
22353
22354
22355
22356
22357
22358
22359
22360
22361
22362
22363
22364
22365
22366
22367
22368
22369
22370
22371
22372
22373
22374
22375
22376
22377
22378
22379
22380
22381
22382
22383
22384
22385
22386
22387
22388
22389
22390
22391
22392
22393
22394
22395
22396
22397
22398
22399
22400
22401
22402
22403
22404
22405
22406
22407
22408
22409
22410
22411
22412
22413
22414
22415
22416
22417
22418
22419
22420
22421
22422
22423
22424
22425
22426
22427
22428
22429
22430
22431
22432
22433
22434
22435
22436
22437
22438
22439
22440
22441
22442
22443
22444
22445
22446
22447
22448
22449
22450
22451
22452
22453
22454
22455
22456
22457
22458
22459
22460
22461
22462
22463
22464
22465
22466
22467
22468
22469
22470
22471
22472
22473
22474
22475
22476
22477
22478
22479
22480
22481
22482
22483
22484
22485
22486
22487
22488
22489
22490
22491
22492
22493
22494
22495
22496
22497
22498
22499
22500
22501
22502
22503
22504
22505
22506
22507
22508
22509
22510
22511
22512
22513
22514
22515
22516
22517
22518
22519
22520
22521
22522
22523
22524
22525
22526
22527
22528
22529
22530
22531
22532
22533
22534
22535
22536
22537
22538
22539
22540
22541
22542
22543
22544
22545
22546
22547
22548
22549
22550
22551
22552
22553
22554
22555
22556
22557
22558
22559
22560
22561
22562
22563
22564
22565
22566
22567
22568
22569
22570
22571
22572
22573
22574
22575
22576
22577
22578
22579
22580
22581
22582
22583
22584
22585
22586
22587
22588
22589
22590
22591
22592
22593
22594
22595
22596
22597
22598
22599
22600
22601
22602
22603
22604
22605
22606
22607
22608
22609
22610
22611
22612
22613
22614
22615
22616
22617
22618
22619
22620
22621
22622
22623
22624
22625
22626
22627
22628
22629
22630
22631
22632
22633
22634
22635
22636
22637
22638
22639
22640
22641
22642
22643
22644
22645
22646
22647
22648
22649
22650
22651
22652
22653
22654
22655
22656
22657
22658
22659
22660
22661
22662
22663
22664
22665
22666
22667
22668
22669
22670
22671
22672
22673
22674
22675
22676
22677
22678
22679
22680
22681
22682
22683
22684
22685
22686
22687
22688
22689
22690
22691
22692
22693
22694
22695
22696
22697
22698
22699
22700
22701
22702
22703
22704
22705
22706
22707
22708
22709
22710
22711
22712
22713
22714
22715
22716
22717
22718
22719
22720
22721
22722
22723
22724
22725
22726
22727
22728
22729
22730
22731
22732
22733
22734
22735
22736
22737
22738
22739
22740
22741
22742
22743
22744
22745
22746
22747
22748
22749
22750
22751
22752
22753
22754
22755
22756
22757
22758
22759
22760
22761
22762
22763
22764
22765
22766
22767
22768
22769
22770
22771
22772
22773
22774
22775
22776
22777
22778
22779
22780
22781
22782
22783
22784
22785
22786
22787
22788
22789
22790
22791
22792
22793
22794
22795
22796
22797
22798
22799
22800
22801
22802
22803
22804
22805
22806
22807
22808
22809
22810
22811
22812
22813
22814
22815
22816
22817
22818
22819
22820
22821
22822
22823
22824
22825
22826
22827
22828
22829
22830
22831
22832
22833
22834
22835
22836
22837
22838
22839
22840
22841
22842
22843
22844
22845
22846
22847
22848
22849
22850
22851
22852
22853
22854
22855
22856
22857
22858
22859
22860
22861
22862
22863
22864
22865
22866
22867
22868
22869
22870
22871
22872
22873
22874
22875
22876
22877
22878
22879
22880
22881
22882
22883
22884
22885
22886
22887
22888
22889
22890
22891
22892
22893
22894
22895
22896
22897
22898
22899
22900
22901
22902
22903
22904
22905
22906
22907
22908
22909
22910
22911
22912
22913
22914
22915
22916
22917
22918
22919
22920
22921
22922
22923
22924
22925
22926
22927
22928
22929
22930
22931
22932
22933
22934
22935
22936
22937
22938
22939
22940
22941
22942
22943
22944
22945
22946
22947
22948
22949
22950
22951
22952
22953
22954
22955
22956
22957
22958
22959
22960
22961
22962
22963
22964
22965
22966
22967
22968
22969
22970
22971
22972
22973
22974
22975
22976
22977
22978
22979
22980
22981
22982
22983
22984
22985
22986
22987
22988
22989
22990
22991
22992
22993
22994
22995
22996
22997
22998
22999
23000
23001
23002
23003
23004
23005
23006
23007
23008
23009
23010
23011
23012
23013
23014
23015
23016
23017
23018
23019
23020
23021
23022
23023
23024
23025
23026
23027
23028
23029
23030
23031
23032
23033
23034
23035
23036
23037
23038
23039
23040
23041
23042
23043
23044
23045
23046
23047
23048
23049
23050
23051
23052
23053
23054
23055
23056
23057
23058
23059
23060
23061
23062
23063
23064
23065
23066
23067
23068
23069
23070
23071
23072
23073
23074
23075
23076
23077
23078
23079
23080
23081
23082
23083
23084
23085
23086
23087
23088
23089
23090
23091
23092
23093
23094
23095
23096
23097
23098
23099
23100
23101
23102
23103
23104
23105
23106
23107
23108
23109
23110
23111
23112
23113
23114
23115
23116
23117
23118
23119
23120
23121
23122
23123
23124
23125
23126
23127
23128
23129
23130
23131
23132
23133
23134
23135
23136
23137
23138
23139
23140
23141
23142
23143
23144
23145
23146
23147
23148
23149
23150
23151
23152
23153
23154
23155
23156
23157
23158
23159
23160
23161
23162
23163
23164
23165
23166
23167
23168
23169
23170
23171
23172
23173
23174
23175
23176
23177
23178
23179
23180
23181
23182
23183
23184
23185
23186
23187
23188
23189
23190
23191
23192
23193
23194
23195
23196
23197
23198
23199
23200
23201
23202
23203
23204
23205
23206
23207
23208
23209
23210
23211
23212
23213
23214
23215
23216
23217
23218
23219
23220
23221
23222
23223
23224
23225
23226
23227
23228
23229
23230
23231
23232
23233
23234
23235
23236
23237
23238
23239
23240
23241
23242
23243
23244
23245
23246
23247
23248
23249
23250
23251
23252
23253
23254
23255
23256
23257
23258
23259
23260
23261
23262
23263
23264
23265
23266
23267
23268
23269
23270
23271
23272
23273
23274
23275
23276
23277
23278
23279
23280
23281
23282
23283
23284
23285
23286
23287
23288
23289
23290
23291
23292
23293
23294
23295
23296
23297
23298
23299
23300
23301
23302
23303
23304
23305
23306
23307
23308
23309
23310
23311
23312
23313
23314
23315
23316
23317
23318
23319
23320
23321
23322
23323
23324
23325
23326
23327
23328
23329
23330
23331
23332
23333
23334
23335
23336
23337
23338
23339
23340
23341
23342
23343
23344
23345
23346
23347
23348
23349
23350
23351
23352
23353
23354
23355
23356
23357
23358
23359
23360
23361
23362
23363
23364
23365
23366
23367
23368
23369
23370
23371
23372
23373
23374
23375
23376
23377
23378
23379
23380
23381
23382
23383
23384
23385
23386
23387
23388
23389
23390
23391
23392
23393
23394
23395
23396
23397
23398
23399
23400
23401
23402
23403
23404
23405
23406
23407
23408
23409
23410
23411
23412
23413
23414
23415
23416
23417
23418
23419
23420
23421
23422
23423
23424
23425
23426
23427
23428
23429
23430
23431
23432
23433
23434
23435
23436
23437
23438
23439
23440
23441
23442
23443
23444
23445
23446
23447
23448
23449
23450
23451
23452
23453
23454
23455
23456
23457
23458
23459
23460
23461
23462
23463
23464
23465
23466
23467
23468
23469
23470
23471
23472
23473
23474
23475
23476
23477
23478
23479
23480
23481
23482
23483
23484
23485
23486
23487
23488
23489
23490
23491
23492
23493
23494
23495
23496
23497
23498
23499
23500
23501
23502
23503
23504
23505
23506
23507
23508
23509
23510
23511
23512
23513
23514
23515
23516
23517
23518
23519
23520
23521
23522
23523
23524
23525
23526
23527
23528
23529
23530
23531
23532
23533
23534
23535
23536
23537
23538
23539
23540
23541
23542
23543
23544
23545
23546
23547
23548
23549
23550
23551
23552
23553
23554
23555
23556
23557
23558
23559
23560
23561
23562
23563
23564
23565
23566
23567
23568
23569
23570
23571
23572
23573
23574
23575
23576
23577
23578
23579
23580
23581
23582
23583
23584
23585
23586
23587
23588
23589
23590
23591
23592
23593
23594
23595
23596
23597
23598
23599
23600
23601
23602
23603
23604
23605
23606
23607
23608
23609
23610
23611
23612
23613
23614
23615
23616
23617
23618
23619
23620
23621
23622
23623
23624
23625
23626
23627
23628
23629
23630
23631
23632
23633
23634
23635
23636
23637
23638
23639
23640
23641
23642
23643
23644
23645
23646
23647
23648
23649
23650
23651
23652
23653
23654
23655
23656
23657
23658
23659
23660
23661
23662
23663
23664
23665
23666
23667
23668
23669
23670
23671
23672
23673
23674
23675
23676
23677
23678
23679
23680
23681
23682
23683
23684
23685
23686
23687
23688
23689
23690
23691
23692
23693
23694
23695
23696
23697
23698
23699
23700
23701
23702
23703
23704
23705
23706
23707
23708
23709
23710
23711
23712
23713
23714
23715
23716
23717
23718
23719
23720
23721
23722
23723
23724
23725
23726
23727
23728
23729
23730
23731
23732
23733
23734
23735
23736
23737
23738
23739
23740
23741
23742
23743
23744
23745
23746
23747
23748
23749
23750
23751
23752
23753
23754
23755
23756
23757
23758
23759
23760
23761
23762
23763
23764
23765
23766
23767
23768
23769
23770
23771
23772
23773
23774
23775
23776
23777
23778
23779
23780
23781
23782
23783
23784
23785
23786
23787
23788
23789
23790
23791
23792
23793
23794
23795
23796
23797
23798
23799
23800
23801
23802
23803
23804
23805
23806
23807
23808
23809
23810
23811
23812
23813
23814
23815
23816
23817
23818
23819
23820
23821
23822
23823
23824
23825
23826
23827
23828
23829
23830
23831
23832
23833
23834
23835
23836
23837
23838
23839
23840
23841
23842
23843
23844
23845
23846
23847
23848
23849
23850
23851
23852
23853
23854
23855
23856
23857
23858
23859
23860
23861
23862
23863
23864
23865
23866
23867
23868
23869
23870
23871
23872
23873
23874
23875
23876
23877
23878
23879
23880
23881
23882
23883
23884
23885
23886
23887
23888
23889
23890
23891
23892
23893
23894
23895
23896
23897
23898
23899
23900
23901
23902
23903
23904
23905
23906
23907
23908
23909
23910
23911
23912
23913
23914
23915
23916
23917
23918
23919
23920
23921
23922
23923
23924
23925
23926
23927
23928
23929
23930
23931
23932
23933
23934
23935
23936
23937
23938
23939
23940
23941
23942
23943
23944
23945
23946
23947
23948
23949
23950
23951
23952
23953
23954
23955
23956
23957
23958
23959
23960
23961
23962
23963
23964
23965
23966
23967
23968
23969
23970
23971
23972
23973
23974
23975
23976
23977
23978
23979
23980
23981
23982
23983
23984
23985
23986
23987
23988
23989
23990
23991
23992
23993
23994
23995
23996
23997
23998
23999
24000
24001
24002
24003
24004
24005
24006
24007
24008
24009
24010
24011
24012
24013
24014
24015
24016
24017
24018
24019
24020
24021
24022
24023
24024
24025
24026
24027
24028
24029
24030
24031
24032
24033
24034
24035
24036
24037
24038
24039
24040
24041
24042
24043
24044
24045
24046
24047
24048
24049
24050
24051
24052
24053
24054
24055
24056
24057
24058
24059
24060
24061
24062
24063
24064
24065
24066
24067
24068
24069
24070
24071
24072
24073
24074
24075
24076
24077
24078
24079
24080
24081
24082
24083
24084
24085
24086
24087
24088
24089
24090
24091
24092
24093
24094
24095
24096
24097
24098
24099
24100
24101
24102
24103
24104
24105
24106
24107
24108
24109
24110
24111
24112
24113
24114
24115
24116
24117
24118
24119
24120
24121
24122
24123
24124
24125
24126
24127
24128
24129
24130
24131
24132
24133
24134
24135
24136
24137
24138
24139
24140
24141
24142
24143
24144
24145
24146
24147
24148
24149
24150
24151
24152
24153
24154
24155
24156
24157
24158
24159
24160
24161
24162
24163
24164
24165
24166
24167
24168
24169
24170
24171
24172
24173
24174
24175
24176
24177
24178
24179
24180
24181
24182
24183
24184
24185
24186
24187
24188
24189
24190
24191
24192
24193
24194
24195
24196
24197
24198
24199
24200
24201
24202
24203
24204
24205
24206
24207
24208
24209
24210
24211
24212
24213
24214
24215
24216
24217
24218
24219
24220
24221
24222
24223
24224
24225
24226
24227
24228
24229
24230
24231
24232
24233
24234
24235
24236
24237
24238
24239
24240
24241
24242
24243
24244
24245
24246
24247
24248
24249
24250
24251
24252
24253
24254
24255
24256
24257
24258
24259
24260
24261
24262
24263
24264
24265
24266
24267
24268
24269
24270
24271
24272
24273
24274
24275
24276
24277
24278
24279
24280
24281
24282
24283
24284
24285
24286
24287
24288
24289
24290
24291
24292
24293
24294
24295
24296
24297
24298
24299
24300
24301
24302
24303
24304
24305
24306
24307
24308
24309
24310
24311
24312
24313
24314
24315
24316
24317
24318
24319
24320
24321
24322
24323
24324
24325
24326
24327
24328
24329
24330
24331
24332
24333
24334
24335
24336
24337
24338
24339
24340
24341
24342
24343
24344
24345
24346
24347
24348
24349
24350
24351
24352
24353
24354
24355
24356
24357
24358
24359
24360
24361
24362
24363
24364
24365
24366
24367
24368
24369
24370
24371
24372
24373
24374
24375
24376
24377
24378
24379
24380
24381
24382
24383
24384
24385
24386
24387
24388
24389
24390
24391
24392
24393
24394
24395
24396
24397
24398
24399
24400
24401
24402
24403
24404
24405
24406
24407
24408
24409
24410
24411
24412
24413
24414
24415
24416
24417
24418
24419
24420
24421
24422
24423
24424
24425
24426
24427
24428
24429
24430
24431
24432
24433
24434
24435
24436
24437
24438
24439
24440
24441
24442
24443
24444
24445
24446
24447
24448
24449
24450
24451
24452
24453
24454
24455
24456
24457
24458
24459
24460
24461
24462
24463
24464
24465
24466
24467
24468
24469
24470
24471
24472
24473
24474
24475
24476
24477
24478
24479
24480
24481
24482
24483
24484
24485
24486
24487
24488
24489
24490
24491
24492
24493
24494
24495
24496
24497
24498
24499
24500
24501
24502
24503
24504
24505
24506
24507
24508
24509
24510
24511
24512
24513
24514
24515
24516
24517
24518
24519
24520
24521
24522
24523
24524
24525
24526
24527
24528
24529
24530
24531
24532
24533
24534
24535
24536
24537
24538
24539
24540
24541
24542
24543
24544
24545
24546
24547
24548
24549
24550
24551
24552
24553
24554
24555
24556
24557
24558
24559
24560
24561
24562
24563
24564
24565
24566
24567
24568
24569
24570
24571
24572
24573
24574
24575
24576
24577
24578
24579
24580
24581
24582
24583
24584
24585
24586
24587
24588
24589
24590
24591
24592
24593
24594
24595
24596
24597
24598
24599
24600
24601
24602
24603
24604
24605
24606
24607
24608
24609
24610
24611
24612
24613
24614
24615
24616
24617
24618
24619
24620
24621
24622
24623
24624
24625
24626
24627
24628
24629
24630
24631
24632
24633
24634
24635
24636
24637
24638
24639
24640
24641
24642
24643
24644
24645
24646
24647
24648
24649
24650
24651
24652
24653
24654
24655
24656
24657
24658
24659
24660
24661
24662
24663
24664
24665
24666
24667
24668
24669
24670
24671
24672
24673
24674
24675
24676
24677
24678
24679
24680
24681
24682
24683
24684
24685
24686
24687
24688
24689
24690
24691
24692
24693
24694
24695
24696
24697
24698
24699
24700
24701
24702
24703
24704
24705
24706
24707
24708
24709
24710
24711
24712
24713
24714
24715
24716
24717
24718
24719
24720
24721
24722
24723
24724
24725
24726
24727
24728
24729
24730
24731
24732
24733
24734
24735
24736
24737
24738
24739
24740
24741
24742
24743
24744
24745
24746
24747
24748
24749
24750
24751
24752
24753
24754
24755
24756
24757
24758
24759
24760
24761
24762
24763
24764
24765
24766
24767
24768
24769
24770
24771
24772
24773
24774
24775
24776
24777
24778
24779
24780
24781
24782
24783
24784
24785
24786
24787
24788
24789
24790
24791
24792
24793
24794
24795
24796
24797
24798
24799
24800
24801
24802
24803
24804
24805
24806
24807
24808
24809
24810
24811
24812
24813
24814
24815
24816
24817
24818
24819
24820
24821
24822
24823
24824
24825
24826
24827
24828
24829
24830
24831
24832
24833
24834
24835
24836
24837
24838
24839
24840
24841
24842
24843
24844
24845
24846
24847
24848
24849
24850
24851
24852
24853
24854
24855
24856
24857
24858
24859
24860
24861
24862
24863
24864
24865
24866
24867
24868
24869
24870
24871
24872
24873
24874
24875
24876
24877
24878
24879
24880
24881
24882
24883
24884
24885
24886
24887
24888
24889
24890
24891
24892
24893
24894
24895
24896
24897
24898
24899
24900
24901
24902
24903
24904
24905
24906
24907
24908
24909
24910
24911
24912
24913
24914
24915
24916
24917
24918
24919
24920
24921
24922
24923
24924
24925
24926
24927
24928
24929
24930
24931
24932
24933
24934
24935
24936
24937
24938
24939
24940
24941
24942
24943
24944
24945
24946
24947
24948
24949
24950
24951
24952
24953
24954
24955
24956
24957
24958
24959
24960
24961
24962
24963
24964
24965
24966
24967
24968
24969
24970
24971
24972
24973
24974
24975
24976
24977
24978
24979
24980
24981
24982
24983
24984
24985
24986
24987
24988
24989
24990
24991
24992
24993
24994
24995
24996
24997
24998
24999
25000
25001
25002
25003
25004
25005
25006
25007
25008
25009
25010
25011
25012
25013
25014
25015
25016
25017
25018
25019
25020
25021
25022
25023
25024
25025
25026
25027
25028
25029
25030
25031
25032
25033
25034
25035
25036
25037
25038
25039
25040
25041
25042
25043
25044
25045
25046
25047
25048
25049
25050
25051
25052
25053
25054
25055
25056
25057
25058
25059
25060
25061
25062
25063
25064
25065
25066
25067
25068
25069
25070
25071
25072
25073
25074
25075
25076
25077
25078
25079
25080
25081
25082
25083
25084
25085
25086
25087
25088
25089
25090
25091
25092
25093
25094
25095
25096
25097
25098
25099
25100
25101
25102
25103
25104
25105
25106
25107
25108
25109
25110
25111
25112
25113
25114
25115
25116
25117
25118
25119
25120
25121
25122
25123
25124
25125
25126
25127
25128
25129
25130
25131
25132
25133
25134
25135
25136
25137
25138
25139
25140
25141
25142
25143
25144
25145
25146
25147
25148
25149
25150
25151
25152
25153
25154
25155
25156
25157
25158
25159
25160
25161
25162
25163
25164
25165
25166
25167
25168
25169
25170
25171
25172
25173
25174
25175
25176
25177
25178
25179
25180
25181
25182
25183
25184
25185
25186
25187
25188
25189
25190
25191
25192
25193
25194
25195
25196
25197
25198
25199
25200
25201
25202
25203
25204
25205
25206
25207
25208
25209
25210
25211
25212
25213
25214
25215
25216
25217
25218
25219
25220
25221
25222
25223
25224
25225
25226
25227
25228
25229
25230
25231
25232
25233
25234
25235
25236
25237
25238
25239
25240
25241
25242
25243
25244
25245
25246
25247
25248
25249
25250
25251
25252
25253
25254
25255
25256
25257
25258
25259
25260
25261
25262
25263
25264
25265
25266
25267
25268
25269
25270
25271
25272
25273
25274
25275
25276
25277
25278
25279
25280
25281
25282
25283
25284
25285
25286
25287
25288
25289
25290
25291
25292
25293
25294
25295
25296
25297
25298
25299
25300
25301
25302
25303
25304
25305
25306
25307
25308
25309
25310
25311
25312
25313
25314
25315
25316
25317
25318
25319
25320
25321
25322
25323
25324
25325
25326
25327
25328
25329
25330
25331
25332
25333
25334
25335
25336
25337
25338
25339
25340
25341
25342
25343
25344
25345
25346
25347
25348
25349
25350
25351
25352
25353
25354
25355
25356
25357
25358
25359
25360
25361
25362
25363
25364
25365
25366
25367
25368
25369
25370
25371
25372
25373
25374
25375
25376
25377
25378
25379
25380
25381
25382
25383
25384
25385
25386
25387
25388
25389
25390
25391
25392
25393
25394
25395
25396
25397
25398
25399
25400
25401
25402
25403
25404
25405
25406
25407
25408
25409
25410
25411
25412
25413
25414
25415
25416
25417
25418
25419
25420
25421
25422
25423
25424
25425
25426
25427
25428
25429
25430
25431
25432
25433
25434
25435
25436
25437
25438
25439
25440
25441
25442
25443
25444
25445
25446
25447
25448
25449
25450
25451
25452
25453
25454
25455
25456
25457
25458
25459
25460
25461
25462
25463
25464
25465
25466
25467
25468
25469
25470
25471
25472
25473
25474
25475
25476
25477
25478
25479
25480
25481
25482
25483
25484
25485
25486
25487
25488
25489
25490
25491
25492
25493
25494
25495
25496
25497
25498
25499
25500
25501
25502
25503
25504
25505
25506
25507
25508
25509
25510
25511
25512
25513
25514
25515
25516
25517
25518
25519
25520
25521
25522
25523
25524
25525
25526
25527
25528
25529
25530
25531
25532
25533
25534
25535
25536
25537
25538
25539
25540
25541
25542
25543
25544
25545
25546
25547
25548
25549
25550
25551
25552
25553
25554
25555
25556
25557
25558
25559
25560
25561
25562
25563
25564
25565
25566
25567
25568
25569
25570
25571
25572
25573
25574
25575
25576
25577
25578
25579
25580
25581
25582
25583
25584
25585
25586
25587
25588
25589
25590
25591
25592
25593
25594
25595
25596
25597
25598
25599
25600
25601
25602
25603
25604
25605
25606
25607
25608
25609
25610
25611
25612
25613
25614
25615
25616
25617
25618
25619
25620
25621
25622
25623
25624
25625
25626
25627
25628
25629
25630
25631
25632
25633
25634
25635
25636
25637
25638
25639
25640
25641
25642
25643
25644
25645
25646
25647
25648
25649
25650
25651
25652
25653
25654
25655
25656
25657
25658
25659
25660
25661
25662
25663
25664
25665
25666
25667
25668
25669
25670
25671
25672
25673
25674
25675
25676
25677
25678
25679
25680
25681
25682
25683
25684
25685
25686
25687
25688
25689
25690
25691
25692
25693
25694
25695
25696
25697
25698
25699
25700
25701
25702
25703
25704
25705
25706
25707
25708
25709
25710
25711
25712
25713
25714
25715
25716
25717
25718
25719
25720
25721
25722
25723
25724
25725
25726
25727
25728
25729
25730
25731
25732
25733
25734
25735
25736
25737
25738
25739
25740
25741
25742
25743
25744
25745
25746
25747
25748
25749
25750
25751
25752
25753
25754
25755
25756
25757
25758
25759
25760
25761
25762
25763
25764
25765
25766
25767
25768
25769
25770
25771
25772
25773
25774
25775
25776
25777
25778
25779
25780
25781
25782
25783
25784
25785
25786
25787
25788
25789
25790
25791
25792
25793
25794
25795
25796
25797
25798
25799
25800
25801
25802
25803
25804
25805
25806
25807
25808
25809
25810
25811
25812
25813
25814
25815
25816
25817
25818
25819
25820
25821
25822
25823
25824
25825
25826
25827
25828
25829
25830
25831
25832
25833
25834
25835
25836
25837
25838
25839
25840
25841
25842
25843
25844
25845
25846
25847
25848
25849
25850
25851
25852
25853
25854
25855
25856
25857
25858
25859
25860
25861
25862
25863
25864
25865
25866
25867
25868
25869
25870
25871
25872
25873
25874
25875
25876
25877
25878
25879
25880
25881
25882
25883
25884
25885
25886
25887
25888
25889
25890
25891
25892
25893
25894
25895
25896
25897
25898
25899
25900
25901
25902
25903
25904
25905
25906
25907
25908
25909
25910
25911
25912
25913
25914
25915
25916
25917
25918
25919
25920
25921
25922
25923
25924
25925
25926
25927
25928
25929
25930
25931
25932
25933
25934
25935
25936
25937
25938
25939
25940
25941
25942
25943
25944
25945
25946
25947
25948
25949
25950
25951
25952
25953
25954
25955
25956
25957
25958
25959
25960
25961
25962
25963
25964
25965
25966
25967
25968
25969
25970
25971
25972
25973
25974
25975
25976
25977
25978
25979
25980
25981
25982
25983
25984
25985
25986
25987
25988
25989
25990
25991
25992
25993
25994
25995
25996
25997
25998
25999
26000
26001
26002
26003
26004
26005
26006
26007
26008
26009
26010
26011
26012
26013
26014
26015
26016
26017
26018
26019
26020
26021
26022
26023
26024
26025
26026
26027
26028
26029
26030
26031
26032
26033
26034
26035
26036
26037
26038
26039
26040
26041
26042
26043
26044
26045
26046
26047
26048
26049
26050
26051
26052
26053
26054
26055
26056
26057
26058
26059
26060
26061
26062
26063
26064
26065
26066
26067
26068
26069
26070
26071
26072
26073
26074
26075
26076
26077
26078
26079
26080
26081
26082
26083
26084
26085
26086
26087
26088
26089
26090
26091
26092
26093
26094
26095
26096
26097
26098
26099
26100
26101
26102
26103
26104
26105
26106
26107
26108
26109
26110
26111
26112
26113
26114
26115
26116
26117
26118
26119
26120
26121
26122
26123
26124
26125
26126
26127
26128
26129
26130
26131
26132
26133
26134
26135
26136
26137
26138
26139
26140
26141
26142
26143
26144
26145
26146
26147
26148
26149
26150
26151
26152
26153
26154
26155
26156
26157
26158
26159
26160
26161
26162
26163
26164
26165
26166
26167
26168
26169
26170
26171
26172
26173
26174
26175
26176
26177
26178
26179
26180
26181
26182
26183
26184
26185
26186
26187
26188
26189
26190
26191
26192
26193
26194
26195
26196
26197
26198
26199
26200
26201
26202
26203
26204
26205
26206
26207
26208
26209
26210
26211
26212
26213
26214
26215
26216
26217
26218
26219
26220
26221
|
=== Start merge of feature-branch 2007-10-12 ===
2007-10-11 Andrew Wellington <proton@wiretapped.net>
Reviewed by Eric Seidel.
Fix for http://bugs.webkit.org/show_bug.cgi?id=15076
"deg2rad has multiple definitions"
Define deg2rad, rad2deg, deg2grad, grad2deg, rad2grad, grad2rad
These are used through WebKit.
Change based on original patch by Rob Buis.
* wtf/MathExtras.h:
(deg2rad):
(rad2deg):
(deg2grad):
(grad2deg):
(rad2grad):
(grad2rad):
2007-10-10 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- fix assertion failures on quit.
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): Dynamically alocate function-scope static
UStrings to avoid the static destructor getting called later.
* kjs/lookup.h: Dynamically alocate function-scope static
Identifiers to avoid the static destructor getting called later.
2007-10-07 Ed Schouten <ed@fxq.nl>
Reviewed and landed by Alexey Proskuryakov.
Add PLATFORM(FREEBSD), so we can fix the build on FreeBSD-like
systems by including <pthread_np.h>. Also fix some (disabled)
regcomp()/regexec() code; it seems some variable names have
changed.
* kjs/config.h:
* kjs/regexp.cpp:
(KJS::RegExp::RegExp):
* wtf/Platform.h:
2007-10-02 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=10370
RegExp fails to match non-ASCII characters against [\S\s]
Test: fast/js/regexp-negative-special-characters.html
* pcre/pcre_compile.c:
(compile_branch): Adjust opcode and bitmap as necessary to include (or exclude)
character codes >255. Fix suggested by Philip Hazel.
* pcre/pcre_exec.c:
(match): Merged fix for PCRE bug 580 (\S\S vs. \S{2}).
* tests/mozilla/expected.html: One test was fixed.
* pcre/MERGING: Added information about this fix.
2007-10-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- skip extra hash lookup and avoid converting char* to UString for 19% speedup on CK JS array test
http://bugs.webkit.org/show_bug.cgi?id=15350
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): Implement the two mentioned optimizations.
2007-10-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Mark.
- Efficiently handle regexp property identifiers for 19% speedup on Celtic Kane regexp test
http://bugs.webkit.org/show_bug.cgi?id=15337
* kjs/CommonIdentifiers.h:
* kjs/regexp_object.cpp:
(RegExpProtoFunc::callAsFunction):
(RegExpObjectImp::arrayOfMatches):
(RegExpObjectImp::construct):
2007-10-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Mark.
- Cache global prorotypes more efficiently for 10% speedup on CK AJAX benchmark
http://bugs.webkit.org/show_bug.cgi?id=15335
* kjs/lookup.h:
2007-10-01 Oliver Hunt <oliver@apple.com>
Reviewed by Mark.
Enable Experimental SVG features by default when building from Xcode
* Configurations/JavaScriptCore.xcconfig:
2007-09-29 Rob Buis <buis@kde.org>
Reviewed by Adam.
http://bugs.webkit.org/show_bug.cgi?id=13472
Misparsing date in javascript leads to year value of -1
http://bugs.webkit.org/show_bug.cgi?id=14176
Some date values not handled consistently with IE/Firefox
Allow an optional comma between month and year, and year and time.
* kjs/date_object.cpp:
(KJS::parseDate):
2007-07-11 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Mark.
Forwardport the hash table fix from CodeGeneratorJS.pm to create_hash_table.
Reran run-jsc-tests, couldn't find any regressions. Suggested by Darin.
* kjs/create_hash_table:
2007-06-25 Antti Koivisto <antti@apple.com>
Reviewed by Maciej.
Use intHash to hash floats and doubles too.
* ChangeLog:
* wtf/HashFunctions.h:
(WTF::FloatHash::hash):
(WTF::FloatHash::equal):
(WTF::):
* wtf/HashTraits.h:
(WTF::FloatHashTraits::emptyValue):
(WTF::FloatHashTraits::deletedValue):
(WTF::):
=== End merge of feature-branch 2007-10-12 ===
2007-10-11 Mark Rowe <mrowe@apple.com>
Reviewed by Tim Hatcher.
Fix for <rdar://problem/5488678>. Disable debugging symbols in production builds for 10.4
PowerPC to prevent a huge STABS section from being generated.
* Configurations/Base.xcconfig:
2007-10-08 George Staikos <staikos@kde.org>
Reviewed by Adam Roben.
Fix Qt build on Win32.
* kjs/testkjs.cpp:
(main):
2007-10-10 Simon Hausmann <hausmann@kde.org>
Reviewed by Lars.
Fix compilation using gcc 4.3. Header files have been reorganized and as a result some extra
includes are needed for INT_MAX, std::auto_ptr and the like.
* kjs/collector.cpp:
* kjs/collector.h:
* kjs/lexer.cpp:
* kjs/scope_chain.cpp:
* kjs/ustring.cpp:
* wtf/Vector.h:
2007-10-09 Lars Knoll <lars@trolltech.com>
Reviewed by Simon.
fix the invokation of slots with return types. Add a JSLock around the conversion from QVariant to JSValue.
* bindings/qt/qt_instance.cpp:
(KJS::Bindings::QtInstance::invokeMethod):
* bindings/qt/qt_runtime.cpp:
(KJS::Bindings::convertValueToQVariant):
(KJS::Bindings::convertQVariantToValue):
2007-10-05 Geoffrey Garen <ggaren@apple.com>
Reviewed by Sam Weinig.
Added JSObject::removeDirect, to support the fix for
<rdar://problem/5522487> REGRESSION: With JavaScript disabled, any
page load causes a crash in PropertyMap::put
* kjs/object.cpp:
(KJS::JSObject::removeDirect):
* kjs/object.h:
2007-10-04 Mark Rowe <mrowe@apple.com>
Reviewed by Oliver.
Switch to default level of debugging symbols to resolve <rdar://problem/5488678>.
The "full" level appears to offer no observable benefits even though the documentation
suggests it be used for dead code stripping. This should also decrease link times.
* Configurations/Base.xcconfig:
2007-10-03 Lars Knoll <lars@trolltech.com>
Reviewed by Rob.
Fix a stupid bug in Unicode::toUpper/toLower.
Fixes all three test failures in the JavaScriptCore test
suite.
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
2007-10-02 Darin Adler <darin@apple.com>
Reviewed by Adam.
- add support for GDI objects to OwnPtr; I plan to use this
to fix some GDI handle leaks
* kjs/grammar.y: Change parser to avoid macros that conflict
with macros defined in Windows system headers: THIS, DELETE,
VOID, IN, and CONST. This is needed because OwnPtr.h will now
include <windows.h>.
* kjs/keywords.table: Ditto.
* wtf/OwnPtr.h: For PLATFORM(WIN), add support so that OwnPtr can be
a GDI handle, and it will call DeleteObject. Also change to use the
RemovePointer technique used by RetainPtr, so you can say OwnPtr<HBITMAP>
rather than having to pass in the type pointed to by HBITMAP.
* wtf/OwnPtrWin.cpp: Added.
(WebCore::deleteOwnedPtr): Put this in a separate file so that we
don't have to include <windows.h> in OwnPtr.h.
* JavaScriptCore.vcproj/WTF/WTF.vcproj: Added OwnPtrWin.cpp.
2007-09-29 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Mark.
-Fix http://bugs.webkit.org/show_bug.cgi?id=13226.
Remove Bakefiles from svn.
* JavaScriptCoreSources.bkl: Removed.
* jscore.bkl: Removed.
2007-09-27 Kevin Decker <kdecker@apple.com>
Rubber stamped by John Sullivan.
<rdar://problem/5493093>
* JavaScriptCore.order: Added.
* JavaScriptCore.xcodeproj/project.pbxproj: We're changing from using an order file built by
another team to using one we actually check into our project repository. Linker settings for
Symbol Ordering Flags have been updated accordingly.
2007-09-26 Adam Roben <aroben@apple.com>
Make testkjs delay-load WebKit.dll so WebKitInitializer can work its magic
Rubberstamped by Anders.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2007-09-25 Adam Roben <aroben@apple.com>
Make testkjs delay-load its dependencies
This lets WebKitInitializer re-route the dependencies to be loaded out
of the Safari installation directory.
Rubberstamped by Sam.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2007-09-25 David Kilzer <ddkilzer@webkit.org>
Reviewed by Adam.
- Fix http://bugs.webkit.org/show_bug.cgi?id=14885
LGPL'ed files contain incorrect FSF address
* COPYING.LIB:
* bindings/testbindings.cpp:
* kjs/AllInOneFile.cpp:
* kjs/DateMath.cpp:
* kjs/PropertyNameArray.cpp:
* kjs/PropertyNameArray.h:
* kjs/config.h:
2007-09-25 Sam Weinig <sam@webkit.org>
Fix location for build products for Debug_Internal.
Reviewed by Adam Roben.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2007-09-25 Adam Roben <aroben@apple.com>
Make testkjs use WebKitInitializer
Reviewed by Sam.
* JavaScriptCore.vcproj/JavaScriptCore.sln: Add WebKitInitializer and
make testkjs depend on it.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Link against
WebKitInitializer.lib.
* kjs/testkjs.cpp:
(main): Call initializeWebKit.
2007-09-24 Kevin McCullough <kmccullough@apple.com>
Reviewed by Sam.
- Continued to update project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/WTF/WTF.vcproj:
2007-09-21 Kevin McCullough <kmccullough@apple.com>
Reviewed by Sam.
- Updated project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.
* JavaScriptCore.vcproj/dftables/dftables.vcproj:
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2007-09-20 Holger Hans Peter Freyther <zecke@selfish.org>
Rubber stamped by Adam.
Renamed files from *Gdk to *Gtk (see #14732) using the
work of Juan A. Suarez Romero as a base.
GDK -> GTK
* JavaScriptCore.pri:
* kjs/testkjs.pro:
* pcre/dftables.pro:
* wtf/Platform.h: PLATFORM(GDK) to PLATFORM(GTK)
2007-09-21 Mark Rowe <mrowe@apple.com>
Reviewed by Antti Koivisto.
http://bugs.webkit.org/show_bug.cgi?id=15250
<rdar://problem/5496942> REGRESSION: Reproducible crash in Safari when evaluating script in Drosera console (15250)
* kjs/function.cpp:
(KJS::GlobalFuncImp::callAsFunction): Null-check thisObj before passing it to interpreterForGlobalObject.
2007-09-19 Holger Hans Peter Freyther <zecke@selfish.org>
Rubber stamped by Adam.
Make the guard/#if use the same name (ENABLE_FTPDIR) as the #define. This follows
the ENABLE_ICONDATABASE example from a couple of lines above.
* wtf/Platform.h:
2007-09-19 Mark Rowe <mrowe@apple.com>
Reviewed by Maciej.
<rdar://problem/5487107> NULL dereference crash in FastMallocZone::enumerate when running leaks against Safari
Storing remote pointers to their local equivalents in mapped memory was leading to the local pointer being
interpreted as a remote pointer. This caused a crash when using the result of mapping this invalid remote pointer.
The fix is to follow the pattern used elsewhere in FastMallocZone by always doing the mapping after reading and
never storing the mapped pointer.
* wtf/FastMalloc.cpp:
(WTF::FastMallocZone::enumerate):
2007-09-15 Darin Adler <darin@apple.com>
- fix Mac build
* JavaScriptCore.exp: Export WTFLogVerbose.
2007-09-14 Kevin McCullough <kmccullough@apple.com>
Reviewed by Sam.
- Copy JSRetainPtr to include folder.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2007-09-13 Geoffrey Garen <ggaren@apple.com>
Try to fix GDK build.
* wtf/MathExtras.h:
(wtf_random_init):
2007-09-12 Geoff Garen <ggaren@apple.com>
Reviewed by Sam Weinig.
Fixed <rdar://problem/5429064> 141885 Safari JavaScript: Math.random() slightly less randomly distributed than on Safari / Mac
Math.random was skewed slightly upward because it assumed that RAND_MAX was outside the range of
values that rand() might return. This problem was particularly pronounced on Windows because
the range of values returned by rand() on Windows is 2^16 smaller than the range of values
return by rand() on Mac.
Fixed by accounting for RAND_MAX return values. Also, switched Windows over to rand_s, which has
a range that's equal to rand()'s range on Mac.
* kjs/config.h:
* kjs/math_object.cpp:
(MathFuncImp::callAsFunction): Use the new new thing.
* wtf/MathExtras.h: Platform abstraction for random numbers, to cover over differences on Windows.
(wtf_random_init):
(wtf_random):
2007-09-13 Antti Koivisto <antti@apple.com>
Reviewed by Maciej.
Small addition to previous path to cover
http://bugs.webkit.org/show_bug.cgi?id=11399
window.eval runs in the global scope of the calling window
Switch variable scope as well.
* kjs/function.cpp:
(KJS::GlobalFuncImp::callAsFunction):
2007-09-12 Antti Koivisto <antti@apple.com>
Reviewed by Geoff, Maciej.
Fix <rdar://problem/5445058>
REGRESSION: Unable to upload picture to eBay auction due to domain security check
eBay uses window.eval() between windows. In Firefox window.eval() switches execution
and security context to the target window, something WebKit did not do. With WebKit
security tightening in r24781, this broke picture uploads.
Fix by making WebKit switch context in window.eval().
* kjs/Context.cpp:
(KJS::Context::Context):
(KJS::Context::~Context):
* kjs/context.h:
Save and restore interpreter context independently from calling context.
* kjs/function.cpp:
(KJS::GlobalFuncImp::callAsFunction):
If eval is called for global object different than current one, switch execution context
to that object and push it to scope.
2007-09-12 Sam Weinig <sam@webkit.org>
Reviewed by Geoffrey Garen.
<rdar://problem/5478717> JSStringCreateWithCFString leaks when passed a zero length CFStringRef
* API/JSStringRefCF.cpp:
(JSStringCreateWithCFString): Special case the zero length string and remove the
UTF16 optimized path since it will always leak due to the fact that we won't be
able to free the backing store that the CFStringRef provides.
2007-09-10 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin Adler.
<rdar://problem/5456224> CrashTracer: [USER] 2 crashes in Toast Titanium at com.apple.CoreServices.CarbonCore: CSMemDisposePtr + 37
Removed the implementation of these malloc zone functions. We do not have the ability to
check if a pointer is valid or not, so we can't correctly implement them. The system free
does not fail if you pass in a bad pointer.
* wtf/FastMalloc.cpp:
(WTF::FastMallocZone::size):
(WTF::FastMallocZone::zoneMalloc):
(WTF::FastMallocZone::zoneCalloc):
(WTF::FastMallocZone::zoneFree):
(WTF::FastMallocZone::zoneRealloc):
2007-09-07 Darin Adler <darin@apple.com>
Reviewed by Steve Falkenburg.
- fix crash seen on Windows release builds
* wtf/FastMalloc.cpp: Change pthread_getspecific optimization to be done only
on the DARWIN platform. Also correct a couple reinterpret_cast that should be
static_cast instead.
2007-09-06 Kevin McCullough <kmccullough@apple.com>
Reviewed by Maciej.
- Moved JSRetainPtr to the API.
* API/JSRetainPtr.h: Copied from kjs/JSRetainPtr.h.
(JSRetain):
(JSRelease):
(JSRetainPtr::JSRetainPtr):
(JSRetainPtr::~JSRetainPtr):
(JSRetainPtr::get):
(JSRetainPtr::releaseRef):
(JSRetainPtr::operator->):
(JSRetainPtr::operator!):
(JSRetainPtr::operator UnspecifiedBoolType):
(::operator):
(::adopt):
(::swap):
(swap):
(operator==):
(operator!=):
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/JSRetainPtr.h: Removed.
2007-09-05 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- Remove single-threaded optimization for FastMalloc.
It does not appear to help anywhere but Mac OS X on PPC, due to
pthread_getspecific being slow there. On Intel, removing the
optimization results in a ~1.5% PLT speedup, a ~1-5% JS iBench
speedup, and a ~1.5% HTML iBench speedup. On PPC this change is a
speedup on some benchmarks, a slight hit on others.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/collector.cpp:
(KJS::Collector::registerThread):
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_ThreadCache::GetCache):
(WTF::TCMalloc_ThreadCache::GetCacheIfPresent):
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
(WTF::do_malloc):
* wtf/FastMallocInternal.h: Removed.
2007-09-05 Kevin McCullough <kmccullough@apple.com>
Reviewed by Adam, Sam, Darin.
- Created a JSRetainPtr specifically for JSStringRefs so they can be automatically refed and derefed.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/JSRetainPtr.h: Copied from wtf/RetainPtr.h.
(KJS::JSRetain):
(KJS::JSRelease):
(KJS::):
(KJS::JSRetainPtr::JSRetainPtr):
(KJS::JSRetainPtr::~JSRetainPtr):
(KJS::JSRetainPtr::get):
(KJS::JSRetainPtr::releaseRef):
(KJS::JSRetainPtr::operator->):
(KJS::JSRetainPtr::operator UnspecifiedBoolType):
(KJS::::operator):
(KJS::::adopt):
(KJS::::swap):
(KJS::swap):
(KJS::operator==):
(KJS::operator!=):
2007-09-05 Mark Rowe <mrowe@apple.com>
Unreviewed Qt build fix.
* wtf/unicode/qt4/UnicodeQt4.h: Fix the constness of the src argument to toUpper to prevent build failures.
2007-09-04 Maciej Stachowiak <mjs@apple.com>
Back out accidentally committed change.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/collector.cpp:
(KJS::Collector::registerThread):
* wtf/FastMalloc.cpp:
(WTF::fastMallocSetIsMultiThreaded):
(WTF::TCMalloc_ThreadCache::GetCache):
(WTF::TCMalloc_ThreadCache::GetCacheIfPresent):
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
(WTF::do_malloc):
* wtf/FastMallocInternal.h: Added.
2007-09-04 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- Added Vector::appendRange(), which appends to a vector based on a given start and end iterator
- Added keys() and values() functions to HashMap iterators, which give keys-only and values-only iterators
Together, these allow easy copying of a set, or the keys or values of a map, into a Vector. Examples:
HashMap<int, int> map;
HashSet<int> set;
Vector<int> vec;
// ...
vec.appendRange(set.begin(), set.end());
vec.appendRange(map.begin().keys(), map.end().keys());
vec.appendRange(map.begin().values(), map.end().values());
This also allows for a slightly nicer syntax when iterating a map. Instead of saying
(*it)->first, you can say *it.values(). Similarly for keys. Example:
HashMap<int, int>::const_iterator end = map.end();
for (HashMap<int, int>::const_iterator it = map.begin(); it != end; ++it)
printf(" [%d => %d]", *it.keys(), *it.values());
* JavaScriptCore.xcodeproj/project.pbxproj:
* wtf/HashIterators.h: Added.
(WTF::):
(WTF::HashTableConstKeysIterator::HashTableConstKeysIterator):
(WTF::HashTableConstKeysIterator::get):
(WTF::HashTableConstKeysIterator::operator*):
(WTF::HashTableConstKeysIterator::operator->):
(WTF::HashTableConstKeysIterator::operator++):
(WTF::HashTableConstValuesIterator::HashTableConstValuesIterator):
(WTF::HashTableConstValuesIterator::get):
(WTF::HashTableConstValuesIterator::operator*):
(WTF::HashTableConstValuesIterator::operator->):
(WTF::HashTableConstValuesIterator::operator++):
(WTF::HashTableKeysIterator::HashTableKeysIterator):
(WTF::HashTableKeysIterator::get):
(WTF::HashTableKeysIterator::operator*):
(WTF::HashTableKeysIterator::operator->):
(WTF::HashTableKeysIterator::operator++):
(WTF::HashTableKeysIterator::operator HashTableConstKeysIterator<HashTableType, KeyType, MappedType>):
(WTF::HashTableValuesIterator::HashTableValuesIterator):
(WTF::HashTableValuesIterator::get):
(WTF::HashTableValuesIterator::operator*):
(WTF::HashTableValuesIterator::operator->):
(WTF::HashTableValuesIterator::operator++):
(WTF::HashTableValuesIterator::operator HashTableConstValuesIterator<HashTableType, KeyType, MappedType>):
(WTF::operator==):
(WTF::operator!=):
* wtf/HashTable.h:
* wtf/Vector.h:
(WTF::::appendRange):
2007-09-04 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- Remove single-threaded optimization for FastMalloc.
It does not appear to help anywhere but Mac OS X on PPC, due to
pthread_getspecific being slow there. On Intel, removing the
optimization results in a 1% PLT speedup, a 2% JS iBench speedup,
and no measurable effect on HTML iBench (maybe a slight speedup).
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/collector.cpp:
(KJS::Collector::registerThread):
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_ThreadCache::GetCache):
(WTF::TCMalloc_ThreadCache::GetCacheIfPresent):
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
(WTF::do_malloc):
* wtf/FastMallocInternal.h: Removed.
2007-09-03 Mark Rowe <mrowe@apple.com>
Reviewed by Tim Hatcher.
<rdar://problem/5452164> Production build with in symbols directory has no debug info
Enable debug symbol generation on all build configurations. Production builds are stripped
of symbols by Xcode during deployment post-processing.
* Configurations/Base.xcconfig:
* JavaScriptCore.xcodeproj/project.pbxproj:
2007-08-30 Riku Voipio <riku.voipio@iki.fi>
Reviewed by Dave Kilzer.
Better ARM defines.
* kjs/ustring.h: Update comments to reflect the change and update test
to fit changes to Platform.h.
* wtf/Platform.h: Forced packing is only needed on oldabi ARM.
Set middle-endian floats only for little-endian oldabi ARM.
Set big-endian define for big-endian ARM.
2007-08-29 Ryan Leavengood <leavengood@gmail.com>
Reviewed by Maciej.
http://bugs.webkit.org/show_bug.cgi?id=15043
- posix_memalign takes a void** as its first parameter. My port makes use of this function call.
* kjs/collector.cpp:
(KJS::allocateBlock):
2007-08-26 Darin Adler <darin@apple.com>
- quick follow on to that last check-in
* API/JSCallbackObject.cpp: (KJS::JSCallbackObject::JSCallbackObject):
Need to initialize m_class to 0.
2007-08-26 Mark Rowe <mrowe@apple.com>
Reviewed by Darin Adler.
<rdar://problem/4949002> JSGlobalContextCreate can cause crashes because it passes a NULL JSContextRef to the globalObjectClass's initialize callback
JSCallbackObject now tracks whether it was constructed with a null ExecState. This will happen when the object is being used as the global object,
as the Interpreter needs to be created after the global object. In this situation the initialization is deferred until after the Interpreter's
ExecState is available to be passed down to the initialize callbacks.
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::init): Track whether we successfully initialized.
(KJS::JSCallbackObject::initializeIfNeeded): Attempt to initialize with the new ExecState.
* API/JSCallbackObject.h:
* API/JSContextRef.cpp:
(JSGlobalContextCreate): Initialize the JSCallbackObject with the Interpreter's ExecState.
* API/testapi.c:
(testInitializeOfGlobalObjectClassHasNonNullContext):
(main): Verify that the context passed to the initialize callback is non-null.
2007-08-26 Mark Rowe <mrowe@apple.com>
Reviewed by Darin Adler.
<rdar://problem/5438496> JSGlobalContextCreate crashes when passed a custom class
* API/JSContextRef.cpp:
(JSGlobalContextCreate): Specify jsNull() as the prototype and let Interpreter's constructor fix it up to point at builtinObjectPrototype().
* API/testapi.c:
(main): Use an instance of a custom class as the global object to ensure the code path is exercised in the test.
2007-08-26 Mike Hommey <glandium@debian.org>
Reviewed by Mark Rowe and David Kilzer.
Fix build failure on arm.
* wtf/Platform.h: Also test if __arm__ is defined.
2007-08-25 Peter Kasting <pkasting@google.com>
Reviewed by Maciej Stachowiak.
Part 3 of http://bugs.webkit.org/show_bug.cgi?id=14967
Bug 14967: Reduce wtf::Vector::operator[]() overloads
* wtf/Vector.h:
(WTF::Vector::operator[]): Only provide versions of operator[] that takes a size_t argument.
2007-08-25 Peter Kasting <pkasting@google.com>
Reviewed by Sam Weinig.
Part 2 of http://bugs.webkit.org/show_bug.cgi?id=14967.
Eliminate all remaining implicit conversions of wtf::Vector<T> to T*. Where code was
previously checking that the Vector's data pointer was non-NULL, check !Vector::isEmpty()
instead.
* wtf/Vector.h:
(WTF::Vector::data):
2007-08-16 Kevin McCullough <kmccullough@apple.com>
Reviewed by Geoff and Adam.
- Changing stack depth to 500 (from 100 on mac and win) to help out some apps specifically gmail. <rdar://problem/3590522> JavaScript call stack limit of 99 is too small for some applications; needs to be closer to 500 (4045)
* kjs/object.cpp:
2007-08-15 Peter Kasting <pkasting@google.com>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=14967 part 1 - Eliminate most implicit
conversions of wtf::Vector<T> to T* by explicitly calling .data()
* API/JSCallbackConstructor.cpp:
(KJS::JSCallbackConstructor::construct):
* API/JSCallbackFunction.cpp:
(KJS::JSCallbackFunction::callAsFunction):
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::callAsFunction):
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::invokeMethod):
(KJS::Bindings::CInstance::invokeDefaultMethod):
* kjs/number_object.cpp:
(integer_part_noexp):
(char_sequence):
* kjs/ustring.cpp:
(KJS::UString::UTF8String):
2007-08-14 Darin Adler <darin@apple.com>
Reviewed by Sam.
- fix <rdar://problem/5410570> Global initializer introduced by use of std::numeric_limits in r24919
* kjs/ustring.cpp:
(KJS::overflowIndicator): Turned into a function.
(KJS::maxUChars): Ditto.
(KJS::allocChars): Use the functions.
(KJS::reallocChars): Ditto.
(KJS::UString::expandedSize): Ditto.
2007-08-12 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=14931
<rdar://problem/5403816> JavaScript regular expression non-participating capturing parentheses
fail in 3 different ways
Test: fast/js/regexp-non-capturing-groups.html
* kjs/string_object.cpp:
(KJS::replace): Add missing code to handle undefined backreferences; before we'd get the empty string
instead of a JavaScript "undefined" value.
(KJS::StringProtoFunc::callAsFunction): Implemented backreference support for split.
* pcre/pcre_exec.c: (match): Made backreferences to undefined groups match the empty string instead
of always failing. Only in JAVASCRIPT mode.
* tests/mozilla/expected.html: Add a new expected test success, since this fixed one test result.
2007-08-10 Timothy Hatcher <timothy@apple.com>
Reviewed by Adam.
<rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit
Disable the NPAPI for 64-bit on Mac OS X.
* Configurations/JavaScriptCore.xcconfig: Use the 64-bit export file.
* JavaScriptCore.xcodeproj/project.pbxproj: Create a 64-bit export file
that filters out the NPN fnctions.
* bindings/NP_jsobject.cpp: #ifdef out this for 64-bit on Mac OS X
* bindings/NP_jsobject.h: Ditto.
* bindings/c/c_class.cpp: Ditto.
* bindings/c/c_class.h: Ditto.
* bindings/c/c_instance.cpp: Ditto.
* bindings/c/c_instance.h: Ditto.
* bindings/c/c_runtime.cpp: Ditto.
* bindings/c/c_runtime.h: Ditto.
* bindings/c/c_utility.cpp: Ditto.
* bindings/c/c_utility.h: Ditto.
* bindings/npapi.h: Ditto.
* bindings/npruntime.cpp: Ditto.
* bindings/npruntime.h: Ditto.
* bindings/npruntime_impl.h: Ditto.
* bindings/npruntime_priv.h: Ditto.
* bindings/runtime.cpp:
(KJS::Bindings::Instance::createBindingForLanguageInstance):
don't creat an NPObject on Mac OS X in 64-bit.
2007-08-09 Mark Rowe <mrowe@apple.com>
Reviewed by Antti.
<rdar://problem/5400709> Versioning in debug and release builds should include minor and tiny version before +
* Configurations/Version.xcconfig:
* JavaScriptCore.xcodeproj/project.pbxproj: Add a shell script phase to make to dependency between
Version.xcconfig and Info.plist explicit to Xcode.
2007-08-08 George Staikos <staikos@kde.org>
Make it compile with Qt again.
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::toUpper):
2007-08-07 Sam Weinig <sam@webkit.org>
Reviewed by Oliver.
Fix for http://bugs.webkit.org/show_bug.cgi?id=14897
Decompilation of double negation fails and produces invalid or incorrect code
Test: fast/js/function-decompilation-operators.html
* kjs/nodes2string.cpp:
(UnaryPlusNode::streamTo): Put space after unary operator. Matches Firefox.
(NegateNode::streamTo): Diito.
(MultNode::streamTo): Put spaces around binary operator. Matches Firefox.
(AddNode::streamTo): Ditto.
2007-08-07 Darin Adler <darin@apple.com>
Reviewed by Adele.
- fix <rdar://problem/5383104> REGRESSION: XHR.responseText is null instead of empty string
in http/tests/xmlhttprequest/zero-length-response.html
The new code to handle out of memory conditions was turning a "" into a null string.
* kjs/ustring.h: Removed UCharReference, which has long been obsolete and unused.
Removed copyForWriting, which was only used for the upper/lowercasing code and for
UCharReference.
* kjs/ustring.cpp:
(KJS::allocChars): Removed special case that made this fail (return 0) when passed 0.
Instead assert that we're not passed 0. Also added an overflow check for two reasons:
1) for sizes that aren't checked this prevents us from allocating a buffer that's too
small, and 2) for sizes where we overflowed in the expandedSize function and returned
overflowIndicator, it guarantees we fail.
(KJS::reallocChars): Ditto.
(KJS::UString::expandedSize): Return a large number, overflowIndicator, rather than 0
for cases where we overflow.
(KJS::UString::spliceSubstringsWithSeparators): Added a special case for empty string so
we don't call allocChars with a length of 0.
(KJS::UString::operator=): Added special characters for both 0 and empty string so we
match the behavior of the constructor. This avoids calling allocChars with a length of 0
and making a null string rather than an empty string in that case, and also matches the
pattern used in the rest of the functions.
(KJS::UString::operator[]): Made the return value const so code that tries to use the
operator to modify the string will fail.
* kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction): Rewrote uppercasing and
lowercasing functions so they don't need copyForWriting any more -- it wasn't really doing
any good for optimization purposes. Instead use a Vector and releaseBuffer.
* wtf/unicode/icu/UnicodeIcu.h: Eliminate one of the versions of toLower/toUpper -- we now
only need the version where both a source and destination buffer is passed in, not the one
that works in place.
* wtf/unicode/qt4/UnicodeQt4.h: Ditto.
2007-08-06 Sam Weinig <sam@webkit.org>
Reviewed by Oliver.
Fix for http://bugs.webkit.org/show_bug.cgi?id=14891
Decompilation of try block immediately following "else" fails
Test: fast/js/toString-try-else.html
* kjs/nodes2string.cpp:
(TryNode::streamTo): Add newline before "try".
2007-08-07 Mark Rowe <mrowe@apple.com>
Reviewed by Maciej.
<rdar://problem/5388774> REGRESSION: Hang occurs after clicking "Attach a file " link in a new .Mac message
Attempting to acquire the JSLock inside CollectorHeap::forceLock can lead to a deadlock if the thread currently
holding the lock is waiting on the thread that is forking. It is not considered safe to use system frameworks
after a fork without first execing[*] so it is not particularly important to ensure that the collector and
fastMalloc allocators are unlocked in the child process. If the child process wishes to use JavaScriptCore it
should exec after forking like it would to use any other system framework.
[*]: <http://lists.apple.com/archives/Cocoa-dev/2005/Jan/msg00676.html>
* kjs/CollectorHeapIntrospector.cpp: Remove forceLock and forceUnlock implementations.
* kjs/CollectorHeapIntrospector.h: Stub out forceLock and forceUnlock methods.
* wtf/FastMalloc.cpp: Ditto.
2007-08-06 Darin Adler <darin@apple.com>
Rubber stamped by Geoff.
* kjs/ustring.h: Added an assertion which would have helped us find the
previous bug more easily.
2007-08-06 Darin Adler <darin@apple.com>
Reviewed by Anders.
- fix <rdar://problem/5387589> 9A514: Quartz Composer crash on launch in KJS::jsString
* API/JSBase.cpp:
(JSEvaluateScript): Turn NULL for sourceURL into UString::null(), just as JSObjectMakeFunction already does.
(JSCheckScriptSyntax): Ditto.
2007-08-06 Matt Lilek <pewtermoose@gmail.com>
Not reviewed, build fix.
* kjs/string_object.cpp:
(KJS::StringProtoFunc::callAsFunction):
2007-08-04 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix <rdar://problem/5371862> crash in Dashcode due to Quartz Composer JavaScript garbage collector reentrancy
* API/JSBase.cpp: (JSGarbageCollect): Don't call collector() if isBusy() returns true.
* kjs/collector.h: Added isBusy(), removed the unused return value from collect()
* kjs/collector.cpp: Added an "operation in progress" flag to the allocator.
(KJS::Collector::allocate): Call abort() if an operation is already in progress. Set the new flag instead
of using the debug-only GCLock.
(KJS::Collector::collect): Ditto.
(KJS::Collector::isBusy): Added.
2007-08-04 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin and Adam.
<rdar://problem/5368990> REGRESSION: newsgator.com sign-on 6x slower than Safari 3 beta due to GC changes (14808)
* kjs/string_object.cpp:
(KJS::replace): if the string didn't change (very common in some cases) reuse the original string value.
(KJS::StringProtoFunc::callAsFunction): Pass in the StringImp* when replacing, not just the UString.
* kjs/string_object.h:
(KJS::StringInstance::internalValue): covariant override to return StringImp for convenience
2007-08-04 Mark Rowe <mrowe@apple.com>
Reviewed by Oliver Hunt.
<rdar://problem/5385145> r24843 introduces a crash on calling fork() (14878)
http://bugs.webkit.org/show_bug.cgi?id=14878
Provide no-op functions for all members of the malloc_zone_t and malloc_introspection_t structures that we
register to avoid crashes in system code that assumes they will be non-null.
* kjs/CollectorHeapIntrospector.cpp:
(KJS::CollectorHeapIntrospector::CollectorHeapIntrospector):
(KJS::CollectorHeapIntrospector::forceLock): Grab the lock.
(KJS::CollectorHeapIntrospector::forceUnlock): Release the lock.
* kjs/CollectorHeapIntrospector.h:
(KJS::CollectorHeapIntrospector::goodSize):
(KJS::CollectorHeapIntrospector::check):
(KJS::CollectorHeapIntrospector::print):
(KJS::CollectorHeapIntrospector::log):
(KJS::CollectorHeapIntrospector::statistics):
(KJS::CollectorHeapIntrospector::size):
(KJS::CollectorHeapIntrospector::zoneMalloc):
(KJS::CollectorHeapIntrospector::zoneCalloc):
(KJS::CollectorHeapIntrospector::zoneFree):
* wtf/FastMalloc.cpp:
(WTF::FastMallocZone::goodSize):
(WTF::FastMallocZone::check):
(WTF::FastMallocZone::print):
(WTF::FastMallocZone::log):
(WTF::FastMallocZone::forceLock): Grab the TCMalloc locks.
(WTF::FastMallocZone::forceUnlock): Release the TCMalloc locks.
(WTF::FastMallocZone::FastMallocZone):
2007-08-04 Mark Rowe <mrowe@apple.com>
Rubber-stamped by Anders.
* pcre/pcre_compile.c: Remove non-ASCII character from a comment.
2007-08-02 Mark Rowe <mrowe@apple.com>
Reviewed by Geoff Garen.
<rdar://problem/4212199> 'leaks' reports false leaks in WebKit (because the WTF allocator uses mmap?)
Implement malloc zone introspection routines to allow leaks, heap, and friends to request information
about specific memory regions that were allocated by FastMalloc or the JavaScriptCore collector.
This requires tool-side support before the regions will be displayed. The addition of that support is
tracked by <rdar://problems/5353057&5353060>.
* JavaScriptCore.exp: Export the two variables that are used by leaks to introspect the allocators.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/AllInOneFile.cpp:
* kjs/CollectorHeapIntrospector.cpp: Added.
(KJS::):
(KJS::CollectorHeapIntrospector::init):
(KJS::CollectorHeapIntrospector::CollectorHeapIntrospector): Create and register our zone with the system.
(KJS::CollectorHeapIntrospector::enumerate): Iterate over the CollectorBlocks that are in use and report them to the caller as being used.
* kjs/CollectorHeapIntrospector.h: Added.
(KJS::CollectorHeapIntrospector::size): Return zero to indicate the specified pointer does not belong to this zone.
* kjs/collector.cpp:
(KJS::Collector::registerThread): Register the CollectorHeapIntrospector with the system when the first thread is registered with the collector.
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_PageHeap::GetDescriptorEnsureSafe):
(WTF::TCMalloc_ThreadCache_FreeList::enumerateFreeObjects): Enumerate the objects on the free list.
(WTF::TCMalloc_ThreadCache::enumerateFreeObjects): Ditto.
(WTF::TCMalloc_Central_FreeList::enumerateFreeObjects): Ditto.
(WTF::TCMalloc_ThreadCache::InitModule): Register the FastMallocZone with the system when initializing TCMalloc.
(WTF::FreeObjectFinder::FreeObjectFinder):
(WTF::FreeObjectFinder::visit): Add an object to the free list.
(WTF::FreeObjectFinder::isFreeObject):
(WTF::FreeObjectFinder::freeObjectCount):
(WTF::FreeObjectFinder::findFreeObjects): Find the free objects within a thread cache or free list.
(WTF::PageMapFreeObjectFinder::PageMapFreeObjectFinder): Find the free objects within a TC_PageMap.
(WTF::PageMapFreeObjectFinder::visit): Called once per allocated span. Record whether the span or any subobjects are free.
(WTF::PageMapMemoryUsageRecorder::PageMapMemoryUsageRecorder):
(WTF::PageMapMemoryUsageRecorder::visit): Called once per allocated span. Report the range of memory as being allocated, and the span or
its subobjects as being used if they do not appear on the free list.
(WTF::FastMallocZone::enumerate): Map the key remote TCMalloc data structures into our address space. We then locate all free memory ranges
before reporting the other ranges as being in use.
(WTF::FastMallocZone::size): Determine whether the given pointer originates from within our allocation zone. If so,
we return its allocation size.
(WTF::FastMallocZone::zoneMalloc):
(WTF::FastMallocZone::zoneCalloc):
(WTF::FastMallocZone::zoneFree):
(WTF::FastMallocZone::zoneRealloc):
(WTF::):
(WTF::FastMallocZone::FastMallocZone): Create and register our zone with the system.
(WTF::FastMallocZone::init):
* wtf/MallocZoneSupport.h: Added.
(WTF::RemoteMemoryReader::RemoteMemoryReader): A helper class to ease the process of mapping memory in a different process into
our local address space
(WTF::RemoteMemoryReader::operator()):
* wtf/TCPageMap.h:
(TCMalloc_PageMap2::visit): Walk over the heap and visit each allocated span.
(TCMalloc_PageMap3::visit): Ditto.
2007-08-02 Mark Rowe <mrowe@apple.com>
Build fix.
* kjs/ustring.cpp:
(KJS::UString::expandedSize): Use std::numeric_limits<size_t>::max() rather than the non-portable SIZE_T_MAX.
2007-08-02 Mark Rowe <mrowe@apple.com>
Reviewed by Maciej.
<rdar://problem/5352887> "Out of memory" error during repeated JS string concatenation leaks hundreds of MBs of RAM
A call to fastRealloc was failing which lead to UString::expandCapacity leaking the buffer it was trying to reallocate.
It also resulted in the underlying UString::rep having both a null baseString and buf field, which meant that attempting
to access the contents of the string after the failed memory reallocation would crash.
A third issue is that expandedSize size was calculating the new length in a way that led to an integer overflow occurring.
Attempting to allocate a string more than 190,000,000 characters long would fail a the integer overflow would lead to a
memory allocation of around 3.6GB being attempted rather than the expected 390MB. Sizes that would lead to an overflow
are now returned as zero and callers are updated to treat this as though the memory allocation has failed.
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): Check whether the append failed and raise an "Out of memory" exception if it did.
* kjs/ustring.cpp:
(KJS::allocChars): Wrapper around fastMalloc that takes a length in characters. It will return 0 when asked to allocate a zero-length buffer.
(KJS::reallocChars): Wrapper around fastRealloc that takes a length in characters. It will return 0 when asked to allocate a zero-length buffer.
(KJS::UString::expandedSize): Split the size calculation in two and guard against overflow during each step.
(KJS::UString::expandCapacity): Don't leak r->buf if reallocation fails. Instead free the memory and use the null representation.
(KJS::UString::expandPreCapacity): If fastMalloc fails then use the null representation rather than crashing in memcpy.
(KJS::UString::UString): If calls to expandCapacity, expandPreCapacity or fastMalloc fail then use the null representation rather than crashing in memcpy.
(KJS::UString::append): Ditto.
(KJS::UString::operator=): Ditto.
* kjs/ustring.h: Change return type of expandedSize from int to size_t.
2007-08-01 Darin Adler <darin@apple.com>
Reviewed by Kevin McCullough.
- fix <rdar://problem/5375186> pointers to pieces of class definition passed to JSClassCreate should all be const
* API/JSObjectRef.h: Added const.
* API/JSClassRef.cpp:
(OpaqueJSClass::OpaqueJSClass): Added const.
(OpaqueJSClass::create): Added const.
* API/JSObjectRef.cpp:
(JSClassCreate): Added const.
2007-08-01 Steve Falkenburg <sfalken@apple.com>
Build mod: Fix sln to match configs in vcproj.
Reviewed by Adam.
* JavaScriptCore.vcproj/JavaScriptCore.make:
* JavaScriptCore.vcproj/JavaScriptCore.sln:
2007-07-30 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars.
Removed the __BUILDING_QT ifdef in JSStringRef.h and changed UChar for the Qt build to use wchar_t on Windows.
* API/JSStringRef.h:
* wtf/unicode/qt4/UnicodeQt4.h:
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Always define JSChar to be unsigned short for the Qt builds, to ensure compatibility with UChar.
* API/JSStringRef.h:
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Fix compilation with Qt on Windows with MingW: Implemented currentThreadStackBase() for this platform.
* kjs/collector.cpp:
(KJS::currentThreadStackBase):
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Fix compilation with Qt on Windows with MingW: The MingW headers do not provide a prototype for a reentrant version of localtime. But since we don't use multiple threads for the Qt build we can use the plain localtime() function.
* kjs/DateMath.cpp:
(KJS::getDSTOffsetSimple):
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Use $(MOVE) instead of mv to eliminated the shell dependency and replaced the long shell line to call bison and modify the css grammar file with a few lines of portable perl code.
* JavaScriptCore.pri:
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Implemented currentTime() in the interpreter by using QDateTime, so that we don't need timeGetTime() on Windows and therefore also don't need to link against Winmm.dll.
* kjs/interpreter.cpp:
(KJS::getCurrentTime):
* kjs/testkjs.cpp:
(StopWatch::start):
(StopWatch::stop):
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Replace the use of snprintf with QByteArray to compile under msvc 2005 express.
* bindings/qt/qt_instance.cpp:
(KJS::Bindings::QtInstance::stringValue):
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Don't use pthread.h unless thread support is enabled.
* kjs/collector.cpp:
(KJS::Collector::registerAsMainThread):
(KJS::onMainThread):
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Removed TCSystemMalloc from the Qt build, it's not necessary it seems.
* JavaScriptCore.pri:
2007-07-27 Simon Hausmann <hausmann@kde.org>
Done with and reviewed by Lars and Zack.
Added os-win32 to the include search path for the Qt windows build in order to provide the fake stdint.h header file.
* JavaScriptCore.pri:
2007-07-25 Maciej Stachowiak <mjs@apple.com>
Reviewed by Mark.
- follow-up to previous change
* kjs/ustring.cpp:
(KJS::UString::operator=): Make sure to reset the length when
replacing the buffer contents for a single-owned string.
2007-07-25 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- JavaScriptCore part of fix for <rdar://problem/5300291> Optimize GC to reclaim big, temporary objects (like XMLHttpRequest.responseXML) quickly
Also, as a side effect of optimizations included in this patch:
- 7% speedup on JavaScript iBench
- 4% speedup on "Celtic Kane" JS benchmark
The basic idea is explained in a big comment in collector.cpp. When unusually
large objecs are allocated, we push the next GC closer on the assumption that
most objects are short-lived.
I also did the following two optimizations in the course of tuning
this not to be a performance regression:
1) Change UString::Rep to hold a self-pointer as the baseString in
the unshared case, instead of a null pointer; this removes a
number of null checks in hot code because many places already
wanted to use the rep itself or the baseString as appropriate.
2) Avoid creating duplicate StringImpls when creating a
StringInstance (the object wrapper for a JS string) or calling
their methods. Since a temporary wrapper object is made every time
a string method is called, this resulted in two useless extra
StringImpls being allocated for no reason whenever a String method
was invoked on a string value. Now we bypass those.
* kjs/collector.cpp:
(KJS::):
(KJS::Collector::recordExtraCost): Basics of the extra cost mechanism.
(KJS::Collector::allocate): ditto
(KJS::Collector::collect): ditto
* kjs/collector.h:
(KJS::Collector::reportExtraMemoryCost): ditto
* kjs/array_object.cpp:
(ArrayInstance::ArrayInstance): record extra cost
* kjs/internal.cpp:
(KJS::StringImp::toObject): don't create a whole new StringImpl just
to be the internal value of a StringInstance! StringImpls are immutable
so there's no point tot his.
* kjs/internal.h:
(KJS::StringImp::StringImp): report extra cost
* kjs/string_object.cpp:
(KJS::StringInstance::StringInstance): new version that takes a StringImp
(KJS::StringProtoFunc::callAsFunction): don't create a whole new StringImpl
just to convert self to string! we already have one in the internal value
* kjs/string_object.h: report extra cost
* kjs/ustring.cpp: All changes to handle baseString being self instead of null in the
unshared case.
(KJS::):
(KJS::UString::Rep::create):
(KJS::UString::Rep::destroy):
(KJS::UString::usedCapacity):
(KJS::UString::usedPreCapacity):
(KJS::UString::expandCapacity):
(KJS::UString::expandPreCapacity):
(KJS::UString::UString):
(KJS::UString::append):
(KJS::UString::operator=):
(KJS::UString::copyForWriting):
* kjs/ustring.h:
(KJS::UString::Rep::baseIsSelf): new method, now that baseString is
self instead of null in the unshared case we can't just null check.
(KJS::UString::Rep::data): adjusted as mentioned above
(KJS::UString::cost): new method to compute the cost for a UString, for
use by StringImpl.
* kjs/value.cpp:
(KJS::jsString): style fixups.
(KJS::jsOwnedString): new method, use this for strings allocated from UStrings
held by the parse tree. Tracking their cost as part of string cost is pointless,
because garbage collecting them will not actually free the relevant string buffer.
* kjs/value.h: prototyped jsOwnedString.
* kjs/nodes.cpp:
(StringNode::evaluate): use jsOwnedString as appropriate
(RegExpNode::evaluate): ditto
(PropertyNameNode::evaluate): ditto
(ForInNode::execute): ditto
* JavaScriptCore.exp: Exported some new symbols.
2007-07-23 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
<rdar://problem/5121461> REGRESSION: Unable to load JigZone puzzle
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::createNative):
Call RootObject::gcProtect on the global object, thereby putting it in the
"protect count" set which is used for checking if a native handle is valid.
2007-07-23 Darin Adler <darin@apple.com>
* pcre/pcre_compile.c: Roll back a tiny accidental change in the unused !JAVASCRIPT
side of an #ifdef. This has no effect when using PCRE in JAVASCRIPT mode as we do,
but seems worth rolling back.
2007-07-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- fix remaining problems with Window shadowing
* kjs/nodes.cpp:
(VarDeclNode::evaluate): Tweak the special case a little.
2007-07-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- fix Window shadowing regressions caused by the previous commit.
* kjs/nodes.cpp:
(VarDeclNode::evaluate): Handle the case of global scope specially.
2007-07-22 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
-fixed <rdar://problem/5353293> REGRESSION (r24287): 1% i-Bench JS slowdown from JavaScript compatibility fix (14719)
http://bugs.webkit.org/show_bug.cgi?id=14719
My fix for this actually resulted in JS iBench being 1% faster than before the regression
and the Celtic Kane benchmark being 5% faster than before the regression.
* kjs/nodes.cpp:
(VarDeclNode::handleSlowCase): factored out the slow code path to be out of line.
(VarDeclNode::evaluate): I did a couple of things:
(1) Don't check if the variable is already declared by looking for the property in
the variable object, that code path was dead code.
(2) Special-case the common case where the top of the scope and the variable object
are the same; in that case the variable must always be in the variable object.
(3) Don't return a jsString() of the variable name, nothing uses the return value
from this node types evaluate method.
* kjs/nodes.h:
2007-07-22 Darin Adler <darin@apple.com>
Reviewed by Kevin Decker.
- fix <rdar://problem/5126394> REGRESSION: Crash after clicking back button in test application (13250)
http://bugs.webkit.org/show_bug.cgi?id=13250
* bindings/objc/objc_utility.mm: (KJS::Bindings::convertObjcValueToValue):
If the object returns 0 for _imp, convert that to "undefined", since callers
can't cope with a JSValue of 0.
2007-07-19 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin Adler.
Fixed http://bugs.webkit.org/show_bug.cgi?id=10880 | <rdar://problem/5335694>
REGRESSION: JavaScript menu doesn't appear on pricepoint.com (14595)
Though the ECMA spec says auto-semicolon insertion should not occur
without a newline or '}', Firefox treats do-while specially, and the
library used by pricepoint.com requires that special treatment.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/grammar.y:
2007-07-19 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- fix <rdar://problem/5345440> PCRE computes wrong length for expressions with quantifiers
on named recursion or subexpressions
It's challenging to implement proper preflighting for compiling these advanced features.
But we don't want them in the JavaScript engine anyway.
Turned off the following features of PCRE (some of these are simply parsed and not implemented):
\C \E \G \L \N \P \Q \U \X \Z
\e \l \p \u \z
[::] [..] [==]
(?#) (?<=) (?<!) (?>)
(?C) (?P) (?R)
(?0) (and 1-9)
(?imsxUX)
Added the following:
\u \v
Because of \v, the js1_2/regexp/special_characters.js test now passes.
To be conservative, I left some features that JavaScript doesn't want, such as
\012 and \x{2013}, in place. We can revisit these later; they're not directly-enough
related to avoiding the incorrect preflighting.
I also didn't try to remove unused opcodes and remove code from the execution engine.
That could save code size and speed things up a bit, but it would require more changes.
* kjs/regexp.h:
* kjs/regexp.cpp: (KJS::RegExp::RegExp): Remove the sanitizePattern workaround for
lack of \u support, since the PCRE code now has \u support.
* pcre/pcre-config.h: Set JAVASCRIPT to 1.
* pcre/pcre_internal.h: Added ESC_v.
* pcre/pcre_compile.c: Added a different escape table for when JAVASCRIPT is set that
omits all the escapes we don't want interpreted and includes '\v'.
(check_escape): Put !JAVASCRIPT around the code for '\l', '\L', '\N', '\u', and '\U',
and added code to handle '\u2013' inside JAVASCRIPT.
(compile_branch): Put !JAVASCRIPT if around all the code implementing the features we
don't want.
(pcre_compile2): Ditto.
* tests/mozilla/expected.html: Updated since js1_2/regexp/special_characters.js now
passes.
2007-07-18 Darin Adler <darin@apple.com>
Reviewed by Oliver Hunt.
- fix <rdar://problem/5345432> PCRE computes length wrong for expressions such as "[**]"
Test: fast/js/regexp-charclass-crash.html
* pcre/pcre_compile.c: (pcre_compile2): Fix the preflight code that calls
check_posix_syntax to match the actual regular expression compilation code;
before it was missing the check of the first character.
2007-07-19 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Mark.
Define __BUILDING_GDK when building for Gdk to fix building testkjs on OSX.
* JavaScriptCore.pri:
2007-07-18 Simon Hausmann <hausmann@kde.org>
* Fix the Qt build, call dftables from the right directory.
Reviewed by Adam Treat.
* pcre/pcre.pri:
2007-07-18 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
Don't call gcc directly when building the dftables tool but use a separate .pro file for the Qt build.
* pcre/dftables.pro: Added.
* pcre/pcre.pri:
2007-07-17 Cameron Zwarich <cwzwarich@uwaterloo.ca>
Reviewed by Darin, Maciej, and Adam.
Fixes <http://bugs.webkit.org/show_bug.cgi?id=9697>,
the failure of ecma/GlobalObject/15.1.2.2-2.js,
the failure of ecma/LexicalConventions/7.7.3-1.js,
and most of the failures of tests in ecma/TypeConversion/9.3.1-3.js.
Bug 9697: parseInt results may be inaccurate for numbers greater than 2^53
This patch also fixes similar issues in the lexer and UString::toDouble().
* kjs/function.cpp:
(KJS::parseIntOverflow):
(KJS::parseInt):
* kjs/function.h:
* kjs/lexer.cpp:
(KJS::Lexer::lex):
* kjs/ustring.cpp:
(KJS::UString::toDouble):
* tests/mozilla/expected.html:
2007-07-16 Sam Weinig <sam@webkit.org>
Reviewed by Oliver.
Turn off -Wshorten-64-to-32 warning for 64-bit builds.
* Configurations/Base.xcconfig:
2007-07-14 Brady Eidson <beidson@apple.com>
Reviewed by Sam Weinig
Initial check-in for <rdar://problem/3154486> - Supporting FTP directory listings in the browser
* wtf/Platform.h: Add ENABLE_FTPDIR feature to handle building on platforms that don't have the
proper network-layer support
2007-07-14 Cameron Zwarich <cwzwarich@uwaterloo.ca>
Reviewed by Darin.
Fixes http://bugs.webkit.org/show_bug.cgi?id=13517,
http://bugs.webkit.org/show_bug.cgi?id=14237, and
the failure of test js1_5/Scope/regress-185485.js
Bug 13517: DOM Exception 8 in finance.aol.com sub-page
Bug 14237: Javascript "var" statement interprets initialization in the topmost function scope
* kjs/nodes.cpp:
(VarDeclNode::evaluate):
* tests/mozilla/expected.html:
2007-07-12 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Mitz.
http://bugs.webkit.org/show_bug.cgi?id=14596
Fix JSC compilation with KJS_VERBOSE.
* kjs/function.cpp:
(KJS::FunctionImp::passInParameters):
2007-07-11 George Staikos <staikos@kde.org>
Make it compile.
* ForwardingHeaders: Added.
* ForwardingHeaders/JavaScriptCore: Added.
* ForwardingHeaders/JavaScriptCore/APICast.h: Added.
* ForwardingHeaders/JavaScriptCore/JSBase.h: Added.
* ForwardingHeaders/JavaScriptCore/JSContextRef.h: Added.
* ForwardingHeaders/JavaScriptCore/JSLock.h: Added.
* ForwardingHeaders/JavaScriptCore/JSObjectRef.h: Added.
* ForwardingHeaders/JavaScriptCore/JSStringRef.h: Added.
* ForwardingHeaders/JavaScriptCore/JSStringRefCF.h: Added.
* ForwardingHeaders/JavaScriptCore/JSValueRef.h: Added.
* ForwardingHeaders/JavaScriptCore/JavaScriptCore.h: Added.
2007-07-11 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Darin.
As of http://bugs.webkit.org/show_bug.cgi?id=14527 move the
WebCore/ForwardingHeader/JavaScriptCore to JavaScriptCore
* ForwardingHeaders: Added.
* ForwardingHeaders/JavaScriptCore: Copied from WebCore/ForwardingHeaders/JavaScriptCore.
2007-07-11 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Mark.
Forwardport the hash table fix from CodeGeneratorJS.pm to create_hash_table.
Reran run-jsc-tests, couldn't find any regressions. Suggested by Darin.
* kjs/create_hash_table:
2007-07-09 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- JavaScriptCore part of fix for: <rdar://problem/5295734> Repro crash closing tab/window @ maps.google.com in WTF::HashSet<KJS::RuntimeObjectImp*, WTF::PtrHash<KJS::RuntimeObjectImp*>, WTF::HashTraits<KJS::RuntimeObjectImp*> >::add + 11
* JavaScriptCore.exp: Added needed export.
2007-07-06 Maciej Stachowiak <mjs@apple.com>
Reviewed by Antti.
- <rdar://problem/5311093> JavaScriptCore fails to build with strict-aliasing warnings
* Configurations/Base.xcconfig: Re-enable -Wstrict-aliasing
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJNIEnv): Type-pun via a union instead of a pointer cast.
* wtf/HashMap.h:
(WTF::): Instead of doing type-punned assignments via pointer cast, do one of three things:
(1) assign directly w/o cast if storage type matches real type; (2) assign using cast
via union if type does not need reffing; (3) copy with memcpy and ref/deref manually if type
needs reffing. This is ok peref-wise because memcpy of a constant length gets optomized.
HashTraits are now expected to make ref()/deref() take the storage type, not the true type.
* wtf/HashSet.h:
(WTF::): Same basic idea.
* wtf/HashTable.h:
(WTF::): Added Assigner template for use by HashMap/HashSet. Change RefCounter to call ref()
and deref() via storage type, avoiding the need to
type-pun.
(WTF::RefCounter::ref): ditto
(WTF::RefCounter::deref): ditto
* wtf/HashTraits.h:
(WTF::): Change ref() and deref() for RefPtr HashTraits to take the storage type; cast
via union to pointer type.
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_PageHeap::init): Changed from constructor to init function so this can go in a union.
(WTF::): redefine pageheap macro in terms of getPageHeap().
(WTF::getPageHeap): new inline function, helper for pageheap macro. This hides the cast in a union.
(WTF::TCMalloc_ThreadCache::InitModule): Call init() instead of using placement new to initialize page
heap.
* wtf/TCPageMap.h:
(TCMalloc_PageMap1::init): Changed from constructor to init function.
(TCMalloc_PageMap2::init): ditto
(TCMalloc_PageMap3::init): ditto
2007-07-06 George Staikos <staikos@kde.org>
Reviewed by Maciej.
Switch USE(ICONDATABASE) to ENABLE(ICONDATABASE)
* wtf/Platform.h:
2007-07-03 Sam Weinig <sam@webkit.org>
Reviewed by Darin.
Eleventh round of fixes for implicit 64-32 bit conversion errors.
<rdar://problem/5292262>
- Fixes a real bug where where we were setting long long and unsigned long long
values to a long field.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
2007-07-03 Sam Weinig <sam@webkit.org>
Reviewed by Brady Eidson.
Tenth round of fixes for implicit 64-32 bit conversion errors.
<rdar://problem/5292262>
- Add explicit casts.
* kjs/dtoa.cpp:
(Bigint::):
2007-07-02 Sam Weinig <sam@webkit.org>
Reviewed by Kevin McCullough.
Fourth round of fixes for implicit 64-32 bit conversion errors.
<rdar://problem/5292262>
Add custom piDouble and piFloat constants to use instead of M_PI.
* kjs/math_object.cpp:
(MathObjectImp::getValueProperty):
* wtf/MathExtras.h:
(wtf_atan2):
2007-06-29 Sam Weinig <sam@webkit.org>
Reviewed by Darin.
Second pass at fixing implicit 64-32 bit conversion errors.
<rdar://problem/5292262>
- Add a toFloat() method to JSValue for float conversion.
* JavaScriptCore.exp:
* kjs/value.cpp:
(KJS::JSValue::toFloat):
* kjs/value.h:
2007-06-27 Kevin McCullough <kmccullough@apple.com>
Reviewed by Darin.
- <rdar://problem/5271937> REGRESSION: Apparent WebKit JavaScript memory smasher when submitting comment to iWeb site (crashes in kjs_pcre_compile2)
- Correctly evaluate the return value of _pcre_ucp_findchar.
* pcre/pcre_compile.c:
(compile_branch):
* pcre/pcre_exec.c:
(match):
2007-06-27 Sam Weinig <sam@webkit.org>
Reviewed by Darin.
First pass at fixing implicit 64-32 bit conversion errors.
<rdar://problem/5292262>
- Add 'f' suffix where necessary.
* kjs/testkjs.cpp:
(StopWatch::getElapsedMS):
2007-06-26 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed <rdar://problem/5296627> JSGarbageCollect headerdoc suggests that
using JavaScriptCore requires leaking memory
* API/JSBase.h: Changed documentation to explain that you can pass NULL
to JSGarbageCollect.
2007-06-26 Adam Treat <adam@staikos.net>
Reviewed by Adam Roben.
Make the SQLite icon database optional.
* wtf/Platform.h:
2007-06-15 George Staikos <staikos@kde.org>
More missing files for Qt.
* JavaScriptCore.pri:
* kjs/testkjs.pro:
2007-06-15 George Staikos <staikos@kde.org>
Another Qt build fix.
* JavaScriptCore.pri:
* kjs/testkjs.pro:
2007-06-15 George Staikos <staikos@kde.org>
Fixing Qt build.
* JavaScriptCore.pri:
2007-06-20 Mark Rowe <mrowe@apple.com>
Reviewed by Mitz.
Fix http://bugs.webkit.org/show_bug.cgi?id=14244
Bug 14244: Data corruption when using a replace() callback function with data containing "$"
* kjs/string_object.cpp:
(KJS::replace): When 'replacement' is a function, do not replace $n placeholders in its return value.
This matches the behaviour described in ECMA 262 3rd Ed section 15.5.4.1, and as implemented in Firefox.
2007-06-14 Anders Carlsson <andersca@apple.com>
Fix Windows build.
* bindings/runtime_object.cpp:
(RuntimeObjectImp::canPut):
2007-06-14 Anders Carlsson <andersca@apple.com>
Reviewed by Darin.
<rdar://problem/5103077>
Crash at _NPN_ReleaseObject when quitting page at http://eshop.macsales.com/shop/ModBook
<rdar://problem/5183692>
http://bugs.webkit.org/show_bug.cgi?id=13547
REGRESSION: Crash in _NPN_ReleaseObject when closing Safari on nba.com (13547)
<rdar://problem/5261499>
CrashTracer: [USER] 75 crashes in Safari at com.apple.JavaScriptCore: KJS::Bindings::CInstance::~CInstance + 40
Have the root object track all live instances of RuntimeObjectImp. When invalidating
the root object, also invalidate all live runtime objects by zeroing out their instance ivar.
This prevents instances from outliving their plug-ins which lead to crashes.
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertValueToNPVariant):
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::convertValueToJObject):
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::convertValueToJValue):
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::callAsFunction):
* bindings/runtime_array.cpp:
(RuntimeArray::RuntimeArray):
* bindings/runtime_array.h:
(KJS::RuntimeArray::getConcreteArray):
* bindings/runtime_method.cpp:
(RuntimeMethod::callAsFunction):
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::~RuntimeObjectImp):
(RuntimeObjectImp::invalidate):
(RuntimeObjectImp::fallbackObjectGetter):
(RuntimeObjectImp::fieldGetter):
(RuntimeObjectImp::methodGetter):
(RuntimeObjectImp::getOwnPropertySlot):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::defaultValue):
(RuntimeObjectImp::implementsCall):
(RuntimeObjectImp::callAsFunction):
(RuntimeObjectImp::getPropertyNames):
(RuntimeObjectImp::throwInvalidAccessError):
* bindings/runtime_object.h:
* bindings/runtime_root.cpp:
(KJS::Bindings::RootObject::invalidate):
(KJS::Bindings::RootObject::addRuntimeObject):
(KJS::Bindings::RootObject::removeRuntimeObject):
* bindings/runtime_root.h:
2007-06-14 Anders Carlsson <andersca@apple.com>
Reviewed by Mitz.
<rdar://problem/5244948>
Safari keeps on complaining about slow script playing NBC TV video (14133)
http://bugs.webkit.org/show_bug.cgi?id=14133
Runaway JavaScript timer fires when spinning around in Google Maps street view
Make sure to start and stop the timeout checker around calls to JS.
* bindings/NP_jsobject.cpp:
(_NPN_InvokeDefault):
(_NPN_Invoke):
(_NPN_Evaluate):
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::call):
(JavaJSObject::eval):
2007-06-13 Darin Adler <darin@apple.com>
Reviewed by Mark Rowe.
- fix http://bugs.webkit.org/show_bug.cgi?id=14132
array sort with > 10000 elements sets elements > 10000 undefined
Test: fast/js/sort-large-array.html
* kjs/array_instance.h: Replaced pushUndefinedObjectsToEnd with
compactForSorting, and removed ExecState parameters.
* kjs/array_object.cpp:
(ArrayInstance::sort): Changed to call compactForSorting.
(ArrayInstance::compactForSorting): Do the get and delete of the
properties directly on the property map instead of using public
calls from JSObject. The public calls would just read the undefined
values from the compacted sort results array!
2007-06-13 George Staikos <staikos@kde.org>
Reviewed by Lars.
Fix Mac OS X build after last checkin.
* wtf/FastMalloc.h:
2007-06-14 Lars Knoll <lars@trolltech.com>
Reviewed by Maciej.
Disable FastMalloc for the Qt build and make sure we
don't reimplement the global new/delete operators
when using the system malloc.
* wtf/FastMalloc.cpp:
* wtf/FastMalloc.h:
* wtf/Platform.h:
2007-06-13 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Make sure that bindings instances get correct root objects.
* JavaScriptCore.exp:
* bindings/NP_jsobject.cpp:
(listFromVariantArgs):
(_NPN_InvokeDefault):
(_NPN_Invoke):
(_NPN_SetProperty):
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::invokeMethod):
(KJS::Bindings::CInstance::invokeDefaultMethod):
* bindings/c/c_runtime.cpp:
(KJS::Bindings::CField::valueFromInstance):
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertNPVariantToValue):
* bindings/c/c_utility.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
(ObjcInstance::getValueOfUndefinedField):
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(ObjcArray::valueAt):
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime.h:
2007-06-13 Simon Hausmann <hausmann@kde.org>
Reviewed by Lars.
* kjs/testkjs.pro: WebKitQt is now called QtWebKit.
2007-06-12 Anders Carlsson <andersca@apple.com>
Another build fix.
* bindings/qt/qt_instance.cpp:
(KJS::Bindings::QtInstance::invokeMethod):
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Move the notion of field type to the JNI runtime since that's the only
one that was actually using it.
* bindings/c/c_runtime.h:
(KJS::Bindings::CField::CField):
* bindings/jni/jni_runtime.h:
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
* bindings/qt/qt_runtime.h:
* bindings/runtime.h:
* bindings/runtime_method.cpp:
2007-06-12 Anders Carlsson <andersca@apple.com>
Build fix.
* bindings/qt/qt_class.cpp:
(KJS::Bindings::QtClass::methodsNamed):
* bindings/qt/qt_instance.cpp:
(KJS::Bindings::QtInstance::invokeMethod):
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Oliver.
Get rid of the MethodList class and use a good ol' Vector instead.
* bindings/c/c_class.cpp:
(KJS::Bindings::CClass::methodsNamed):
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::invokeMethod):
* bindings/jni/jni_class.cpp:
(JavaClass::JavaClass):
(JavaClass::~JavaClass):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::methodsNamed):
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::callAsFunction):
* bindings/runtime.cpp:
* bindings/runtime.h:
* bindings/runtime_method.cpp:
(RuntimeMethod::lengthGetter):
(RuntimeMethod::callAsFunction):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::getOwnPropertySlot):
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Make RuntimeMethod's method list a pointer so that the object size doesn't
grow beyond 32 bytes when we later will replace MethodList with a Vector.
* bindings/runtime_method.cpp:
(RuntimeMethod::RuntimeMethod):
(RuntimeMethod::lengthGetter):
(RuntimeMethod::callAsFunction):
* bindings/runtime_method.h:
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Get rid of the Parameter class.
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_runtime.cpp:
(JavaMethod::signature):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaParameter::JavaParameter):
(KJS::Bindings::JavaParameter::~JavaParameter):
(KJS::Bindings::JavaParameter::type):
(KJS::Bindings::JavaMethod::parameterAt):
(KJS::Bindings::JavaMethod::numParameters):
* bindings/runtime.h:
2007-06-12 Anders Carlsson <andersca@apple.com>
Build fix.
* bindings/qt/qt_class.h:
2007-06-12 Mark Rowe <mrowe@apple.com>
Build fix.
* bindings/objc/objc_runtime.h:
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Get rid of Constructor and its only subclass JavaConstructor.
* bindings/c/c_class.h:
* bindings/jni/jni_class.cpp:
(JavaClass::JavaClass):
(JavaClass::~JavaClass):
* bindings/jni/jni_class.h:
* bindings/jni/jni_runtime.cpp:
* bindings/jni/jni_runtime.h:
* bindings/objc/objc_class.h:
* bindings/runtime.h:
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Use RetainPtr throughout the bindings code.
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::ObjcClass):
(KJS::Bindings::ObjcClass::methodsNamed):
(KJS::Bindings::ObjcClass::fieldNamed):
* bindings/objc/objc_instance.h:
(KJS::Bindings::ObjcInstance::getObject):
* bindings/objc/objc_instance.mm:
(ObjcInstance::ObjcInstance):
(ObjcInstance::~ObjcInstance):
(ObjcInstance::implementsCall):
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
(ObjcInstance::defaultValue):
* bindings/objc/objc_runtime.h:
(KJS::Bindings::ObjcMethod::setJavaScriptName):
(KJS::Bindings::ObjcMethod::javaScriptName):
(KJS::Bindings::ObjcArray::getObjcArray):
* bindings/objc/objc_runtime.mm:
(ObjcField::name):
(ObjcArray::ObjcArray):
(ObjcArray::setValueAt):
(ObjcArray::valueAt):
(ObjcArray::getLength):
* wtf/RetainPtr.h:
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Maciej.
Have JSCell inherit from Noncopyable.
* bindings/objc/objc_runtime.h:
* bindings/runtime_object.h:
* kjs/value.h:
2007-06-12 Anders Carlsson <andersca@apple.com>
Reviewed by Darin and Maciej.
More cleanup. Use our Noncopyable WTF class, add a root object member
to the Array class.
* bindings/c/c_class.h:
* bindings/jni/jni_class.h:
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaArray::JavaArray):
* bindings/jni/jni_runtime.h:
* bindings/objc/objc_class.h:
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcArray::ObjcArray):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime.cpp:
(KJS::Bindings::Array::Array):
(KJS::Bindings::Array::~Array):
* bindings/runtime.h:
* bindings/runtime_object.h:
* bindings/runtime_root.h:
2007-06-08 Zack Rusin <zrusin@trolltech.com>
Fix the Qt build
* bindings/qt/qt_instance.cpp:
(KJS::Bindings::QtInstance::QtInstance):
* bindings/qt/qt_instance.h:
2007-06-07 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Get rid of Instance::setRootObject and pass the root object to the instance constructor instead.
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::CInstance):
* bindings/c/c_instance.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::JavaInstance):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::convertJObjectToValue):
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::ObjcInstance):
* bindings/runtime.cpp:
(KJS::Bindings::Instance::Instance):
(KJS::Bindings::Instance::createBindingForLanguageInstance):
* bindings/runtime.h:
2007-06-07 Anders Carlsson <andersca@apple.com>
Reviewed by Adam.
Don't use a JavaInstance to store the field when all we want to do is to keep the field
from being garbage collected. Instead, use a JObjectWrapper.
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaField::JavaField):
(JavaField::dispatchValueFromInstance):
(JavaField::dispatchSetValueToInstance):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaField::JavaField):
(KJS::Bindings::JavaField::operator=):
2007-05-30 Alp Toker <alp.toker@collabora.co.uk>
Reviewed by Brady.
Enable logging in the Gdk port.
http://bugs.webkit.org/show_bug.cgi?id=13936
* wtf/Assertions.cpp:
* wtf/Assertions.h: Add WTFLogVerbose which also logs
the file, line number and function.
2007-05-30 Mark Rowe <mrowe@apple.com>
Mac build fix. Update #include.
* API/JSCallbackFunction.h:
2007-05-30 Luciano Montanaro <mikelima@cirulla.net>
Reviewed by Maciej.
- cross-port Harri Porten's commits 636099 and 636108 from KJS:
"publish a class anyway public already" and "class is being used from
outside for quite some time" in preparation for further syncronizations
* kjs/context.h:
* kjs/date_object.cpp:
* kjs/date_object.h:
* kjs/function.h:
(KJS::):
(KJS::InternalFunctionImp::classInfo):
(KJS::InternalFunctionImp::functionName):
* kjs/function_object.h:
* kjs/internal.h:
* kjs/lookup.h:
(KJS::getStaticPropertySlot):
(KJS::getStaticFunctionSlot):
(KJS::getStaticValueSlot):
* kjs/object_object.h:
2007-05-29 Sam Weinig <sam@webkit.org>
Reviewed by Adam Roben.
Cleanup function and fix to match comparison API.
* kjs/string_object.cpp:
(KJS::substituteBackreferences):
(KJS::localeCompare):
2007-05-28 Geoffrey Garen <ggaren@apple.com>
Slight clarification to an exception message.
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::put):
2007-05-27 Holger Freyther <zecke@selfish.org>
Reviewed by Mark Rowe.
* wtf/Platform.h: Move Gdk up to allow building WebKit/Gdk on Darwin
2007-05-27 Darin Adler <darin@apple.com>
- fix a couple ifdefs that said WIN instead of WIN_OS
* kjs/collector.cpp:
(KJS::allocateBlock): WIN -> WIN_OS
(KJS::freeBlock): Ditto.
2007-05-26 Sam Weinig <sam@webkit.org>
Reviewed by Darin.
Patch for http://bugs.webkit.org/show_bug.cgi?id=13854
Port of commit 667785 from kjs
- special case calling String.localeCompare() with no parameters to return 0.
* kjs/string_object.cpp:
(KJS::StringProtoFunc::callAsFunction):
2007-05-25 Kimmo Kinnunen <kimmok@iki.fi>
Reviewed by Darin.
- Fix for http://bugs.webkit.org/show_bug.cgi?id=13456
REGRESSION: setTimeout "arguments" object gets shadowed by a local variable
- Add a explicit check for arguments. Previously check was done with getDirect,
but since the arguments is created on-demand in ActivationImp, it doesn't
show up in the test. 'arguments' should always be in the VarDeclNode's
evaluation scope.
* kjs/nodes.cpp:
(VarDeclNode::evaluate): Additional check if the var decl identifier is 'arguments'
2007-05-25 George Staikos <staikos@kde.org>
Reviewed by Maciej.
- Use COMPILER(GCC), not PLATFORM(GCC) - as Platform.h defines
* wtf/FastMalloc.h:
2007-05-25 Kimmo Kinnunen <kimmok@iki.fi>
Reviewed by Darin.
- http://bugs.webkit.org/show_bug.cgi?id=13623 (Decompilation of function
doesn't compile with "++(x,y)")
- Create the error node based on the actual node, not the node inside
parenthesis
- Fix applies to postfix, prefix and typeof operators
- Produces run-time ReferenceError like other non-lvalue assignments etc.
* kjs/grammar.y: Create {Prefix,Postfix}ErrorNode based on the actual node,
not the based on the node returned by "nodeInsideAllParens()". Same for
TypeOfValueNode.
2007-05-25 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
Fix crash in Qt JavaScript bindings when the arguments used on the Qt side are not
registered with QMetaType.
* bindings/qt/qt_instance.cpp:
(KJS::Bindings::QtInstance::invokeMethod):
* bindings/qt/qt_runtime.cpp:
2007-05-24 Luciano Montanaro <mikelima@cirulla.net>
Reviewed by Darin
Patch for http://bugs.webkit.org/show_bug.cgi?id=13855
Port patch 666176 to JavaScriptCore
- Renamed JSValue::downcast() to JSValue::asCell() which makes the
function meaning cleaner. It's modeled after Harri Porten change in
KDE trunk.
* kjs/collector.cpp:
(KJS::Collector::protect):
(KJS::Collector::unprotect):
(KJS::Collector::collectOnMainThreadOnly):
* kjs/object.h:
(KJS::JSValue::isObject):
* kjs/string_object.cpp:
(KJS::StringProtoFunc::callAsFunction):
* kjs/value.h:
(KJS::JSValue::asCell):
(KJS::JSValue::isNumber):
(KJS::JSValue::isString):
(KJS::JSValue::isObject):
(KJS::JSValue::getNumber):
(KJS::JSValue::getString):
(KJS::JSValue::getObject):
(KJS::JSValue::getUInt32):
(KJS::JSValue::mark):
(KJS::JSValue::marked):
(KJS::JSValue::type):
(KJS::JSValue::toPrimitive):
(KJS::JSValue::toBoolean):
(KJS::JSValue::toNumber):
(KJS::JSValue::toString):
(KJS::JSValue::toObject):
2007-05-18 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Mark Rowe.
* kjs/testkjs.pro: Make the Gdk port link to icu
2007-05-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Adele Peterson.
It helps if you swap the right variable.
* wtf/HashSet.h:
(WTF::::operator):
2007-05-15 Lars Knoll <lars@trolltech.com>
Reviewed by Zack
Extend the QObject JavaScript bindings to work for slots with
arguments.
* bindings/qt/qt_instance.cpp:
(KJS::Bindings::QtInstance::invokeMethod):
2007-05-14 Kimmo Kinnunen <kimmok@iki.fi>
Reviewed by Darin.
- Fixes http://bugs.webkit.org/show_bug.cgi?id=13622 (Decompiler
omits trailing comma in array literal)
* kjs/nodes2string.cpp:
(ArrayNode::streamTo): print extra ',' in case there was elision
commas (check opt member var) and array elements present
in the array expression
2007-05-14 Geoffrey Garen <ggaren@apple.com>
Reviewed by Oliver Hunt.
Added HashMap::swap and HashSet::swap. WebCore now uses HashSet::swap.
I figured while I was in the neighborhood I might as well add HashMap::swap,
too.
* wtf/HashMap.h:
(WTF::::operator):
(WTF::::swap):
* wtf/HashSet.h:
(WTF::::operator):
(WTF::::swap):
2007-05-11 Kimmo Kinnunen <kimmok@iki.fi>
Reviewed by Darin.
- Fix for bug http://bugs.webkit.org/show_bug.cgi?id=13620
Bogus decompilation of "for (var j = 1 in [])"
- ForInNode toString()'ed to syntax error if there was var decl
and initializer
- ForNode toStringed()'ed lost 'var ' if it was present
* kjs/nodes2string.cpp:
(VarDeclListNode::streamTo): Print "var " here
(VarStatementNode::streamTo): Don't print "var " here
(ForNode::streamTo): Remove TODO comment, VarDeclListNode will
stream the "var "
(ForInNode::streamTo): ForIn initializer is printed by VarDeclNode
2007-05-11 Kimmo Kinnunen <kimmok@iki.fi>
Reviewed by Darin.
- Fixes http://bugs.webkit.org/show_bug.cgi?id=10878
(Incorrect decompilation for "4..x")
- Group numbers in dotted expressions in toString() output, so we
avoid the 4.x constructs when the original input is 4..x.
4..x means the same as 4. .x or (4).x or Number(4).x
* kjs/nodes2string.cpp:
(KJS::SourceStream::):
Add boolean flag to indicate that if next item is a number, it should be grouped.
Add new formatting enum which turns on the boolean flag.
(KJS::SourceStream::SourceStream): Added. Initialize the flag.
(SourceStream::operator<<): Added. New overloaded operator with double value as parameter.
(NumberNode::streamTo): Use the double operator
(ArrayNode::streamTo):
(DotAccessorNode::streamTo):
(FunctionCallDotNode::streamTo):
(FunctionCallParenDotNode::streamTo):
(PostfixDotNode::streamTo):
(DeleteDotNode::streamTo):
(PrefixDotNode::streamTo):
(AssignDotNode::streamTo): Use the new formatting enum to turn on the grouping flag.
2007-05-10 Lars Knoll <lars@trolltech.com>
Reviewed by Zack
Fix our last three test failures in the JavaScript
tests.
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
2007-05-08 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin Adler.
Fixed #includes of JSStringRefCF.h and use of CF datatypes. I think I
misunderstood this issue before.
* API/JavaScriptCore.h: #include JSStringRefCF.h. Platforms that don't
want this behavior can just #include individual headers, instead of the
umbrella framework header. But we definitely want Mac OS X clients to
get the #include of JSStringRefCF.h "for free."
* API/minidom.c: Don't #include JSStringRefCF.h. (Don't need to #include
JavaScriptCore.h, either.)
* API/testapi.c: Don't #include JSStringRefCF.h. Do use CF datatypes
regardless of whether __APPLE__ is defined. Platforms that don't support
CF just shouldn't compile this file.
(main):
2007-05-09 Eric Seidel <eric@webkit.org>
Reviewed by mjs.
http://bugs.webkit.org/show_bug.cgi?id=6985
Cyclic __proto__ values cause WebKit to hang
* kjs/object.cpp:
(KJS::JSObject::put): do a cycle check before setting __proto__
2007-05-08 Kimmo Kinnunen <kimmok@iki.fi>
Reviewed by darin. Landed by eseidel.
- http://bugs.webkit.org/show_bug.cgi?id=10880 (Do..while loop gains
a semicolon each time it is toStringed)
Grammar in Ecma-66262, 12.6: "do Statement while ( Expression );"
EmptyStatement was created after every do..while(expr) which
had semicolon at the end.
* kjs/grammar.y: Require semicolon at the end of do..while
2007-05-08 Geoffrey Garen <ggaren@apple.com>
Build fix -- this time for sure.
APICast.h, being private, ends up in a different folder than JSValueRef.h,
so we can't include one from the other using "". Instead, just forward
declare the relevant data types.
* API/APICast.h:
2007-05-08 Geoffrey Garen <ggaren@apple.com>
Build fix: export APICast.h for WebCore and WebKit.
* JavaScriptCore.xcodeproj/project.pbxproj:
2007-05-04 Darin Adler <darin@apple.com>
Reviewed by Adele.
- fix http://bugs.webkit.org/show_bug.cgi?id=12821
<rdar://problem/5007921> Number.toExponential doesn't work for negative numbers
* kjs/number_object.cpp: (NumberProtoFunc::callAsFunction):
Added a call to fabs before calling log10.
2007-05-03 Holger Freyther <freyther@kde.org>
Reviewed by Zack, landed by Simon.
This is bugzilla bug 13499.
* JavaScriptCore.pri: Place Qt into the qt-port scope
* bindings/testbindings.pro: Place Qt into the qt-port scope
* kjs/testkjs.pro: Place Qt into the qt-port scope
* pcre/pcre.pri: Place Qt into the qt-port scope
2007-05-02 David Harrison <harrison@apple.com>
Reviewed by Antti.
<rdar://problem/5174862> Crash resulting from DeprecatedString::insert()
Added insertion support for more than one value.
* wtf/Vector.h:
(WTF::::insert):
Added support for inserting multiple values.
(WTF::::prepend):
New. Insert at the start of vectors. Convenient for vectors used as strings.
2007-05-01 Jungshik Shin <jungshik.shin@gmail.com>
Reviewed by Alexey.
- get rid of non-ASCII lteral characters : suppress compiler warnings
http://bugs.webkit.org/show_bug.cgi?id=13551
* kjs/testkjs.cpp:
* pcre/pcre_compile.c:
2007-04-28 Jungshik Shin <jungshik.shin@gmail.com>
Reviewed by Sam Weinig.
- Replace copyright sign in Latin-1 (0xA9) with '(C)'
http://bugs.webkit.org/show_bug.cgi?id=13531
* bindings/npruntime.h:
2007-04-28 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix <rdar://problem/5154144> Hamachi test fails: assertion failure in ListHashSet
Test: fast/forms/add-remove-form-elements-stress-test.html
* wtf/ListHashSet.h:
(WTF::ListHashSetNodeAllocator::ListHashSetNodeAllocator): Initialize
m_isDoneWithInitialFreeList to false.
(WTF::ListHashSetNodeAllocator::allocate): Added assertions based on a debug-only
m_isAllocated flag that make sure we don't allocate a block that's already allocated.
These assertions helped pinpoint the bug. Set m_isDoneWithInitialFreeList when we
allocate the last block of the initial free list. Once we're done with the initial
free list, turn off the rule that says that the next node in the pool after the last
node in the free list is also free. This rule works because any free nodes are added
to the head of the free list, so a node that hasn't been allocated even once is always
at the tail of the free list and all the nodes after it also haven't been allocated
even once. But it doesn't work any longer once the entire pool has been used at least
once, because there's nothing special about the last node on the free list any more.
(WTF::ListHashSetNodeAllocator::deallocate): Set the node's m_isAllocated to false.
(WTF::ListHashSetNodeAllocator::pastPool): Added. Used above.
(WTF::ListHashSetNodeAllocator::inPool): Changed to use the pastPool function.
(WTF::ListHashSetNode::ListHashSetNode): Initialize m_isAllocated to true.
(WTF::ListHashSetNode::operator new): Removed variable name for unused size
parameter.
(WTF::ListHashSetNode::destroy): Changed to call the destructor rather than
delete -- this gets rid of the need to define an operator delete.
2007-04-27 Christopher Brichford <chrisb@adobe.com>
Reviewed by Timothy Hatcher.
Fix for: Bug 13211: Move JavaScriptCore mac project files for apollo port
http://bugs.webkit.org/show_bug.cgi?id=13211
* JavaScriptCore.apolloproj/mac/JavaScriptCore.Debug.xcconfig: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore.Release.xcconfig: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore.xcconfig: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore.xcodeproj/project.pbxproj: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig: Removed.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig: Removed.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig: Removed.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: Removed.
2007-04-27 Holger Freyther <freyther@kde.org>
Reviewed by Maciej.
Remove unmaintained CMake build system.
* CMakeLists.txt: Removed.
* pcre/CMakeLists.txt: Removed.
2007-04-27 Mark Rowe <mrowe@apple.com>
Reviewed by Oliver.
* JavaScriptCore.xcodeproj/project.pbxproj: Improve dependencies in Xcode project
by marking dftables as a dependency of Generate Derived Sources rather than of
JavaScriptCore itself.
2007-04-26 Geoffrey Garen <ggaren@apple.com>
Build fix -- added #includes that we used to get implicitly through
JSStringRef.h.
* API/JSNode.c:
* API/JSNodeList.c:
* API/minidom.c:
* API/testapi.c:
2007-04-26 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak, Adam Roben.
Fixed
<rdar://problem/4885130> Remove #include of JSStringRefCF.h from JSStringRef.h
<rdar://problem/4885123> JavaScriptCore is not cross-platform -- JSStringRef.h references CF datatypes
* API/JSStringRef.h: Removed #include -- no clients need it anymore.
2007-04-25 David Kilzer <ddkilzer@apple.com>
Reviewed by Maciej.
Add assertions for debug builds.
* kjs/JSLock.cpp:
(KJS::JSLock::lock): Assert the return value of pthread_mutex_lock() in debug builds.
(KJS::JSLock::unlock): Assert the return value of pthread_mutex_unlock() in debug builds.
2007-04-25 Maciej Stachowiak <mjs@apple.com>
Reviewed by Anders.
- fix build problems
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Disable warning that
gives often downright incorrect results based on guessing what will happen in 64-bit.
2007-04-25 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- tweak the allocator for a small speedup -- Shark showed this was a win, but I can't
measure an improvement right now, but it's also clear these changes do no harm
* wtf/FastMalloc.cpp:
(WTF::LgFloor): Use ALWAYS_INLINE here; in testing I did a while back this was necessary
to get this single-instruction function to be inlined.
(WTF::SizeClass): Use ALWAYS_INLINE here too for the same reason. Also change the special
case for a size of 0 to work without a branch for a bit of extra speed.
(WTF::ByteSizeForClass): Use ALWAYS_INLINE here too for the same reason.
2007-04-24 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- use custom calling convention for everything in nodes.cpp on intel gcc for 1.5% speed boost
Nearly all functions in nodes.cpp were marked up to use the
regparm(3) calling convention under GCC for x86, since this is
faster and they are all guaranteed to be called only internally to
kjs.
The only exception is destructors, since delete doesn't know how to use a custom calling convention.
* kjs/nodes.cpp:
(dotExprDoesNotAllowCallsString):
* kjs/nodes.h:
(KJS::Node::):
(KJS::StatementNode::):
(KJS::NullNode::):
(KJS::BooleanNode::):
(KJS::NumberNode::):
(KJS::StringNode::):
(KJS::RegExpNode::):
(KJS::ThisNode::):
(KJS::ResolveNode::):
(KJS::GroupNode::):
(KJS::ElementNode::):
(KJS::ArrayNode::):
(KJS::PropertyNameNode::):
(KJS::PropertyNode::):
(KJS::PropertyListNode::):
(KJS::ObjectLiteralNode::):
(KJS::BracketAccessorNode::):
(KJS::DotAccessorNode::):
(KJS::ArgumentListNode::):
(KJS::ArgumentsNode::):
(KJS::NewExprNode::):
(KJS::FunctionCallValueNode::):
(KJS::FunctionCallResolveNode::):
(KJS::FunctionCallBracketNode::):
(KJS::FunctionCallParenBracketNode::):
(KJS::FunctionCallDotNode::):
(KJS::FunctionCallParenDotNode::):
(KJS::PostfixResolveNode::):
(KJS::PostfixBracketNode::):
(KJS::PostfixDotNode::):
(KJS::PostfixErrorNode::):
(KJS::DeleteResolveNode::):
(KJS::DeleteBracketNode::):
(KJS::DeleteDotNode::):
(KJS::DeleteValueNode::):
(KJS::VoidNode::):
(KJS::TypeOfResolveNode::):
(KJS::TypeOfValueNode::):
(KJS::PrefixResolveNode::):
(KJS::PrefixBracketNode::):
(KJS::PrefixDotNode::):
(KJS::PrefixErrorNode::):
(KJS::UnaryPlusNode::):
(KJS::NegateNode::):
(KJS::BitwiseNotNode::):
(KJS::LogicalNotNode::):
(KJS::MultNode::):
(KJS::AddNode::):
(KJS::ShiftNode::):
(KJS::RelationalNode::):
(KJS::EqualNode::):
(KJS::BitOperNode::):
(KJS::BinaryLogicalNode::):
(KJS::ConditionalNode::):
(KJS::AssignResolveNode::):
(KJS::AssignBracketNode::):
(KJS::AssignDotNode::):
(KJS::AssignErrorNode::):
(KJS::CommaNode::):
(KJS::AssignExprNode::):
(KJS::VarDeclListNode::):
(KJS::VarStatementNode::):
(KJS::EmptyStatementNode::):
(KJS::ExprStatementNode::):
(KJS::IfNode::):
(KJS::DoWhileNode::):
(KJS::WhileNode::):
(KJS::ForNode::):
(KJS::ContinueNode::):
(KJS::BreakNode::):
(KJS::ReturnNode::):
(KJS::WithNode::):
(KJS::LabelNode::):
(KJS::ThrowNode::):
(KJS::TryNode::):
(KJS::ParameterNode::):
(KJS::Parameter::):
(KJS::FunctionBodyNode::):
(KJS::FuncExprNode::):
(KJS::FuncDeclNode::):
(KJS::SourceElementsNode::):
(KJS::CaseClauseNode::):
(KJS::ClauseListNode::):
(KJS::SwitchNode::):
2007-04-24 Oliver Hunt <oliver@apple.com>
GTK Build fix, ::findEntry->KJS::findEntry
* kjs/lookup.cpp:
(KJS::Lookup::findEntry):
(KJS::Lookup::find):
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- compile most of JavaScriptCore as one file for 4% JS iBench speed improvement
* JavaScriptCore.xcodeproj/project.pbxproj: Add AllInOneFile.cpp, and remove files it includes
from the build.
* kjs/AllInOneFile.cpp: Added.
* kjs/dtoa.cpp: Renamed CONST to CONST_ to avoid conflict.
(Bigint::):
(Bigint::nrv_alloc):
* kjs/lookup.cpp: Use "namspace KJS { ... }" instead of "using namespace KJS;"
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Build fix, not reviewed.
* kjs/collector.h: Fix struct/class mismatch.
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- raise ALLOCATIONS_PER_COLLECTION to 4000, for 3.7% iBench speed improvement
Now that the cell size is smaller and the block size is bigger, we can fit 4000 objects in
the two spare cells the collector is willing to keep around, so collect a bit less often.
* kjs/collector.cpp:
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin and Geoff.
- move mark and collectOnMainThreadOnly bits into separate bitmaps
This saves 4 bytes per cell, allowing shrink of cell size to 32,
which leads to a .8% speed improvement on iBench.
This is only feasible because of all the previous changes on the branch.
* kjs/collector.cpp:
(KJS::allocateBlock): Adjust for some renames of constants.
(KJS::Collector::markStackObjectsConservatively): Now that cells are 32 bytes (64
bytes on 64-bit) the cell alignment check can be made much more strict, and also
obsoletes the need for a % sizeof(CollectorCell) check. Also, we can mask off the low
bits of the pointer to have a potential block pointer to look for.
(KJS::Collector::collectOnMainThreadOnly): Use bitmap.
(KJS::Collector::markMainThreadOnlyObjects): Use bitmap.
(KJS::Collector::collect): When sweeping, use bitmaps directly to find mark bits.
* kjs/collector.h:
(KJS::): Move needed constants and type declarations here.
(KJS::CollectorBitmap::get): Bit twiddling to get a bitmap value.
(KJS::CollectorBitmap::set): Bit twiddling to set a bitmap bit to true.
(KJS::CollectorBitmap::clear): Bit twiddling to set a bitmap bit to false.
(KJS::CollectorBitmap::clearAll): Clear whole bitmap at one go.
(KJS::Collector::cellBlock): New operation, compute the block pointer for
a cell by masking off low bits.
(KJS::Collector::cellOffset): New operation, compute the cell offset for a
cell by masking off high bits and dividing (actually a shift).
(KJS::Collector::isCellMarked): Check mark bit in bitmap
(KJS::Collector::markCell): Set mark bit in bitmap.
* kjs/value.h:
(KJS::JSCell::JSCell): No more bits.
(KJS::JSCell::marked): Let collector handle it.
(KJS::JSCell::mark): Let collector handle it.
2007-04-23 Anders Carlsson <andersca@apple.com>
Build fix.
* kjs/regexp_object.h:
RegExpObjectImpPrivate is a struct, not a class.
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- shrink FunctionImp / DeclaredFunctionImp by 4 bytes, by moving parameter list to function body
I reconciled this with a similar change in KDE kjs by Maks Orlovich <maksim@kde.org>.
* kjs/function.cpp:
(KJS::FunctionImp::callAsFunction):
(KJS::FunctionImp::passInParameters):
(KJS::FunctionImp::lengthGetter):
(KJS::FunctionImp::getParameterName):
* kjs/function.h:
* kjs/function_object.cpp:
(FunctionProtoFunc::callAsFunction):
(FunctionObjectImp::construct):
* kjs/nodes.cpp:
(FunctionBodyNode::addParam):
(FunctionBodyNode::paramString):
(FuncDeclNode::addParams):
(FuncDeclNode::processFuncDecl):
(FuncExprNode::addParams):
(FuncExprNode::evaluate):
* kjs/nodes.h:
(KJS::Parameter::Parameter):
(KJS::FunctionBodyNode::numParams):
(KJS::FunctionBodyNode::paramName):
(KJS::FunctionBodyNode::parameters):
(KJS::FuncExprNode::FuncExprNode):
(KJS::FuncDeclNode::FuncDeclNode):
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Disable 64-bit warnings because
they handle size_t badly.
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- shrink RegexpObjectImp by 4 bytes
Somewhat inexplicably, this seems to be a .33% speedup on JS iBench.
* kjs/regexp_object.cpp:
(KJS::RegExpObjectImpPrivate::RegExpObjectImpPrivate):
(RegExpObjectImp::RegExpObjectImp):
(RegExpObjectImp::performMatch):
(RegExpObjectImp::arrayOfMatches):
(RegExpObjectImp::getBackref):
(RegExpObjectImp::getLastMatch):
(RegExpObjectImp::getLastParen):
(RegExpObjectImp::getLeftContext):
(RegExpObjectImp::getRightContext):
(RegExpObjectImp::getValueProperty):
(RegExpObjectImp::putValueProperty):
* kjs/regexp_object.h:
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver.
- change to 1-bit bitfields instead of 8-bit, this turns out to lead to a .51% speedup on JS iBench
The 1-bit bitfields are actually faster than just plain bools, at least on Intel (go figure).
* kjs/property_map.h:
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- shrink ArrayInstance objects by 4 bytes
http://bugs.webkit.org/show_bug.cgi?id=13386
I did this by storing the capacity before the beginning of the storage array. It turns out
it is rarely needed and is by definition 0 when the storage array is null.
* kjs/array_instance.h:
(KJS::ArrayInstance::capacity): Get it from the secret stash
* kjs/array_object.cpp:
(allocateStorage): New function to encapsulate allocating the storage with extra space ahead
for the capacity.
(reallocateStorage): ditto for realloc
(ArrayInstance::ArrayInstance):
(ArrayInstance::~ArrayInstance):
(ArrayInstance::resizeStorage):
2007-04-23 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix <rdar://problem/4840688> REGRESSION (r10588, r10621): JavaScript won't parse
modifications of non-references (breaks 300themovie.warnerbros.com, fedex.com)
Despite the ECMAScript specification's claim that you can treat these as syntax
errors, doing so creates some website incompatibilities. So this patch turns them back
into evaluation errors instead.
Test: fast/js/modify-non-references.html
* kjs/grammar.y: Change makeAssignNode, makePrefixNode, and makePostfixNode so that they
never fail to parse. Update rules that use them. Fix a little bit of indenting. Use
new PostfixErrorNode, PrefixErrorNode, and AssignErrorNode classes.
* kjs/nodes.h: Added an overload of throwError that takes a char* argument.
Replaced setExceptionDetailsIfNeeded and debugExceptionIfNeeded with handleException,
which does both. Added PostfixErrorNode, PrefixErrorNode, and AssignErrorNode classes.
* kjs/nodes.cpp: Changed exception macros to use handleException; simpler and smaller
code size than the two functions that we used before.
(Node::throwError): Added the overload mentioned above.
(Node::handleException): Added. Contains the code from both setExceptionDetailsIfNeeded
and debugExceptionIfNeeded.
(PostfixErrorNode::evaluate): Added. Throws an exception.
(PrefixErrorNode::evaluate): Ditto.
(AssignErrorNode::evaluate): Ditto.
(ThrowNode::execute): Call handleException instead of debugExceptionIfNeeded; this
effectively adds a call to setExceptionDetailsIfNeeded, which may help with getting
the correct file and line number for these exceptions.
* kjs/nodes2string.cpp:
(PostfixErrorNode::streamTo): Added.
(PrefixErrorNode::streamTo): Added.
(AssignErrorNode::streamTo): Added.
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fix test failures / crashes on PPC
* kjs/property_map.h: Make the bool fields explicitly 8-bit bitfields, since bool is a full
word there otherwise :-(
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fix more test case failures
* bindings/runtime_array.cpp:
(RuntimeArray::RuntimeArray): inherit from JSObject instead of ArrayInstance; it turns
out that this class only needs the prototype and classInfo from ArrayInstance, not the
actual class itself, and it was too big otherwise.
(RuntimeArray::getOwnPropertySlot):
* bindings/runtime_array.h:
2007-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fix some test failures
* bindings/runtime_method.cpp:
(RuntimeMethod::RuntimeMethod): inherit from InternalFunctionImp instead of FunctionImpl,
otherwise this is too big
(RuntimeMethod::getOwnPropertySlot):
* bindings/runtime_method.h:
2007-04-22 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- discard the arguments List for an ActivationImp when the corresponding Context is destroyed (1.7% speedup)
http://bugs.webkit.org/show_bug.cgi?id=13385
Based an idea by Christopher E. Hyde <C.Hyde@parableuk.force9.co.uk>. His patch to do
this also had many other List changes and I found this much simpler subset of the changes
was actually a hair faster.
This optimization is valid because the arguments list is only kept around to
lazily make the arguments object. If it's not made by the time the function
exits, it never will be, since any function that captures the continuation will
have its own local arguments variable in scope.
Besides the 1.7% speed improvement, it shrinks List by 4 bytes
(which in turn shrinks ActivationImp by 4 bytes).
* kjs/Context.cpp:
(KJS::Context::~Context): Clear the activation's arguments list.
* kjs/function.cpp:
(KJS::ActivationImp::ActivationImp): Adjusted for list changes.
(KJS::ActivationImp::mark): No need to mark, lists are always protected (this doesn't
cause a ref-cycle for reasons stated above).
(KJS::ActivationImp::createArgumentsObject): Clear arguments list.
* kjs/function.h:
* kjs/list.cpp:
(KJS::List::List): No more needsMarking boolean
(KJS::List::operator=): ditto
* kjs/list.h:
(KJS::List::List): ditto
(KJS::List::reset): ditto
(KJS::List::deref): ditto
2007-04-22 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- shrink PropertyMap by 8 bytes and therefore shrink CELL_SIZE to 40 (for 32-bit;
similar shrinkage for 64-bit)
http://bugs.webkit.org/show_bug.cgi?id=13384
Inspired by similar changes by Christopher E. Hyde <C.Hyde@parableuk.force9.co.uk>
done in the kjs-tweaks branch of KDE's kjs. However, this version is somewhat
cleaner style-wise and avoids some of the negative speed impact (at least on gcc/x86)
of his version.
This is nearly a wash performance-wise, maybe a slight slowdown, but worth doing
to eventually reach cell size 32.
* kjs/collector.cpp:
(KJS::):
* kjs/property_map.cpp:
(KJS::PropertyMap::~PropertyMap):
(KJS::PropertyMap::clear):
(KJS::PropertyMap::get):
(KJS::PropertyMap::getLocation):
(KJS::PropertyMap::put):
(KJS::PropertyMap::insert):
(KJS::PropertyMap::expand):
(KJS::PropertyMap::rehash):
(KJS::PropertyMap::remove):
(KJS::PropertyMap::mark):
(KJS::PropertyMap::containsGettersOrSetters):
(KJS::PropertyMap::getEnumerablePropertyNames):
(KJS::PropertyMap::getSparseArrayPropertyNames):
(KJS::PropertyMap::save):
(KJS::PropertyMap::checkConsistency):
* kjs/property_map.h:
(KJS::PropertyMap::hasGetterSetterProperties):
(KJS::PropertyMap::setHasGetterSetterProperties):
(KJS::PropertyMap::):
(KJS::PropertyMap::PropertyMap):
2007-04-22 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- change blocks to 64k in size, and use various platform-specific calls to allocate at 64k-aligned addresses
http://bugs.webkit.org/show_bug.cgi?id=13383
* kjs/collector.cpp:
(KJS::allocateBlock): New function to allocate 64k of 64k-aligned memory
(KJS::freeBlock): Corresponding free
(KJS::Collector::allocate):
(KJS::Collector::collect):
2007-04-22 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin and Geoff.
- remove the concept of oversize objects, now that there aren't any (for now
only enforced with an assert).
http://bugs.webkit.org/show_bug.cgi?id=13382
This change is a .66% speedup on JS iBench for 32-bit platforms, probably much more
for 64-bit since it finally gives a reasonable cell size, but I did not test that.
* kjs/collector.cpp:
(KJS::): Use different cell size for 32-bit and 64-bit, now that there is no
oversize allocation.
(KJS::Collector::allocate): Remove oversize allocator.
(KJS::Collector::markStackObjectsConservatively): Don't check oversize objects.
(KJS::Collector::markMainThreadOnlyObjects): Ditto.
(KJS::Collector::collect): Ditto.
2007-04-21 Mitz Pettel <mitz@webkit.org>
Reviewed by Adam.
- fix http://bugs.webkit.org/show_bug.cgi?id=13428
REGRESSION (r20973-r20976): Failing ecma/Array/15.4.4.5-3.js
- fix http://bugs.webkit.org/show_bug.cgi?id=13429
REGRESSION (r20973-r20976): Crashing in fast/dom/plugin-attributes-enumeration.html
* kjs/array_object.cpp:
(ArrayInstance::sort): Free the old storage, not the new one.
2007-04-20 Maciej Stachowiak <mjs@apple.com>
Not reviewed, build fix.
- fix build problem with last change - -O3 complains more about uninitialized variables
* pcre/pcre_compile.c:
(compile_branch):
(pcre_compile2):
2007-04-20 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- <rdar://problem/5149915> use mergesort when possible, since it leads to fewer compares (2% JS iBench speedup)
* kjs/array_object.cpp:
(ArrayInstance::sort): Use mergesort(3) on platforms that have it, since it tends
to do fewer compares than qsort; but avoid it very on large arrays since it uses extra
memory. Also added comments identifying possibly even better sorting algorithms
for sort by string value and sort by compare function.
* kjs/config.h:
2007-04-20 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- bump optimization flags up to -O3 for 1% JS iBench speed improvement
* Configurations/Base.xcconfig:
2007-04-20 Mark Rowe <mrowe@apple.com>
Reviewed by Maciej.
Fix bogus optimisation in the generic pthread code path.
* kjs/collector.cpp:
(KJS::currentThreadStackBase):
2007-04-20 Mark Rowe <mrowe@apple.com>
Reviewed by Anders.
Improve FreeBSD compatibility, as suggested by Alexander Botero-Lowry.
* kjs/collector.cpp:
(KJS::currentThreadStackBase): FreeBSD requires that pthread_attr_t's are
initialized via pthread_attr_init before being used in any context.
2007-04-19 Mark Rowe <mrowe@apple.com>
Reviewed by Darin.
Fix http://bugs.webkit.org/show_bug.cgi?id=13401
Bug 13401: Reproducible crash calling myArray.sort(compareFn) from within
a sort comparison function
* kjs/array_object.cpp:
(ArrayInstance::sort): Save/restore the static variables around calls to qsort
to ensure nested calls to ArrayInstance::sort behave correctly.
2007-04-12 Deneb Meketa <dmeketa@adobe.com>
Reviewed by Darin Adler.
http://bugs.webkit.org/show_bug.cgi?id=13029
rdar://problem/4994849
Bug 13029: Permit NPAPI plug-ins to see HTTP response headers.
This doesn't actually change JavaScriptCore, but that's where npapi.h is.
* bindings/npapi.h:
Add headers member to NPStream struct. Also increase NP_VERSION_MINOR to 18.
Increasing to >= 17 allows plug-ins to safely detect whether to look for
NPStream::headers. Increasing from 17 to 18 reflects presence of NPObject
enumeration, which was added in a prior patch, and which has been agreed to
constitute version 18 by the plugin-futures list. Also add other missing
bits of npapi.h to catch up from 14 to 18. This includes features that are
not implemented in WebKit, but those are safely stubbed.
2007-04-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by Mark Rowe.
Fixed last check-in to print in release builds, too.
* kjs/collector.cpp:
(KJS::getPlatformThreadRegisters):
2007-04-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by John Sullivan, Darin Adler.
Fixed <rdar://problem/5121899> JavaScript garbage collection leads to
later crash under Rosetta (should abort or leak instead?)
Log an error message and crash if the kernel reports failure during GC.
We decided to do this instead of just leaking because we don't want people
to get the mistaken impression that running in Rosetta is a supported
configurtion.
The CRASH macro will also hook into CrashReporter, which will tell us if
many (any?) users run into this issue.
* kjs/collector.cpp:
(KJS::getPlatformThreadRegisters):
2007-04-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by darin.
Coverity fix. Coverity says:
"Event var_deref_model: Variable "sourceRanges" tracked as NULL was passed to a
function that dereferences it"
* kjs/string_object.cpp:
(KJS::replace):
2007-04-06 Geoffrey Garen <ggaren@apple.com>
Rubber stamped by Adele Peterson.
* kjs/ExecState.h: Removed obsolete forward/friend declaration of
RuntimeMethodImp.
2007-04-05 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by darin.
Coverity fix. Coverity says:
"Event check_after_deref: Pointer "dateString" dereferenced before NULL check"
* kjs/date_object.cpp:
(KJS::parseDate):
2007-04-05 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by darin.
Coverity fix. Coverity says:
"Event check_after_deref: Pointer "re" dereferenced before NULL check"
* pcre/pcre_study.c:
(pcre_study):
2007-04-05 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by darin.
Coverity fixes. Coverity says:
"Event leaked_storage: Returned without freeing storage "buffer""
and:
"Event leaked_storage: Returned without freeing storage "script""
* kjs/testkjs.cpp:
(doIt):
(createStringWithContentsOfFile):
2007-04-05 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by darin.
Coverity fix: in single-threaded case currentThreadIsMainThread is always true
so the code in if (!currentThreadIsMainThread) cannot possibly be reached
and Coverity complains about dead code.
* kjs/collector.cpp:
(KJS::Collector::collect):
=== Safari-5522.6 ===
2007-04-03 Kevin McCullough <kmccullough@apple.com>
Reviewed by Adam.
- Testing a post-commit hook.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2007-04-03 Anders Carlsson <andersca@apple.com>
Reviewed by Adam.
<rdar://problem/5107534>
http://bugs.webkit.org/show_bug.cgi?id=13265
REGRESSION: Crash in KJS::Bindings::convertValueToNPVariant
* bindings/NP_jsobject.cpp:
(_NPN_InvokeDefault):
Return false if the object isn't a function. Set the return value to undefined by default
(to match Firefox).
2007-03-30 Anders Carlsson <andersca@apple.com>
Build fix.
* bindings/NP_jsobject.cpp:
(_NPN_Enumerate):
2007-03-30 Anders Carlsson <andersca@apple.com>
Reviewed by Geoff.
Implement _NPN_Enumerate support.
* JavaScriptCore.exp:
* bindings/NP_jsobject.cpp:
(_NPN_Enumerate):
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::getPropertyNames):
* bindings/c/c_instance.h:
* bindings/npapi.h:
* bindings/npruntime.h:
* bindings/npruntime_impl.h:
* bindings/runtime.h:
(KJS::Bindings::Instance::getPropertyNames):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::getPropertyNames):
* bindings/runtime_object.h:
(KJS::RuntimeObjectImp::getInternalInstance):
2007-03-28 Jeff Walden <jwalden+code@mit.edu>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=12963
Fix some inconsistencies in the Mozilla JS Array extras implementations
with respect to the Mozilla implementation:
- holes in arrays should be skipped, not treated as undefined,
by all such methods
- an element with value undefined is not a hole
- Array.prototype.forEach should return undefined
* kjs/array_object.cpp:
(ArrayInstance::getOwnPropertySlot):
(ArrayProtoFunc::callAsFunction):
2007-03-27 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
* bindings/NP_jsobject.cpp:
(_NPN_InvokeDefault):
Call JSObject:call for native JavaScript objects.
2007-03-26 David Carson <dacarson@gmail.com>
Reviewed by Darin, landed by Anders.
Fix for: REGRESSION (r19559): Java applet crash
http://bugs.webkit.org/show_bug.cgi?id=13142
<rdar://problem/5080340>
The previous fix http://bugs.webkit.org/show_bug.cgi?id=12636
introduced new JNIType to enum in jni_utility.h This is a
problem on the Mac as it seems that the JNIType enum is also
used in the JVM, it is used to specify the return type in
jni_objc.mm
Corrected the fix by moving type to the end, and changing
jni_objc.mm to convert the new type to an old compatible
type.
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
* bindings/jni/jni_utility.h:
2007-03-26 Christopher Brichford <chrisb@adobe.com>
Reviewed/landed by Adam.
Bug 13198: Move build settings from project file to xcconfig file for apollo
port JSCore
http://bugs.webkit.org/show_bug.cgi?id=13198
- Moving build settings from xcode project file to xcconfig files.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig:
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig:
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig:
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
2007-03-26 Brady Eidson <beidson@apple.com>
Rubberstamped by Anders and Maciej aand Geoff (oh my!)
Since CFTypeRef is really void*, a RetainPtr couldn't be used.
RefType was "void", which doesn't actually exist as a type.
Since RefType only existed for operator*(), and since that operator
doesn't make any sense for RetainPtr, I removed them!
* kjs/nodes.cpp: Touch this to force a rebuild and (hopefully) help the
compiler with dependencies
* wtf/RetainPtr.h: Nuke RefType and operator*()
2007-03-26 Geoffrey Garen <ggaren@apple.com>
Touched a file to (hopefully) help the compiler with RetainPtr dependencies.
* kjs/nodes.cpp:
(Node::deref):
2007-03-24 Brady Eidson <beidson@apple.com>
Reviewed by Adam
Whoops, RetainPtr should be in the WTF namespace
* wtf/RetainPtr.h:
2007-03-24 Brady Eidson <beidson@apple.com>
Reviewed by Adam
<rdar://problem/5086210> - Move RetainPtr to WTF
* wtf/RetainPtr.h: Added
* JavaScriptCore.xcodeproj/project.pbxproj: Add it to the project file
* JavaScriptCore.vcproj/WTF/WTF.vcproj: Ditto
2007-03-23 Christopher Brichford <chrisb@adobe.com>
Reviewed/landed by Adam.
Bug 13175: Make apollo mac project files for JavaScriptCore actually
build something
http://bugs.webkit.org/show_bug.cgi?id=13175
- Changing apollo mac project files for JavaScriptCore such that they actually build
JavaScriptCore source code.
* JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig:
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
2007-03-24 Mark Rowe <mrowe@apple.com>
Rubber-stamped by Darin.
* Configurations/JavaScriptCore.xcconfig: Remove unnecessary INFOPLIST_PREPROCESS.
2007-03-22 Christopher Brichford <chrisb@adobe.com>
Reviewed/landed by Adam.
Bug 13164: Initial version of mac JavaScriptCore project files for
apollo port
http://bugs.webkit.org/show_bug.cgi?id=13164
- Adding mac project files for apollo port of JavaScriptCore. Currently project
just builds dftables.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig: Added.
* JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: Added.
2007-03-21 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
<rdar://problem/5076599> JavaScriptCore has a weak export (vtable for KJS::JSCell)
* JavaScriptCore.exp: Remove __ZTVN3KJS6JSCellE.
2007-03-21 Adele Peterson <adele@apple.com>
Reviewed by Geoff.
* API/JSStringRef.cpp: (JSStringIsEqual): Added JSLock.
2007-03-21 Zack Rusin <zrusin@trolltech.com>
Fix the compile when USE(MULTIPLE_THREADS) isn't
defined
* kjs/JSLock.cpp:
(KJS::JSLock::currentThreadIsHoldingLock):
2007-03-20 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff and Adam.
- make USE(MULTIPLE_THREADS) support more portable
http://bugs.webkit.org/show_bug.cgi?id=13069
- fixed a threadsafety bug discovered by testing this
- enhanced threadsafety assertions in collector
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::~JSCallbackObject): This destructor can't
DropAllLocks around the finalize callback, because it gets called
from garbage collection and we can't let other threads collect!
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* kjs/JSLock.cpp:
(KJS::JSLock::currentThreadIsHoldingLock): Added new function
to allow stronger assertions than just that the lock is held
by some thread (you can now assert that the current thread is
holding it, given the new JSLock design).
* kjs/JSLock.h:
* kjs/collector.cpp: Refactored for portability plus added some
stronger assertions.
(KJS::Collector::allocate):
(KJS::currentThreadStackBase):
(KJS::Collector::registerAsMainThread):
(KJS::onMainThread):
(KJS::PlatformThread::PlatformThread):
(KJS::getCurrentPlatformThread):
(KJS::Collector::Thread::Thread):
(KJS::destroyRegisteredThread):
(KJS::Collector::registerThread):
(KJS::Collector::markCurrentThreadConservatively):
(KJS::suspendThread):
(KJS::resumeThread):
(KJS::getPlatformThreadRegisters):
(KJS::otherThreadStackPointer):
(KJS::otherThreadStackBase):
(KJS::Collector::markOtherThreadConservatively):
(KJS::Collector::markStackObjectsConservatively):
(KJS::Collector::protect):
(KJS::Collector::unprotect):
(KJS::Collector::collectOnMainThreadOnly):
(KJS::Collector::markMainThreadOnlyObjects):
(KJS::Collector::collect):
* kjs/collector.h:
* wtf/FastMalloc.cpp:
(WTF::fastMallocSetIsMultiThreaded):
* wtf/FastMallocInternal.h:
* wtf/Platform.h:
2007-03-19 Darin Adler <darin@apple.com>
* kjs/value.h: Roll ~JSValue change out. It was causing problems. I'll do it right later.
2007-03-19 Geoffrey Garen <ggaren@apple.com>
Reviewed by John Sullivan.
Fixed <rdar://problem/5073380> REGRESSION: Crash occurs at WTF::fastFree()
when reloading liveconnect page (applet)
Best to use free when you use malloc, especially when malloc and delete
use completely different libraries.
* bindings/jni/jni_runtime.cpp:
(JavaMethod::~JavaMethod):
2007-03-19 Andrew Wellington <proton@wiretapped.net>
Reviewed by Maciej.
Really set Xcode editor to use 4 space indentation (http://webkit.org/coding/coding-style.html)
* JavaScriptCore.xcodeproj/project.pbxproj:
2007-03-19 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- Changed list size threshold to 5 based on testing.
I was testing the i-Bench JavaScript with the list statistics
dumping on, and discovered that there were many 5-element lists.
The fast case for lists was for 4 elements and fewer. By changing
the threshold to 5 elements we get a measurable speedup. I believe
this will help real web pages too, not just the benchmark.
* kjs/list.cpp: Change constant from 4 to 5.
2007-03-19 Darin Adler <darin@apple.com>
* kjs/value.h: Oops, fix build.
2007-03-19 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- remove ~JSValue; tiny low-risk performance boost
* kjs/value.h: Remove unneeded empty virtual destructor from JSValue.
The only class derived from JSValue is JSCell and it already has a
virtual destructor. Declaring an empty constructor in JSValue had one
good effect: it marked the destructor private, making it a compile
time error to try to destroy a JSValue; but that's not a likely
mistake for someone to make. It had two bad effects: (1) it caused gcc,
at least, to generate code to fix up the virtual table pointer to
point to the JSValue version of the virtual table inside the destructor
of all classes derived from JSValue directly or indirectly; (2) it
caused JSValue to be a polymorphic class so required a virtual table for
it. It's cleaner to not have either of those.
2007-03-18 Maciej Stachowiak <mjs@apple.com>
Reviewed by Mark.
- avoid static construction (and global variable access) in a smarter, more portable way,
to later enable MUTLI_THREAD mode to work on other platforms and compilers.
* kjs/CommonIdentifiers.cpp: Added. New class to hold all the shared identifiers.
(KJS::CommonIdentifiers::CommonIdentifiers):
(KJS::CommonIdentifiers::shared):
* kjs/CommonIdentifiers.h: Added.
* kjs/ExecState.h:
(KJS::ExecState::propertyNames): Hand the CommonIdentifiers instance here for easy access.
(KJS::ExecState::ExecState):
* API/JSObjectRef.cpp:
(JSObjectMakeConstructor):
* CMakeLists.txt:
* JavaScriptCore.exp:
* JavaScriptCore.pri:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* JavaScriptCoreSources.bkl:
* bindings/runtime_array.cpp:
(RuntimeArray::getOwnPropertySlot):
(RuntimeArray::put):
* bindings/runtime_method.cpp:
(RuntimeMethod::getOwnPropertySlot):
* kjs/array_object.cpp:
(ArrayInstance::getOwnPropertySlot):
(ArrayInstance::put):
(ArrayInstance::deleteProperty):
(ArrayProtoFunc::ArrayProtoFunc):
(ArrayProtoFunc::callAsFunction):
(ArrayObjectImp::ArrayObjectImp):
* kjs/bool_object.cpp:
(BooleanPrototype::BooleanPrototype):
(BooleanProtoFunc::BooleanProtoFunc):
(BooleanProtoFunc::callAsFunction):
(BooleanObjectImp::BooleanObjectImp):
* kjs/completion.h:
(KJS::Completion::Completion):
* kjs/date_object.cpp:
(KJS::DateProtoFunc::DateProtoFunc):
(KJS::DateObjectImp::DateObjectImp):
(KJS::DateObjectFuncImp::DateObjectFuncImp):
* kjs/error_object.cpp:
(ErrorPrototype::ErrorPrototype):
(ErrorProtoFunc::ErrorProtoFunc):
(ErrorProtoFunc::callAsFunction):
(ErrorObjectImp::ErrorObjectImp):
(ErrorObjectImp::construct):
(NativeErrorPrototype::NativeErrorPrototype):
(NativeErrorImp::NativeErrorImp):
(NativeErrorImp::construct):
(NativeErrorImp::callAsFunction):
* kjs/function.cpp:
(KJS::FunctionImp::getOwnPropertySlot):
(KJS::FunctionImp::put):
(KJS::FunctionImp::deleteProperty):
(KJS::FunctionImp::getParameterName):
(KJS::DeclaredFunctionImp::construct):
(KJS::IndexToNameMap::unMap):
(KJS::Arguments::Arguments):
(KJS::ActivationImp::getOwnPropertySlot):
(KJS::ActivationImp::deleteProperty):
(KJS::GlobalFuncImp::GlobalFuncImp):
* kjs/function_object.cpp:
(FunctionPrototype::FunctionPrototype):
(FunctionProtoFunc::FunctionProtoFunc):
(FunctionProtoFunc::callAsFunction):
(FunctionObjectImp::FunctionObjectImp):
(FunctionObjectImp::construct):
* kjs/grammar.y:
* kjs/identifier.cpp:
* kjs/identifier.h:
* kjs/interpreter.cpp:
(KJS::Interpreter::init):
(KJS::Interpreter::initGlobalObject):
* kjs/interpreter.h:
* kjs/lookup.h:
* kjs/math_object.cpp:
(MathFuncImp::MathFuncImp):
* kjs/nodes.cpp:
(ArrayNode::evaluate):
(FuncDeclNode::processFuncDecl):
(FuncExprNode::evaluate):
* kjs/number_object.cpp:
(NumberPrototype::NumberPrototype):
(NumberProtoFunc::NumberProtoFunc):
(NumberObjectImp::NumberObjectImp):
* kjs/object.cpp:
(KJS::JSObject::put):
(KJS::JSObject::defaultValue):
(KJS::JSObject::hasInstance):
* kjs/object.h:
(KJS::JSObject::getOwnPropertySlot):
* kjs/object_object.cpp:
(ObjectPrototype::ObjectPrototype):
(ObjectProtoFunc::ObjectProtoFunc):
(ObjectObjectImp::ObjectObjectImp):
* kjs/regexp_object.cpp:
(RegExpPrototype::RegExpPrototype):
(RegExpProtoFunc::RegExpProtoFunc):
(RegExpObjectImp::RegExpObjectImp):
* kjs/string_object.cpp:
(KJS::StringInstance::getOwnPropertySlot):
(KJS::StringInstance::put):
(KJS::StringInstance::deleteProperty):
(KJS::StringPrototype::StringPrototype):
(KJS::StringProtoFunc::StringProtoFunc):
(KJS::StringProtoFunc::callAsFunction):
(KJS::StringObjectImp::StringObjectImp):
(KJS::StringObjectFuncImp::StringObjectFuncImp):
* kjs/testkjs.cpp:
(TestFunctionImp::TestFunctionImp):
2007-03-18 Andrew Wellington <proton@wiretapped.net>
Reviewed by Mark Rowe
Set Xcode editor to use 4 space indentation (http://webkit.org/coding/coding-style.html)
* JavaScriptCore.xcodeproj/project.pbxproj:
2007-03-19 Mark Rowe <mrowe@apple.com>
Rubber-stamped by Brady.
Update references to bugzilla.opendarwin.org with bugs.webkit.org.
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertUTF8ToUTF16):
* kjs/function.cpp:
(KJS::FunctionImp::callAsFunction):
* kjs/grammar.y:
* kjs/keywords.table:
* kjs/lexer.cpp:
(KJS::Lexer::shift):
2007-03-18 Geoffrey Garen <ggaren@apple.com>
Reviewed by Oliver Hunt.
Exposed some extra toUInt32 functionality, as part of the fix for
REGRESSION: Incomplete document.all implementation breaks abtelectronics.com
(Style Change Through JavaScript Blanks Content)
* JavaScriptCore.exp:
* kjs/identifier.h:
(KJS::Identifier::toUInt32):
2007-03-18 Geoffrey Garen <ggaren@apple.com>
Removed duplicate export name.
* JavaScriptCore.exp:
2007-03-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed <rdar://problem/5064964> Repro ASSERT failure in JS Bindings when
closing window @ lowtrades.bptrade.com
Unfortunately, the bindings depend on UString and Identifier as string
representations. So, they need to acquire the JSLock when doing something
that will ref/deref their strings.
Layout tests, the original site, and Java, Flash, and Quicktime on the
web work. No leaks reported. No automated test for this because testing
the Java bindings, like math, is hard.
* bindings/runtime.h: Made Noncopyable, just to be sure.
* bindings/c/c_class.cpp:
(KJS::Bindings::CClass::~CClass): Acquire the JSLock and explicitly clear the keys
in our hashtable, since they're UString::Reps, and ref/deref aren't thread-safe.
(KJS::Bindings::CClass::methodsNamed): Also acquire the JSLock when adding
keys to the table, since the table ref's them.
(KJS::Bindings::CClass::fieldNamed): ditto.
* bindings/c/c_utility.cpp: Removed dead function.
(KJS::Bindings::convertValueToNPVariant): Acquire the JSLock because doing
it recursively is pretty cheap, and it's just too confusing to tell whether
all our callers do it for us.
(KJS::Bindings::convertNPVariantToValue): ditto
* bindings/c/c_utility.h:
* bindings/jni/jni_class.cpp: Same deal as c_class.cpp.
(JavaClass::JavaClass):
(JavaClass::~JavaClass):
* bindings/jni/jni_instance.cpp: Same deal as c_utility.cpp.
(JavaInstance::stringValue):
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::convertValueToJObject):
* bindings/jni/jni_runtime.cpp:
(JavaMethod::~JavaMethod): Moved from header, for clarity.
(appendClassName): Made this static, so the set of callers is known, and
we can assert that we hold the JSLock. Also changed it to take a UString
reference, which makes the calling code simpler.
(JavaMethod::signature): Store the ASCII value we care about instead of
a UString, since UString is so much more hassle. Hold the JSLock while
building up the temporary UString.
* bindings/jni/jni_runtime.h: Nixed dead code in JavaMethod.
(KJS::Bindings::JavaString::JavaString): Hold a UString::Rep instead of
a UString, so we can acquire the JSLock and explicitly release it.
(KJS::Bindings::JavaString::_commonInit):
(KJS::Bindings::JavaString::~JavaString):
(KJS::Bindings::JavaString::UTF8String):
(KJS::Bindings::JavaString::uchars):
(KJS::Bindings::JavaString::length):
(KJS::Bindings::JavaString::ustring):
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::convertArrayInstanceToJavaArray): Made this static, so
the set of callers is known, and we can assert that we hold the JSLock.
(KJS::Bindings::convertValueToJValue): Acquire the JSLock because doing
it recursively is pretty cheap, and it's just too confusing to tell whether
all our callers do it for us.
* bindings/objc/objc_runtime.h: Nixed some dead code.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertNSStringToString): Same drill as above.
2007-03-18 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Geoff.
http://bugs.webkit.org/show_bug.cgi?id=13105
REGRESSION: an exception raised when calculating base value of a dot expression is not returned
Test: fast/js/dot-node-base-exception.html
* kjs/nodes.cpp:
(FunctionCallDotNode::evaluate): Added the necessary KJS_CHECKEXCEPTIONVALUE.
2007-03-18 Steve Falkenburg <sfalken@apple.com>
Build fix.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2007-03-17 Timothy Hatcher <timothy@apple.com>
Reviewed by Mark Rowe.
Made Version.xcconfig smarter when building for different configurations.
Now uses the 522+ OpenSource version for Debug and Release, while using the
full 522.4 version for Production builds. The system prefix is also computed
based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.
* Configurations/JavaScriptCore.xcconfig:
* Configurations/Version.xcconfig:
2007-03-15 Maciej Stachowiak <mjs@apple.com>
Not reviewed.
- build fix
* wtf/TCSystemAlloc.cpp:
2007-03-15 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff and Steve.
- fix some portability issues with TCMalloc.
* JavaScriptCore.vcproj/WTF/WTF.vcproj:
* kjs/config.h:
* wtf/FastMalloc.cpp:
(WTF::SizeClass):
(WTF::InitSizeClasses):
(WTF::TCMalloc_PageHeap::Split):
(WTF::TCMalloc_PageHeap::RegisterSizeClass):
(WTF::TCMalloc_Central_FreeList::length):
(WTF::TCMalloc_ThreadCache::InitTSD):
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
* wtf/TCSpinLock.h:
* wtf/TCSystemAlloc.cpp:
(TryVirtualAlloc):
(TCMalloc_SystemAlloc):
2007-03-15 Timothy Hatcher <timothy@apple.com>
Reviewed by John.
* Factored out most of our common build settings into .xcconfig files. Anything that was common in
each build configuration was factored out into the shared .xcconfig file.
* Adds a Version.xcconfig file to define the current framework version, to be used in other places.
* Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
* Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).
* Configurations/Base.xcconfig: Added.
* Configurations/DebugRelease.xcconfig: Added.
* Configurations/JavaScriptCore.xcconfig: Added.
* Configurations/Version.xcconfig: Added.
* Info.plist:
* JavaScriptCore.xcodeproj/project.pbxproj:
2007-03-16 Shrikant Gangoda <shrikant.gangoda@celunite.com>
Gdk build fix.
* kjs/DateMath.cpp: gettimeofday comes from <sys/time.h> on Linux.
2007-03-14 Kevin McCullough <kmccullough@apple.com>
Reviewed by .
- Fixed one more build breakage
* kjs/date_object.cpp:
(KJS::formatLocaleDate):
2007-03-14 Kevin McCullough <kmccullough@apple.com>
Reviewed by .
- Fixed a build breakage.
* kjs/DateMath.cpp:
* kjs/date_object.cpp:
(KJS::formatLocaleDate):
(KJS::DateObjectImp::construct):
2007-03-14 Kevin McCullough <kmccullough@apple.com>
Reviewed by Geoff.
- rdar://problem/5045720
- DST changes in US affect JavaScript date calculations (12975)
This fix was to ensure we properly test for the new changes to DST in the US.
Also this fixes when we apply DST, now we correctly map most past years to current
DST rules. We still have a small issue with years before 1900 or after 2100.
rdar://problem/5055038
* kjs/DateMath.cpp: Fix DST to match spec better.
(KJS::getCurrentUTCTime):
(KJS::mimimumYearForDST):
(KJS::maximumYearForDST):
(KJS::equivalentYearForDST):
(KJS::getDSTOffset):
* kjs/DateMath.h: Consolodated common funtionality.
* kjs/date_object.cpp: Consolodated common functionality.
(KJS::formatLocaleDate):
(KJS::DateObjectImp::construct):
* tests/mozilla/ecma/jsref.js: Added functions for finding the correct days when DST starts and ends.
* tests/mozilla/ecma/shell.js: Added back in the old DST functions for ease of merging with mozilla if needed.
* tests/mozilla/ecma_2/jsref.js: Added functions for finding the correct days when DST starts and ends.
* tests/mozilla/ecma_3/Date/shell.js: Added functions for finding the correct days when DST starts and ends.
* tests/mozilla/expected.html: Updated to show all date tests passing.
=== Safari-5522.4 ===
2007-03-13 Kevin McCullough <kmccullough@apple.com>
Reviewed by .
- Adding expected failures until the are truly fixed.
- rdar://problem/5060302
* tests/mozilla/expected.html:
2007-03-12 Kevin McCullough <kmccullough@apple.com>
Reviewed by .
- Actually update tests for new DST rules.
* tests/mozilla/ecma/Date/15.9.3.1-1.js:
* tests/mozilla/ecma/Date/15.9.3.1-2.js:
* tests/mozilla/ecma/Date/15.9.3.1-3.js:
* tests/mozilla/ecma/Date/15.9.3.1-4.js:
* tests/mozilla/ecma/Date/15.9.3.1-5.js:
* tests/mozilla/ecma/Date/15.9.3.2-1.js:
* tests/mozilla/ecma/Date/15.9.3.2-2.js:
* tests/mozilla/ecma/Date/15.9.3.2-3.js:
* tests/mozilla/ecma/Date/15.9.3.2-4.js:
* tests/mozilla/ecma/Date/15.9.3.2-5.js:
* tests/mozilla/ecma/Date/15.9.3.8-1.js:
* tests/mozilla/ecma/Date/15.9.3.8-2.js:
* tests/mozilla/ecma/Date/15.9.3.8-3.js:
* tests/mozilla/ecma/Date/15.9.3.8-4.js:
* tests/mozilla/ecma/Date/15.9.3.8-5.js:
* tests/mozilla/ecma/Date/15.9.5.10-1.js:
* tests/mozilla/ecma/Date/15.9.5.10-10.js:
* tests/mozilla/ecma/Date/15.9.5.10-11.js:
* tests/mozilla/ecma/Date/15.9.5.10-12.js:
* tests/mozilla/ecma/Date/15.9.5.10-13.js:
* tests/mozilla/ecma/Date/15.9.5.10-2.js:
* tests/mozilla/ecma/Date/15.9.5.10-3.js:
* tests/mozilla/ecma/Date/15.9.5.10-4.js:
* tests/mozilla/ecma/Date/15.9.5.10-5.js:
* tests/mozilla/ecma/Date/15.9.5.10-6.js:
* tests/mozilla/ecma/Date/15.9.5.10-7.js:
* tests/mozilla/ecma/Date/15.9.5.10-8.js:
* tests/mozilla/ecma/Date/15.9.5.10-9.js:
* tests/mozilla/ecma/jsref.js:
* tests/mozilla/ecma_2/jsref.js:
* tests/mozilla/ecma_3/Date/shell.js:
2007-03-12 Kevin McCullough <kmccullough@apple.com>
Reviewed by .
- Update tests for new DST rules.
* tests/mozilla/ecma/shell.js:
2007-03-11 Geoffrey Garen <ggaren@apple.com>
Reviewed by Oliver Hunt.
Fixed <rdar://problem/4681051> Installer crashes in KJS::Collector::
markOtherThreadConservatively(KJS::Collector::Thread*) trying to install
iLife 06 using Rosetta on an Intel Machine
The problem was that our thread-specific data destructor would modify the
list of active JavaScript threads without holding the JSLock, corrupting
the list. Corruption was especially likely if one JavaScript thread exited
while another was starting up.
* JavaScriptCore.exp:
* kjs/JSLock.cpp: Don't conflate locking the JSLock with registering a
thread, since the thread-specific data destructor needs to lock
without registering a thread. Instead, treat thread registration as a
part of the convenience of the JSLock object, and whittle down JSLock::lock()
to just the bits that actually do the locking.
(KJS::JSLock::lock):
(KJS::JSLock::registerThread):
* kjs/JSLock.h: Updated comments to mention the new behavior above, and
other recent changes.
(KJS::JSLock::JSLock):
* kjs/collector.cpp:
(KJS::destroyRegisteredThread): Lock here.
(KJS::Collector::registerThread): To match, assert that we're locked here.
2007-03-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin Adler.
Fixed <rdar://problem/4587763> PAC file: lock inversion between QT and
JSCore causes a hang @ www.panoramas.dk
With a PAC file, run-webkit-tests --threaded passes, the reported site
works, and all the Quicktime/JavaScript and Flash/JavaScript examples
I found through Google work, too.
Any time JavaScript causes arbitrary non-JavaScript code to execute, it
risks deadlock, because that code may block, trying to acquire a lock
owned by a thread that is waiting to execute JavaScript. In this case,
the thread was a networking thread that was waiting to interpret a PAC file.
Because non-JavaScript code may execute in response to, well, anything,
a perfect solution to this problem is impossible. I've implemented an
optimistic solution, instead: JavaScript will drop its lock whenever it
makes a direct call to non-JavaScript code through a bridging/plug-in API,
but will blissfully ignore the indirect ways it may cause non-JavaScript
code to run (resizing a window, for example).
Unfortunately, this solution introduces significant locking overhead in
the bridging APIs. I don't see a way around that.
This patch includes some distinct bug fixes I saw along the way:
* bindings/objc/objc_instance.mm: Fixed a bug where a nested begin() call
would leak its autorelease pool, because it would NULL out _pool without
draining it.
* bindings/runtime_object.cpp:
(RuntimeObjectImp::methodGetter): Don't copy an Identifier to ASCII only
to turn around and make an Identifier from the ASCII. In an earlier
version of this patch, the copy caused an assertion failure. Now it's
just unnecessary work.
(RuntimeObjectImp::getOwnPropertySlot): ditto
* bindings/objc/objc_instance.h: Removed overrides of setVAlueOfField and
getValueOfField, because they did exactly what the base class versions did.
Removed overrides of Noncopyable declarations for the same reason.
* bindings/runtime.h: Inherit from Noncopyable instead of rolling our own.
* bindings/c/c_instance.h: ditto
And the actual patch:
* API/JSCallbackConstructor.cpp: Drop all locks when calling out to C.
(KJS::JSCallbackConstructor::construct):
* API/JSCallbackFunction.cpp: ditto
(KJS::JSCallbackFunction::callAsFunction):
* API/JSCallbackObject.cpp: ditto
(KJS::JSCallbackObject::init):
(KJS::JSCallbackObject::~JSCallbackObject):
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::hasInstance):
(KJS::JSCallbackObject::callAsFunction):
(KJS::JSCallbackObject::getPropertyNames):
(KJS::JSCallbackObject::toNumber):
(KJS::JSCallbackObject::toString):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::callbackGetter):
* bindings/c/c_instance.cpp: Drop all locks when calling out to C.
(KJS::Bindings::CInstance::invokeMethod):
(KJS::Bindings::CInstance::invokeDefaultMethod):
* bindings/c/c_runtime.cpp: Drop all locks when calling out to C.
(KJS::Bindings::CField::valueFromInstance):
(KJS::Bindings::CField::setValueToInstance):
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall): Drop all locks when calling out to Java.
* bindings/objc/objc_instance.mm: The changes here are to accomodate the
fact that C++ unwinding of DropAllLocks goes crazy when you put it inside
a @try block. I moved all JavaScript stuff outside of the @try blocks, and
then prefixed the whole blocks with DropAllLocks objects. This required some
supporting changes in other functions, which now acquire the JSLock for
themselves, intead of relying on their callers to do so.
(ObjcInstance::end):
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
(ObjcInstance::setValueOfUndefinedField):
(ObjcInstance::getValueOfUndefinedField):
* bindings/objc/objc_runtime.mm: Same as above, except I didn't want to
change throwError to acquire the JSLock for itself.
(ObjcField::valueFromInstance):
(ObjcField::setValueToInstance):
* bindings/objc/objc_utility.mm: Supporting changes mentioned above.
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
* kjs/JSLock.cpp:
(1) Fixed DropAllLocks to behave as advertised, and drop the JSLock only
if the current thread actually acquired it in the first place. This is
important because WebKit needs to ensure that the JSLock has been
dropped before it makes a plug-in call, even though it doesn't know if
the current thread actually acquired the JSLock. (We don't want WebKit
to accidentally drop a lock belonging to *another thread*.)
(2) Used the new per-thread code written for (1) to make recursive calls
to JSLock very cheap. JSLock now knows to call pthread_mutext_lock/
pthread_mutext_unlock only at nesting level 0.
(KJS::createDidLockJSMutex):
(KJS::JSLock::lock):
(KJS::JSLock::unlock):
(KJS::DropAllLocks::DropAllLocks):
(KJS::DropAllLocks::~DropAllLocks):
(KJS::JSLock::lockCount):
* kjs/JSLock.h: Don't duplicate Noncopyable.
(KJS::JSLock::~JSLock):
* wtf/Assertions.h: Blind attempt at helping the Windows build.
2007-03-08 Darin Fisher <darin@chromium.org>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=13018
Bug 13018: allow embedders to override the definition of CRASH.
* wtf/Assertions.h: make it possible to override CRASH.
2007-03-07 Huan Ren <huanr@chromium.org>
Reviewed by Maciej.
Fix http://bugs.webkit.org/show_bug.cgi?id=12535
Bug 12535: Stack-optimizing compilers can trick GC into freeing in-use objects
* kjs/internal.cpp:
(KJS::StringImp::toObject): Copy val onto the stack so it is not subject to garbage collection.
2007-03-07 Geoffrey Garen <ggaren@apple.com>
Build fix for non-multiple-thread folks.
Use a shared global in the non-multiple-thread case.
* wtf/FastMalloc.cpp:
(WTF::isForbidden):
(WTF::fastMallocForbid):
(WTF::fastMallocAllow):
2007-03-07 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin Adler.
Fixed ASSERT failure I just introduced.
Made the fastMalloc isForbidden flag per thread. (Oops!) We expect that
other threads will malloc while we're marking -- we just want to prevent
our own marking from malloc'ing.
* wtf/FastMalloc.cpp:
(WTF::initializeIsForbiddenKey):
(WTF::isForbidden):
(WTF::fastMallocForbid):
(WTF::fastMallocAllow):
(WTF::fastMalloc):
(WTF::fastCalloc):
(WTF::fastFree):
(WTF::fastRealloc):
(WTF::do_malloc):
2007-03-07 Shrikant Gangoda <shrikant.gangoda@celunite.com>
Reviewed by Maciej.
http://bugs.webkit.org/show_bug.cgi?id=12997
Wrap pthread-specific assertion in #if USE(MULTIPLE_THREADS).
* kjs/collector.cpp:
(KJS::Collector::markMainThreadOnlyObjects):
2007-03-06 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed <rdar://problem/4576242> | http://bugs.webkit.org/show_bug.cgi?id=12586
PAC file: malloc deadlock sometimes causes a hang @ www.apple.com/pro/profiles/ (12586)
This is a modified version of r14752 on the branch.
These changes just add debugging functionality. They ASSERT that we don't
malloc during the mark phase of a garbage collection, which can cause a
deadlock.
* kjs/collector.cpp:
(KJS::Collector::collect):
* wtf/FastMalloc.cpp:
(WTF::fastMallocForbid):
(WTF::fastMallocAllow):
(WTF::fastMalloc):
(WTF::fastCalloc):
(WTF::fastFree):
(WTF::fastRealloc):
(WTF::do_malloc):
* wtf/FastMalloc.h:
2007-03-06 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed all known crashers exposed by run-webkit-tests --threaded. This covers:
<rdar://problem/4565394> | http://bugs.webkit.org/show_bug.cgi?id=12585
PAC file: after closing a window that contains macworld.com, new window
crashes (KJS::PropertyMap::mark()) (12585)
<rdar://problem/4571215> | http://bugs.webkit.org/show_bug.cgi?id=9211
PAC file: Crash occurs when clicking on the navigation tabs at http://www.businessweek.com/ (9211)
<rdar://problem/4557926>
PAC file: Crash occurs when attempting to view image in slideshow mode
at http://d.smugmug.com/gallery/581716 ( KJS::IfNode::execute (KJS::
ExecState*) + 312) if you use a PAC file
(1) Added some missing JSLocks, along with related ASSERTs.
(2) Fully implemented support for objects that can only be garbage collected
on the main thread. So far, only WebCore uses this. We can add it to API
later if we learn that it's needed.
The implementation uses a "main thread only" flag inside each object. When
collecting on a secondary thread, the Collector does an extra pass through
the heap to mark all flagged objects before sweeping. This solution makes
the common case -- flag lots of objects, but never collect on a secondary
thread -- very fast, even though the uncommon case of garbage collecting
on a secondary thread isn't as fast as it could be. I left some notes
about how to speed it up, if we ever care.
For posterity, here are some things I learned about GC while investigating:
* Each collect must either mark or delete every heap object. "Zombie"
objects, which are neither marked nor deleted, raise these issues:
* On the next pass, the conservative marking algorithm might mark a
zombie, causing it to mark freed objects.
* The client might try to use a zombie, which would seem live because
its finalizer had not yet run.
* A collect on the main thread is free to delete any object. Presumably,
objects allocated on secondary threads have thread-safe finalizers.
* A collect on a secondary thread must not delete thread-unsafe objects.
* The mark function must be thread-safe.
Line by line comments:
* API/JSObjectRef.h: Added comment specifying that the finalize callback
may run on any thread.
* JavaScriptCore.exp: Nothing to see here.
* bindings/npruntime.cpp:
(_NPN_GetStringIdentifier): Added JSLock.
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::~ObjcInstance): Use an autorelease pool. The other callers
to CFRelease needed one, too, but they were dead code, so I removed them
instead. (This fixes a leak seen while running run-webkit-tests --threaded,
although I don't think it's specifically a threading issue.)
* kjs/collector.cpp:
(KJS::Collector::collectOnMainThreadOnly): New function. Tells the collector
to collect a value only if it's collecting on the main thread.
(KJS::Collector::markMainThreadOnlyObjects): New function. Scans the heap
for "main thread only" objects and marks them.
* kjs/date_object.cpp:
(KJS::DateObjectImp::DateObjectImp): To make the new ASSERTs happy, allocate
our globals on the heap, avoiding a seemingly unsafe destructor call at
program exit time.
* kjs/function_object.cpp:
(FunctionPrototype::FunctionPrototype): ditto
* kjs/interpreter.cpp:
(KJS::Interpreter::mark): Removed boolean parameter, which was an incomplete
and arguably hackish way to implement markMainThreadOnlyObjects() inside WebCore.
* kjs/interpreter.h:
* kjs/identifier.cpp:
(KJS::identifierTable): Added some ASSERTs to check for thread safety
problems.
* kjs/list.cpp: Added some ASSERTs to check for thread safety problems.
(KJS::allocateListImp):
(KJS::List::release):
(KJS::List::append):
(KJS::List::empty): Make the new ASSERTs happy.
* kjs/object.h:
(KJS::JSObject::JSObject): "m_destructorIsThreadSafe" => "m_collectOnMainThreadOnly".
I removed the constructor parameter because m_collectOnMainThreadOnly,
like m_marked, is a Collector bit, so only the Collector should set or get it.
* kjs/object_object.cpp:
(ObjectPrototype::ObjectPrototype): Make the ASSERTs happy.
* kjs/regexp_object.cpp:
(RegExpPrototype::RegExpPrototype): ditto
* kjs/ustring.cpp: Added some ASSERTs to check for thread safety problems.
(KJS::UCharReference::ref):
(KJS::UString::Rep::createCopying):
(KJS::UString::Rep::create):
(KJS::UString::Rep::destroy):
(KJS::UString::null): Make the new ASSERTs happy.
* kjs/ustring.h:
(KJS::UString::Rep::ref): Added some ASSERTs to check for thread safety problems.
(KJS::UString::Rep::deref):
* kjs/value.h:
(KJS::JSCell::JSCell):
2007-03-06 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
2% speedup on super accurate JS iBench.
(KJS::Collector::collect): Removed anti-optimization to call
pthread_is_threaded_np() before calling pthread_main_np(). Almost all
apps have more than one thread, so the extra call is actually worse.
Interestingly, even the single-threaded testkjs shows a speed gain
from removing the pthread_is_threaded_np() short-circuit. Not sure why.
2007-03-04 Peter Kasting <pkasting@google.com>
Reviewed by Nikolas Zimmermann.
- fix http://bugs.webkit.org/show_bug.cgi?id=12950
Assertions.cpp should not #define macros that are already defined
* wtf/Assertions.cpp: Don't #define WINVER and _WIN32_WINNT if they
are already defined.
2007-03-02 Steve Falkenburg <sfalken@apple.com>
Reviewed by Anders.
Add unsigned int hash traits (matches existing unsigned long version)
* wtf/HashTraits.h:
(WTF::):
2007-03-02 Adam Roben <aroben@apple.com>
Reviewed by Kevin M.
Try to fix the Qt build.
* kjs/DateMath.cpp:
(KJS::msToGregorianDateTime): Removed unnecessary "struct" keyword.
* kjs/DateMath.h: Moved forward declarations to the top of the file
before they are used.
* kjs/date_object.cpp:
(KJS::formatLocaleDate): Changed to take a const GregorianDateTime&
since GregorianDateTime is Noncopyable.
2007-03-02 Darin Adler <darin@apple.com>
Reviewed by Kevin McCullough.
- fix http://bugs.webkit.org/show_bug.cgi?id=12867
REGRESSION: BenchJS test 7 (dates) is 220% slower than in Safari 2.0.4
* kjs/DateMath.h: Marked GregorianDateTime as noncopyable, since it has a non-trivial
destructor and not the correspoding copy constructor or assignment operator.
Changed the GregorianDateTime constructor to use member initialization syntax.
Fixed the destructor to use the array delete operator, since timeZone is an array.
* kjs/DateMath.cpp:
(KJS::daysInYear): Changed to call isLeapYear so the rule is not repeated twice.
(KJS::getUTCOffset): Added caching on PLATFORM(DARWIN), since we can rely on the
notify_check function and "com.apple.system.timezone" to let us know when the
offset has changed.
2007-02-27 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin Adler.
Follow-up to fixing http://bugs.webkit.org/show_bug.cgi?id=12659 | <rdar://problem/4954306>
JS objects not collected after closing window @ ebay.com/maps.google.com
Changed Interpreter cache of global constructors and prototypes from
ProtectedPtrs to bare, marked pointers. ProtectedPtrs are inefficient,
and they increase the risk of reference cycles. Also, Darin said something
about ProtectedPtrs giving him warts.
Also changed data members to precise types from generic JSObject*'s.
Layout tests and JS tests pass.
* kjs/SavedBuiltins.h:
* kjs/interpreter.cpp:
(KJS::Interpreter::init):
(KJS::Interpreter::~Interpreter):
(KJS::Interpreter::initGlobalObject): Moved Identifier::init() call to
constructor, for clarity.
(KJS::Interpreter::mark):
* kjs/interpreter.h:
2007-02-27 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed http://bugs.webkit.org/show_bug.cgi?id=12659 | <rdar://problem/4954306>
JS objects not collected after closing window @ ebay.com/maps.google.com
Don't GC in the Interpreter destructor. For that to work, the Interpreter
would have to NULL out all of its ProtectedPtrs before calling collect(). But
we've decided that we don't want things to work that way, anyway. We want the
client to be in charge of manual GC so that it can optimize cases when
it will be destroying many interpreters at once
(e.g., http://bugs.webkit.org/show_bug.cgi?id=12900).
Also removed Interpreter::collect() because it was redundant with
Collector::collect().
* JavaScriptCore.exp:
* kjs/interpreter.cpp:
(KJS::Interpreter::~Interpreter):
* kjs/testkjs.cpp:
(TestFunctionImp::callAsFunction):
2007-02-26 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Adam Roben.
Rename *_SUPPORT defines to ENABLE_*.
* jscore.bkl:
2007-02-26 Maciej Stachowiak <mjs@apple.com>
Reviewed by Lars.
- <rdar://problem/5021698> Disable experimental SVG features (12883)
* wtf/Platform.h: Add ENABLE() macro similar to HAVE() and USE(), to
allow nicer handling of optional WebKit features.
2007-02-22 George Staikos <staikos@kde.org>
Reviewed by Lars.
Add return values
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
2007-02-22 Oscar Cwajbaum <public@oscarc.net>
Reviewed by Maciej.
Fix ARM-specific alignment problem in FastMalloc
http://bugs.webkit.org/show_bug.cgi?id=12841
* wtf/FastMalloc.cpp:
Modify how pageheap_memory is declared to ensure proper alignment
on architectures such as ARM
2007-02-20 Zack Rusin <zrusin@trolltech.com>
Reviewed by Lars
Make sure that non-void methods always return something.
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
(WTF::Unicode::foldCase):
2007-02-18 Kevin Ollivier <kevino@theolliviers.com>
Reviewed by Adam Roben.
Fix cases where MSVC-specific code was identified as Win32 platform
code. (as it should be compiled for e.g. wx port when using MSVC too)
* wtf/Assertions.h:
* wtf/MathExtras.h:
* wtf/StringExtras.h:
changed PLATFORM(WIN) sections to COMPILER(MSVC) as necessary
2007-02-17 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Adam Roben.
Fix crashes on ARM due to different struct packing. Based on a patch
by Mike Emmel.
* kjs/ustring.cpp: compile-time assert to make sure sizeof(UChar) == 2
* kjs/ustring.h: pack UChar struct to ensure that sizeof(UChar) == 2
* wtf/Assertions.h: add COMPILE_ASSERT macro for compile-time assertions
2007-02-16 George Staikos <staikos@kde.org>
Reviewed by Maciej.
Fix uninitialized variable
* bindings/testbindings.cpp:
(myAllocate):
2007-02-16 Anders Carlsson <acarlsson@apple.com>
Reviewed by Mitz.
http://bugs.webkit.org/show_bug.cgi?id=12788
REGRESSION: Going back one page in history has a noticeable delay
Um...if all elements in two vectors are equal, then I guess we could say that
the two vectors are equal too.
* wtf/Vector.h:
(WTF::):
2007-02-14 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
Add new canCompareWithMemcmp vector trait and use it to determine whether
operator== can use memcmp.
* wtf/Vector.h:
(WTF::):
(WTF::VectorTypeOperations::compare):
(WTF::operator==):
* wtf/VectorTraits.h:
(WTF::):
2007-02-13 Brady Eidson <beidson@apple.com>
Reviewed by Darin
Tweaked vector a bit
* wtf/Vector.h:
(WTF::operator==):
2007-02-13 Matt Perry <mpcomplete@chromium.org>
Reviewed by Darin.
- fix for http://bugs.webkit.org/show_bug.cgi?id=12750
Vector operator== was not defined correctly. It returned void,
did not accept const Vectors, and used an int instead of size_t.
* wtf/Vector.h: fixed comparison operators
(WTF::operator==):
(WTF::operator!=):
2007-02-10 David Carson <dacarson@gmail.com>
Reviewed by Maciej.
- fix for http://bugs.webkit.org/show_bug.cgi?id=12636
Corrected the generation of method signatures when the parameter
is an Array.
Added support for converting a Javascript array to a Java array.
* bindings/jni/jni_utility.h: added new type for array, array_type
* bindings/jni/jni_runtime.cpp: add support for new array type
(JavaField::valueFromInstance):
(JavaField::setValueToInstance):
(JavaMethod::JavaMethod):
(JavaMethod::signature):
* bindings/jni/jni_utility.cpp: add support for new array type
(KJS::Bindings::callJNIMethod):
(KJS::Bindings::callJNIStaticMethod):
(KJS::Bindings::callJNIMethodIDA):
(KJS::Bindings::JNITypeFromClassName):
(KJS::Bindings::signatureFromPrimitiveType):
(KJS::Bindings::JNITypeFromPrimitiveType):
(KJS::Bindings::getJNIField):
(KJS::Bindings::convertArrayInstanceToJavaArray): new method
converts the Javascript array to the requested Java array.
(KJS::Bindings::convertValueToJValue):
2007-02-08 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
<rdar://problem/4930614>
Safari complains about "Slow Script" if GMail is left open and machine is busy
<rdar://problem/4649516>
Turn off slow script dialog or crank up time that makes it come up
<rdar://problem/4963589>
Slow script warning is displayed after closing of PROMPT or PRINT dialog
Re-do the way script timeouts are handled. No longer use a unix timer that sends signals. Instead, add a
tick count and increment it in loop bodies. If the tick count reaches a threshold, do a timeout check. If the total time executing
is higher than the timeout value, (possibly) interrupt the script. The timeout checker also adjusts the threshold dynamically
to prevent doing the timeout check too often.
* JavaScriptCore.exp:
Remove pause and resume calls.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Add winmm.lib.
* kjs/interpreter.cpp:
(KJS::Interpreter::init):
(KJS::Interpreter::~Interpreter):
(KJS::Interpreter::startTimeoutCheck):
(KJS::Interpreter::stopTimeoutCheck):
(KJS::Interpreter::resetTimeoutCheck):
(KJS::getCurrentTime):
(KJS::Interpreter::checkTimeout):
* kjs/interpreter.h:
(KJS::Interpreter::timedOut):
* kjs/nodes.cpp:
(DoWhileNode::execute):
(WhileNode::execute):
(ForNode::execute):
2007-02-07 Darin Adler <darin@apple.com>
* JavaScriptCore.vcproj/JavaScriptCore.sln: Reenable testkjs.
2007-02-07 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- another build fix; this time for sure
* pcre/pcre_exec.c: (match):
The compiler caught an incorrect use of the othercase variable across
a call to RMATCH in character repeat processing. Local variables can
change in the crazy NO_RECURSE mode that we use, so we instead need
the value in othercase to be in one of the special stack frame variables.
Added a new stack frame variable for this purpose named repeat_othercase.
Also noted a similar error in the non-UTF-16 side of the #ifdef, but
didn't try to fix that one. Also removed a SUPPORT_UCP #ifdef from the
PCRE_UTF16 side; that code doesn't work without the Unicde properties
table, and we don't try to use it that way.
2007-02-06 Steve Falkenburg <sfalken@apple.com>
Disable testkjs in sln until we figure out mysterious compiler warning.
* JavaScriptCore.vcproj/JavaScriptCore.sln:
2007-02-06 Steve Falkenburg <sfalken@apple.com>
Build fix by ggaren
* pcre/pcre_exec.c:
(match):
2007-02-06 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- fix <rdar://problem/4979089> PCRE should avoid setjmp/longjmp even when compiler
is not GCC
Added a new code path that's slower and way uglier but doesn't rely on GCC's
computed gotos.
* pcre/pcre_exec.c: Added a numeric parameter to the RMATCH function. It must be
different at every RMATCH call site. Changed the non-GCC NO_RECURSE version of
the macro to use a label incorporating the number. Changed the RRETURN macro to
use a goto instead of longjmp.
(match): Added a different number at each callsite, using a perl script for the
first-time task. Going forward it should be easy to maintain by hand. Added a
switch statement at the bottom of the function. We'll get compile time errors
if we have anything in the switch statement that's never used in an RMATCH,
but errors in the other direction are silent except at runtime.
2007-02-06 Darin Adler <darin@apple.com>
Reviewed by John.
- fix <rdar://problem/4687840> 9A241: JavaScript RegExp 25-30x slower than on 10.4.7
I used Shark to figure out what to do. The test case is now 15% faster than with
stock Safari. Some other regular expression cases might still be a few % slower
than before, but the >10x slowdown is now completely gone.
1) Fix slowness caused by setjmp/longjmp by using computed goto instead.
Use GCC extensions - locally declared labels, labels as values, and computed goto -
instead of using setjmp/longjmp to implemement non-recursive version of the regular
expression system. We could probably make this even faster if we reduced the use
of malloc a bit too.
2) Fix slowness caused by allocating heapframe objects by allocating the first
16 of them from the stack.
3) Speed up use of malloc and free in PCRE by making it use fastMalloc and fastFree.
4) Speed up the test case by adding a special case to a UString function.
5) Made a small improvement to the innermost hottest loop of match by hoisting
the conversion from int to pcre_uchar out of the loop.
* JavaScriptCore.xcodeproj/project.pbxproj: Compile FastMallocPCRE.cpp, and don't
compile pcre_globals.c.
* wtf/FastMallocPCRE.cpp: Added. A copy of pcre_globals.c that uses FastMalloc.h.
This is better than code that sets the PCRE allocation globals because by doing it
this way there's guaranteed to be no problem with order of initialization.
* kjs/ustring.cpp: (KJS::UString::spliceSubstringsWithSeparators): Add a fast
special case when this is called for only one subrange and no seaprators. This
was happening a lot in the test case and it seems quite reasonable to optimize this.
* pcre/pcre_exec.c: Create a copy of the RMATCH and RRETURN macros that use goto
instead of setjmp/longjmp. Change code that calls pcre_stack_malloc to first use
storage on the stack inside the match function.
(match): Move initialization of utf8 up a couple lines to avoid "possibly used
uninitialized" warning. Use a local variable so we compare with pcre_uchar instead
of with int inside the inner "find a character" loop.
2007-02-03 George Staikos <staikos@kde.org>
Reviewed by Alexey.
-1 is not a valid point. We can't handle anything > 0xffff anyway.
Fixes crash on cases like eval("x");
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::category):
2007-02-02 Darin Adler <darin@apple.com>
Reviewed by Anders.
- fix copying and assigning a ListHashSet
No test because the code path with bugs I am fixing is not used yet.
* wtf/ListHashSet.h: Tweaked ListHashSetNodeAllocator a little bit for clarity.
Changed m_allocator to be an OwnPtr instead of doing an explicit delete.
Fixed bug in copy constructor where we'd have an uninitialized m_allocator.
Fixed bug in assignment operator where it would swap only the hash table, and
not the head, tail, and allocator pointers.
2007-02-02 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Use WTFLog instead of fprintf for logging KJS::Node leaks.
* kjs/nodes.cpp:
(NodeCounter::~NodeCounter): Changed count to unsigned, updated
to match style guidelines.
2007-02-02 Maciej Stachowiak <mjs@apple.com>
- not reviewed, build fix
* wtf/ListHashSet.h:
(WTF::ListHashSetNodeAllocator::ListHashSetNodeAllocator): ummm, use union correctly
2007-02-01 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- use a custom allocator for ListHashSet, to fix ~1% perf regression using it for form control
* wtf/ListHashSet.h:
(WTF::ListHashSetNodeAllocator::ListHashSetNodeAllocator):
(WTF::ListHashSetNodeAllocator::allocate):
(WTF::ListHashSetNodeAllocator::deallocate):
(WTF::ListHashSetNode::operator new):
(WTF::ListHashSetNode::operator delete):
(WTF::ListHashSetNode::destroy):
(WTF::ListHashSetTranslator::translate):
(WTF::::ListHashSet):
(WTF::::~ListHashSet):
(WTF::::add):
(WTF::::unlinkAndDelete):
(WTF::::deleteAllNodes):
2007-01-31 Maciej Stachowiak <mjs@apple.com>
Reviewed by Adam.
- fix sporadic crash
* wtf/ListHashSet.h:
(WTF::::remove): remove before deleting
2007-01-31 Maciej Stachowiak <mjs@apple.com>
Reviewed by Mark with help from Lars.
- added new ListHashSet class, which combines a hashtable and a linked list to provide a set
that keeps elements in inserted order
This is to assist in fixing the following:
<rdar://problem/4751164> REGRESSION: Safari places text on incorrect button when returning to a page via back [10541]
http://bugs.webkit.org/show_bug.cgi?id=10541
* JavaScriptCore.vcproj/WTF/WTF.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* wtf/HashTable.h:
(WTF::HashTable::find):
(WTF::HashTable::contains):
(WTF::::find):
(WTF::::contains):
* wtf/ListHashSet.h: Added.
(WTF::ListHashSetNode::ListHashSetNode):
(WTF::ListHashSetNodeHashFunctions::hash):
(WTF::ListHashSetNodeHashFunctions::equal):
(WTF::ListHashSetIterator::ListHashSetIterator):
(WTF::ListHashSetIterator::get):
(WTF::ListHashSetIterator::operator*):
(WTF::ListHashSetIterator::operator->):
(WTF::ListHashSetIterator::operator++):
(WTF::ListHashSetIterator::operator--):
(WTF::ListHashSetIterator::operator==):
(WTF::ListHashSetIterator::operator!=):
(WTF::ListHashSetIterator::operator const_iterator):
(WTF::ListHashSetIterator::node):
(WTF::ListHashSetConstIterator::ListHashSetConstIterator):
(WTF::ListHashSetConstIterator::get):
(WTF::ListHashSetConstIterator::operator*):
(WTF::ListHashSetConstIterator::operator->):
(WTF::ListHashSetConstIterator::operator++):
(WTF::ListHashSetConstIterator::operator--):
(WTF::ListHashSetConstIterator::operator==):
(WTF::ListHashSetConstIterator::operator!=):
(WTF::ListHashSetConstIterator::node):
(WTF::ListHashSetTranslator::hash):
(WTF::ListHashSetTranslator::equal):
(WTF::ListHashSetTranslator::translate):
(WTF::::ListHashSet):
(WTF::::operator):
(WTF::::~ListHashSet):
(WTF::::size):
(WTF::::capacity):
(WTF::::isEmpty):
(WTF::::begin):
(WTF::::end):
(WTF::::find):
(WTF::::contains):
(WTF::::add):
(WTF::::remove):
(WTF::::clear):
(WTF::::unlinkAndDelete):
(WTF::::appendNode):
(WTF::::deleteAllNodes):
(WTF::::makeIterator):
(WTF::::makeConstIterator):
(WTF::deleteAllValues):
2007-01-30 Darin Adler <darin@apple.com>
* kjs/DateMath.cpp: Fix license header to reflect LGPL as the first license
mentioned. We still mention the option of using under MPL or GPL since some
of this code came from the Mozilla project with those license terms.
2007-01-30 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
Turned JavaScriptCore from a separate library into an includable
project, to combine it all into libWebKitQt.
* JavaScriptCore.pri: Added.
* JavaScriptCore.pro: Removed.
* kjs/testkjs.pro:
2007-01-29 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed <rdar://problem/4485644> REGRESSION: JavaScriptCore has init routines
The TCMalloc module now initializes, if needed, inside GetCache() and
fastMallocSetIsMultiThreaded(). We leverage the same synchronization
technique used for enabling / disabling the single-threaded optimization
to synchronize initialization of the library without requiring a lock
for every malloc.
1,251 runs of tcmalloc_unittest, 2 runs of a custom, massively multi-threaded
tcmalloc_unittest, and my custom version of the PLT show no regressions.
Super-accurate JS iBench reports a .24% regression, which is right at the
limit of its error range, so I'm declaring victory.
* wtf/FastMalloc.cpp:
(WTF::fastMallocSetIsMultiThreaded): Initialize, if needed. (InitModule()
checks the "if needed" part.)
(WTF::TCMalloc_ThreadCache::GetCache): Restored original TCMalloc code
inside #ifdef, for posterity. Added new initialization logic.
(WTF::TCMalloc_ThreadCache::InitModule): Call InitTSD(), since we don't
have a static initializer to call it for us, now. This means that fastMalloc
is not usable as a general libc allocator, but it never was, and if it were
the general libc allocator, we wouldn't be here in the first place, so whatever.
(WTF::TCMalloc_ThreadCache::InitTSD): Don't try to take the pageheap_lock,
since InitModule already has it.
2007-01-29 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Geoff and Oliver.
- rdar://problem/4955561
- missusing JavaScript shouldn't crash webkit. Now it doesn't, in this case.
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::callAsFunction):
* bindings/runtime_method.cpp:
(RuntimeMethod::callAsFunction):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::callAsFunction):
2007-01-28 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
First step in fixing <rdar://problem/4485644> REGRESSION: JavaScriptCore
has init routines
Don't rely on a static initializer to store the main thread's ID (which
we would use to detect allocations on secondary threads). Instead, require
the caller to notify fastMalloc if it might allocate on a secondary thread.
Also fixed what seemed like a race condition in do_malloc.
tcmalloc_unittest and my custom versions of JS iBench and PLT show no
regressions.
* wtf/FastMalloc.cpp:
(WTF::fastMallocSetIsMultiThreaded):
(1) Renamed from "fastMallocRegisterThread", which was a misleading name because
not all threads need to register with fastMalloc -- only secondary threads
need to, and only for the purpose of disabling its single-threaded optimization.
(2) Use the pageheap_lock instead of a custom one, since we need to synchronize
with the read of isMultiThreaded inside CreateCacheIfNecessary. This is a new
requirement, now that we can't guarantee that the first call to CreateCacheIfNecessary
will occur on the main thread at init time, before any other threads have been created.
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
(WTF::do_malloc): Reverted WTF change only to call GetCache() if size <= kMaxSize.
The WTF code would read phinited without holding the pageheap_lock, which
seemed like a race condition. Regardless, calling GetCache reduces the number
of code paths to module initialization, which will help in writing the
final fix for this bug.
2007-01-28 David Kilzer <ddkilzer@webkit.org>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=9815
JavaScript TypeError loading Dean Edwards' JS compressor/obfuscator
Creating a function using 'new Function()' was not setting its prototype with the
same flags as 'function() { }'.
Test: fast/js/function-prototype.html
* kjs/function_object.cpp:
(FunctionObjectImp::construct): Change flags from DontEnum|DontDelete|ReadOnly to
Internal|DontDelete to match FuncDeclNode::processFuncDecl() and
FuncExprNode::evaluate() in kjs/nodes.cpp.
2007-01-27 Geoffrey Garen <ggaren@apple.com>
Reviewed by Beth Dakin.
Added some missing JSLocks, which might fix <rdar://problem/4889707>.
We need to lock whenever we might allocate memory because our FastMalloc
implementation requires clients to register their threads, which we do
through JSLock.
We also need to lock whenever modifying ref-counts because they're not
thread-safe.
* API/JSObjectRef.cpp:
(JSClassCreate): Allocates memory
(JSClassRetain): Modifies a ref-count
(JSClassRelease): Modifies a ref-count
(JSPropertyNameArrayRetain): Modifies a ref-count
(JSPropertyNameArrayRelease): Modifies a ref-count
* API/JSStringRef.cpp:
(JSStringRetain): Modifies a ref-count
* API/JSValueRef.cpp:
(JSValueIsInstanceOfConstructor): Might allocate memory if an exception
is thrown.
2007-01-27 Lars Knoll <lars@trolltech.com>
Fix the Qt build.
* bindings/qt/qt_instance.h:
2007-01-25 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed <rdar://problem/4608404> WebScriptObject's _rootObject lack
of ownership policy causes crashes (e.g., in Dashcode)
The old model for RootObject ownership was either to (1) leak them or (2) assign
them to a single owner -- the WebCore::Frame -- which would destroy them
when it believed that all of its plug-ins had unloaded.
This model was broken because of (1) and also because plug-ins are not the only
RootObject clients. All Bindings clients are RootObjects clients, including
applications, which outlive any particular WebCore::Frame.
The new model for RootObject ownership is to reference-count them, with a
throw-back to the old model: The WebCore::Frame tracks the RootObjects
it creates, and invalidates them when it believes that all of its plug-ins
have unloaded.
We maintain this throw-back to avoid plug-in leaks, particularly from Java.
Java is completely broken when it comes to releasing JavaScript objects.
Comments in our code allege that Java does not always call finalize when
collecting objects. Moreoever, my own testing reveals that, when Java does
notify JavaScript of a finalize, the data it provides is totally bogus.
This setup is far from ideal, but I don't think we can do better without
completely rewriting the bindings code, and possibly part of the Java
plug-in / VM.
Layout tests pass. No additional leaks reported. WebCore/manual-tests/*liveconnect*
and a few LiveConnect demos on the web also run without a hitch.
const RootObject* => RootObject*, since we need to ref/deref
* bindings/NP_jsobject.cpp:
(jsDeallocate): deref our RootObjects. Also unprotect or JSObject, instead
of just relying on the RootObject to do it for us when it's invalidated.
(_isSafeScript): Check RootObject validity.
(_NPN_CreateScriptObject): ditto
(_NPN_Invoke): ditto
(_NPN_Evaluate): ditto
(_NPN_GetProperty): ditto
(_NPN_SetProperty): ditto
(_NPN_RemoveProperty): ditto
(_NPN_HasProperty): ditto
(_NPN_HasMethod): ditto
(_NPN_SetException): ditto
* bindings/runtime_root.cpp:
Revived bit-rotted LIAR LIAR LIAR comment.
LOOK: Added support for invalidating RootObjects without deleting them,
which is the main goal of this patch.
Moved protect counting into the RootObject class, to emphasize that
the RootObject protects the JSObject, and unprotects it upon being invalidated.
addNativeReference => RootObject::gcProtect
removeNativeReference => RootObject::gcUnprotect
ProtectCountSet::contains => RootObject::gcIsProtected
I know we'll all be sad to see the word "native" go.
* bindings/runtime_root.h: Added ref-counting support to RootObject, with
all the standard accoutrements.
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertValueToNPVariant): If we can't find a valid RootObject,
return void instead of just leaking.
* bindings/jni/jni_instance.cpp:
(JavaInstance::JavaInstance): Don't take a RootObject in our constructor;
be like other Instances and require the caller to call setRootObject. This
reduces the number of ownership code paths.
(JavaInstance::invokeMethod): Check RootObject for validity.
* bindings/jni/jni_instance.h: Removed private no-arg constructor. Having
an arg constructor accomplishes the same thing.
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::invoke): No need to call findProtectCountSet, because finalize()
checks for RootObject validity.
(JavaJSObject::JavaJSObject): check RootObject for validity
(JavaJSObject::call): ditto
(JavaJSObject::eval): ditto
(JavaJSObject::getMember): ditto
(JavaJSObject::setMember): ditto
(JavaJSObject::removeMember): ditto
(JavaJSObject::getSlot): ditto
(JavaJSObject::setSlot): ditto
(JavaJSObject::toString): ditto
(JavaJSObject::finalize): ditto
(JavaJSObject::createNative): No need to tell the RootObject to protect
the global object, since the RootObject already owns the interpreter.
* bindings/jni/jni_runtime.cpp:
(JavaArray::JavaArray): Removed copy construcutor becaue it was unused.
Dead code is dangerous code.
* bindings/objc/objc_runtime.mm: Added WebUndefined protocol. Previous use
of WebScriptObject was bogus, because WebUndefined is not a subclass of
WebScriptObject.
(convertValueToObjcObject): If we can't find a valid RootObject,
return nil instead of just leaking.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue): If we can't find a valid RootObject,
return nil instead of just leaking.
2007-01-27 Andrew Wellington <proton@wiretapped.net>
Reviewed by Maciej.
Fix for Repeated string concatenation results in OOM crash
http://bugs.webkit.org/show_bug.cgi?id=11131
* kjs/operations.cpp:
(KJS::add): Throw exception if string addition result is null
* kjs/ustring.cpp:
(KJS::UString::UString): Don't call memcpy when malloc failed
2007-01-25 Jan Kraemer <camel@gmx.de>
Reviewed by Maciej
Fix for http://bugs.webkit.org/show_bug.cgi?id=12382
Fix crash on architectures with 32 bit ints and
64 bit longs (For example Linux on AMD64)
* kjs/dtoa.cpp: #define Long int as suggested in comment
2007-01-24 Geoffrey Garen <ggaren@apple.com>
Fixed up #include order for style. No review necessary.
* API/JSStringRef.cpp:
2007-01-24 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Copy JSStringRefCF, in case anybody wants to use it. (I just added
it recently.)
2007-01-24 Maciej Stachowiak <mjs@apple.com>
Not reviewed, trivial property change.
* JavaScriptCore.vcproj/JavaScriptCore.sln: remove svn:mime-type
property which made this binary.
2007-01-25 Mark Rowe <mrowe@apple.com>
Reviewed by Darin.
* Info.plist: Update copyright string.
2007-01-24 Darin Adler <darin@apple.com>
Reviewed by Mark Rowe.
* JavaScriptCore.xcodeproj/project.pbxproj: Changed to /usr/sbin/sysctl
so we don't rely on people's paths.
2007-01-23 Alice Liu <alice.liu@apple.com>
release build fix
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Copy APICasts.h
2007-01-23 Geoffrey Garen <ggaren@apple.com>
build fix
* API/JSStringRef.h:
* JavaScriptCore.xcodeproj/project.pbxproj:
2007-01-24 Mark Rowe <mrowe@apple.com>
Build fix for DumpRenderTree.
* JavaScriptCore.xcodeproj/project.pbxproj: Make JSStringRefCF.h public so it's copied into built framework.
2007-01-23 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Copy APICasts.h
2007-01-23 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed <rdar://problem/4885131> Move CFString function declarations from
JSStringRef.h to JSStringRefCF.h
Also removed remaining API FIXMEs and changed them into Radars.
* API/JSClassRef.cpp:
(OpaqueJSClass::OpaqueJSClass): Added Radar numbers for UTF8 conversion.
* API/JSContextRef.cpp:
(JSGlobalContextCreate): Replaced FIXME for NULL JSContextRef with Radar number.
* API/JSObjectRef.h: Removed FIXME, which is unprofessional in a public header.
* API/JSStringRef.cpp: Moved CF related implementations to JSStringRefCF.cpp.
(JSStringCreateWithUTF8CString): Replaced FIXME with Radar number.
* API/JSStringRef.h: Moved CF related declarations to JSStringRefCF.h. Added
#include of JSStringRefCF.h as a stopgap until clients start #including
it as needed by themselves.
* API/JSStringRefCF.cpp: Added.
(JSStringCreateWithCFString):
(JSStringCopyCFString): Replaced JSChar cast with UniChar cast, which is
more appropriate for a CF call.
* API/JSStringRefCF.h: Added.
* JavaScriptCore.xcodeproj/project.pbxproj:
2007-01-18 Sanjay Madhav <sanjay12@gmail.com>
Reviewed by Darin.
Add JavaScriptCore define to help with tracing of when objects are marked.
* kjs/object.cpp:
(KJS::JSObject::mark):
2007-01-18 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
* JavaScriptCore.pro: Remove generated files on make clean.
* pcre/pcre.pri:
2007-01-16 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Maciej.
http://bugs.webkit.org/show_bug.cgi?id=12268
Give object prototypes their own names
* kjs/lookup.h: Append "Prototype" to ClassName in KJS_IMPLEMENT_PROTOTYPE.
2007-01-16 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin Adler.
Added re-entrency checking to GC allocation and collection. It is an error
to allocate or collect from within a collection. We've had at least one
case of each bug in the past.
Added a comment to the API header, explaining that API clients must not
make this mistake, either.
Layout tests and JS tests pass.
* API/JSObjectRef.h:
* kjs/collector.cpp:
(KJS::GCLock::GCLock):
(KJS::GCLock::~GCLock):
(KJS::Collector::allocate):
(KJS::Collector::collect):
2007-01-14 Mark Rowe <mrowe@apple.com>
Reviewed by Mitz.
Minor fixes to JavaScript pretty-printing.
* JavaScriptCore.exp:
* kjs/Parser.cpp:
(KJS::Parser::prettyPrint): Return line number and error message if parsing fails.
* kjs/Parser.h:
* kjs/nodes2string.cpp:
(ElementNode::streamTo): Include comma delimiters in array literals.
(PropertyNameNode::streamTo): Quote property names in object literals to handle the case when the property name is not a valid identifier.
* kjs/testkjs.cpp:
(doIt): Print any errors encountered while pretty-printing.
2007-01-12 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
* wtf/HashTraits.h:
Add hash traits for unsigned long and unsigned long long.
2007-01-12 Geoffrey Garen <ggaren@apple.com>
RS by Brady Eidson.
Rolling back in r18786 with leaks fixed, and these renames slightly reworked:
Because they can return 0:
rootObjectForImp => findRootObject (overloaded for JSObject* and Interpreter*)
rootObjectForInterpreter => findRootObject (ditto)
findReferenceSet => findProtectCountSet
2007-01-11 Geoffrey Garen <ggaren@apple.com>
RS by Brady Eidson.
Rolling out r18786 because it caused leaks.
2007-01-11 Geoffrey Garen <ggaren@apple.com>
Reviewed by Anders Carlsson.
Even more cleanup in preparation for fixing <rdar://problem/4608404>
WebScriptObject's _executionContext lack of ownership policy causes
crashes (e.g., in Dashcode)
Layout tests pass.
Renames:
ReferencesSet | ProtectCounts => ProtectCountSet (because it's a typename for a set of GC protect counts)
ReferencesByRootMap => RootObjectMap (because RootObjectToProtectCountSetMap would have been confusing)
pv => protectedValues
rootObjectForImp => getRootObject (overloaded for JSObject* and Interpreter*)
rootObjectForInterpreter => getRootObject (ditto)
findReferenceSet => getProtectCountSet
imp => jsObject
(KJS::Bindings::getRootObjectMap): Changed to take advantage of built-in
facility for initializing static variables.
(KJS::Bindings::getProtectCountSet):
(KJS::Bindings::destroyProtectCountSet): Added. Helps encapsulate the fact
that getting a ProtectCountSet entails adding a RootObject to a hash table,
and destroying one entails the reverse.
(KJS::Bindings::getRootObject): Removed spurious NULL check.
(KJS::Bindings::findReferenceSet): Renamed. Changed to use getRootObject()
instead of iterating on its own.
(KJS::Bindings::addNativeReference): Changed to use an early return instead
of indenting the whole function.
(KJS::Bindings::removeNativeReference): Ditto.
2007-01-11 Geoffrey Garen <ggaren@apple.com>
Reviewed by Anders Carlsson.
Even more cleanup in preparation for fixing <rdar://problem/4608404>
WebScriptObject's _executionContext lack of ownership policy causes
crashes (e.g., in Dashcode)
Layout tests pass.
Renames:
findRootObjectForNativeHandleFunction => createRootObject
FindRootObjectForNativeHandleFunctionPtr => CreateRootObjectFunction
Also removed unnecessary use of "Bindings::" prefix.
* JavaScriptCore.exp:
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::createNative):
(JavaJSObject::convertValueToJObject):
(JavaJSObject::convertJObjectToValue):
* bindings/runtime_root.cpp:
(KJS::Bindings::RootObject::setCreateRootObject):
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::createRootObject):
2007-01-11 George Staikos <staikos@kde.org>
Reviewed by Maciej
Appears to be Mac specific right now.
* kjs/config.h:
2007-01-10 Lars Knoll <lars@trolltech.com>
Reviewed by Zack
Use the new functionality in Qt 4.3, to make
the methods closer compliant with the Unicode
spec.
Keep the old code so that it still compiles against
Qt 4.2.
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
(WTF::Unicode::toTitleCase):
(WTF::Unicode::foldCase):
(WTF::Unicode::isFormatChar):
(WTF::Unicode::isPrintableChar):
(WTF::Unicode::isSeparatorSpace):
(WTF::Unicode::isPunct):
(WTF::Unicode::isDigit):
(WTF::Unicode::isLower):
(WTF::Unicode::isUpper):
(WTF::Unicode::digitValue):
(WTF::Unicode::mirroredChar):
(WTF::Unicode::combiningClass):
(WTF::Unicode::decompositionType):
(WTF::Unicode::umemcasecmp):
(WTF::Unicode::direction):
(WTF::Unicode::category):
2007-01-09 Darin Adler <darin@apple.com>
- update 2007 Apple copyright for the new company name
* kjs/DateMath.cpp:
2007-01-09 Darin Adler <darin@apple.com>
- fix build
* kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction):
Actually compile it this time.
2007-01-09 Darin Adler <darin@apple.com>
- fix build
* kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction):
Change types.
2007-01-09 Darin Adler <darin@apple.com>
- fix build on platforms where Unicode::UChar is != uint16_t
* kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction):
Change types.
2007-01-09 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin.
- changes for http://bugs.webkit.org/show_bug.cgi?id=11078
Forms Don't Submit (ASP Pages)
* JavaScriptCore.exp:
* kjs/value.cpp:
(KJS::JSValue::toInt32): Folded toInt32Inline into this method, which was its
only caller.
(KJS::JSValue::toUInt32): Added a variant that reports if the conversion has
succeeded.
* kjs/value.h:
2007-01-09 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=12174
improve Unicode use (less WTF::Unicode:: prefix, centralized character names)
* wtf/unicode/icu/UnicodeIcu.h: Change parameter and return types
to UChar32 and UChar. Removed unneeded type casts and added some
const to functions that lacked it. Removed WTF::Unicode::memcmp.
(WTF::Unicode::umemcasecmp): Renamed from strcasecmp since this
doesn't work on 0-terminated strings as the str functions do.
* wtf/unicode/qt4/UnicodeQt4.h: Ditto.
- got rid of namespace prefixes from most uses of WTF::Unicode
* kjs/function.cpp:
(KJS::isStrWhiteSpace):
(KJS::escapeStringForPrettyPrinting):
* kjs/lexer.cpp:
(KJS::Lexer::isWhiteSpace):
(KJS::Lexer::isIdentStart):
(KJS::Lexer::isIdentPart):
* kjs/string_object.cpp:
(KJS::StringProtoFunc::callAsFunction):
2007-01-07 David Kilzer <ddkilzer@webkit.org>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=11917
setlocale() can return null
* kjs/date_object.cpp:
(KJS::DateProtoFunc::callAsFunction): Removed dead code.
2007-01-07 David Carson <dacarson@gmail.com>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=12100
JNI bindings should be available to non-Mac platforms that have JNI
Change JNI so that it is not wrapped in the PLATFORM(MAC) ifdef, enabling
other platforms who have JNI to use it.
* bindings/jni/jni_instance.h:
Removed unnecessary include of <CoreFoundation/CoreFoundation.h>
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::setJavaVM):
* bindings/jni/jni_utility.h:
Added new method for clients to set the JavaVM
* bindings/runtime.cpp:
(KJS::Bindings::Instance::createBindingForLanguageInstance):
Changed code to utilize new #if HAVE(JNI)
* kjs/config.h:
Added new #define for JNI, ie HAVE_JNI
2007-01-07 David Carson <dacarson@gmail.com>
Reviewed by Darin.
Fix http://bugs.webkit.org/show_bug.cgi?id=11431
ARM platform has some byte alignment issues
Fix for NaN being 4 bytes and it must start on a byte boundary
for ARM architectures.
* kjs/fpconst.cpp:
(KJS::):
2007-01-04 David Kilzer <ddkilzer@webkit.org>
Reviewed by Kevin McCullough.
- fix http://bugs.webkit.org/show_bug.cgi?id=12070
REGRESSION: KJS::getUTCOffset() caches UTC offset but ignores time zone changes
* kjs/DateMath.cpp:
(KJS::getUTCOffset): Don't cache UTC offset.
2007-01-02 Darin Adler <darin@apple.com>
- minor tweak (hope this doesn't re-break Windows)
* pcre/pcre_compile.c: Removed use of const pcre_uchar const * -- Mitz probably
meant const pcre_uchar *const, but I think we can do without the explicit const here.
* pcre/pcre_internal.h: Re-enabled warning C4114.
2007-01-02 David Kilzer <ddkilzer@webkit.org>
Reviewed by NOBODY (Windows build fix).
The MSVC compiler requires variables to be declared at the top of the enclosing block in C source.
Disable this warning to prevent MSVC from complaining about the 'const pcre_uchar const *' type:
warning C4114: same type qualifier used more than once
* pcre/pcre_compile.c:
(pcre_compile2): Moved variable declarations to top of their respective enclosing blocks.
* pcre/pcre_internal.h: Added pragma to disable compiler warning.
2007-01-01 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=11849
REGRESSION (r18182): Google Calendar is broken (a regular expression containing a null character is not parsed correctly)
Modified pcre_compile() (and the functions that it calls) to work with patterns
containing null characters.
Covered by JavaScriptCore tests ecma_3/RegExp/octal-002.js and ecma_3/RegExp/regress-85721.js
* kjs/regexp.cpp:
(KJS::RegExp::RegExp): Changed to not null-terminate the pattern string and instead
pass its length to pcre_compile.
* pcre/pcre.h:
* pcre/pcre_compile.c:
(check_escape):
(get_ucp):
(is_counted_repeat):
(check_posix_syntax):
(compile_branch):
(compile_regex):
(pcre_compile): Added a parameter specifying the length of the pattern, which
is no longer required to be null-terminated and may contain null characters.
(pcre_compile2):
* pcre/pcre_internal.h:
* tests/mozilla/expected.html: Updated for the two tests that this patch
fixes. Also updated failing results for ecma_3/RegExp/regress-100199.js
which were not updated after bug 6257 was fixed.
2007-01-01 David Kilzer <ddkilzer@webkit.org>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=12057
REGRESSION: JavaScript Date Is One Day In The Future in GMT time zone
Because Mac OS X returns geographically and historically accurate time zone information,
converting Jan 02, 1970 12:00:00 AM to local time then subtracting 24 hours did not work
in GMT (London - England) since it was in BST (+0100) all year in 1970[1]. Instead, the
UTC offset is calculated by converting Jan 01, 2000 12:00:00 AM to local time then
subtracting that from the same date in UTC.
[1] http://en.wikipedia.org/wiki/British_Summer_Time
* kjs/DateMath.cpp:
(KJS::getUTCOffset): Updated UTC offset calculation.
(KJS::getDSTOffset): Improved comment.
2006-12-31 David Kilzer <ddkilzer@webkit.org>
Reviewed by Geoff.
Update embedded pcre library from version 6.2 to 6.4. Changes from pcre 6.2 to 6.3
did not include any files in JavaScriptCore/pcre.
All changes include renaming EXPORT to PCRE_EXPORT, renaming of ucp_findchar() to
_pcre_ucp_findchar(), or comment changes. Additional changes noted below.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Updated source file list.
* JavaScriptCore.xcodeproj/project.pbxproj: Renamed pcre_printint.c to pcre_printint.src
and changed it from a source file to a header file.
* JavaScriptCoreSources.bkl: Updated source file list.
* pcre/CMakeLists.txt: Updated source file list.
* pcre/pcre-config.h:
* pcre/pcre.h: Updated version.
* pcre/pcre.pri: Updated source file list.
* pcre/pcre_compile.c: Include pcre_printint.src #if DEBUG.
(pcre_compile2):
* pcre/pcre_config.c:
* pcre/pcre_exec.c:
(match):
* pcre/pcre_fullinfo.c:
* pcre/pcre_info.c:
* pcre/pcre_internal.h: Added header guard. Removed export of _pcre_printint().
* pcre/pcre_ord2utf8.c:
* pcre/pcre_printint.c: Renamed to pcre_printint.src.
* pcre/pcre_printint.src: Added. Renamed _pcre_printint() to pcre_printint().
* pcre/pcre_refcount.c:
* pcre/pcre_study.c:
* pcre/pcre_tables.c:
* pcre/pcre_try_flipped.c:
* pcre/pcre_ucp_findchar.c: Added contents of ucp_findchar.c.
* pcre/pcre_version.c:
* pcre/pcre_xclass.c:
(_pcre_xclass):
* pcre/ucp.h: Removed export of ucp_findchar().
* pcre/ucp_findchar.c: Removed. Contents moved to pcre_ucp_findchar.c.
2006-12-29 David Kilzer <ddkilzer@webkit.org>
Reviewed by Geoff.
Update embedded pcre library from version 6.1 to 6.2. From the pcre ChangeLog:
3. Added "b" to the 2nd argument of fopen() in dftables.c, for non-Unix-like
operating environments where this matters.
5. Named capturing subpatterns were not being correctly counted when a pattern
was compiled. This caused two problems: (a) If there were more than 100
such subpatterns, the calculation of the memory needed for the whole
compiled pattern went wrong, leading to an overflow error. (b) Numerical
back references of the form \12, where the number was greater than 9, were
not recognized as back references, even though there were sufficient
previous subpatterns.
* pcre/dftables.c: Item 3.
(main):
* pcre/pcre.h: Updated version.
* pcre/pcre_compile.c: Item 5.
(read_repeat_counts):
(pcre_compile2):
2006-12-29 Geoffrey Garen <ggaren@apple.com>
Reviewed by Brian Dash... err... Mark Rowe.
More cleanup in preparation for fixing <rdar://problem/4608404>
WebScriptObject's _executionContext lack of ownership policy causes
crashes (e.g., in Dashcode)
The key change here is to RootObject::RootObject().
* JavaScriptCore.exp:
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertValueToNPVariant): Changed to use new constructor.
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::createNative): Changed to use new constructor. Replaced
large 'if' followed by default condition with "if !" and explicit default
condition.
* bindings/objc/objc_runtime.mm:
(convertValueToObjcObject): Changed to use new constructor.
* bindings/runtime_root.cpp:
(KJS::Bindings::RootObject::destroy): "removeAllNativeReferences" => "destroy"
because this function actually destroys the RootObject.
* bindings/runtime_root.h: Changed Interpreter* to RefPtr<Interpreter>
to prevent a RootObject from holding a stale Interperter*.
(KJS::Bindings::RootObject::RootObject): Changed constructor to take an
Interpreter*, since it's pointless to create a RootObject without one.
Removed setRootObjectImp() and rootObjectImp() because they were just
a confusing way of setting and getting the Interpreter's global object.
(KJS::Bindings::RootObject::nativeHandle): "_nativeHandle" => "m_nativeHandle"
(KJS::Bindings::RootObject::interpreter): "_interpreter" => "m_interpreter"
2006-12-28 George Staikos <staikos@kde.org>
Reviewed by Olliej.
* bindings/qt/qt_instance.cpp: build
(KJS::Bindings::QtInstance::QtInstance):
2006-12-28 Geoffrey Garen <ggaren@apple.com>
Reviewed by Oliver Hunt.
More cleanup. Layout tests pass.
Use a helper function to initialize and access WebUndefined and WebScriptObject.
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(KJS::Bindings::webScriptObjectClass):
(KJS::Bindings::webUndefinedClass):
(convertValueToObjcObject):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
2006-12-28 Geoffrey Garen <ggaren@apple.com>
Reviewed by Brady Eidson.
Some cleanup in preparation for fixing <rdar://problem/4608404>
WebScriptObject's _executionContext lack of ownership policy causes
crashes (e.g., in Dashcode)
I'm just trying to make heads or tails of this baffling code.
Renamed "root" | "execContext" | "executionContext" => "rootObject", because
that's the object's (admittedly vague) type name.
* bindings/runtime.cpp: Removed createLanguageInstanceForValue
because I'll give you a dollar if you can explain to me what it actually did.
* bindings/runtime_root.cpp: Put everything in the KJS::Bindings namespace,
removing the KJS::Bindings prefix from individual functions and datatypes.
This matches the header and eliminates a lot of syntax cruft.
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertValueToNPVariant): Replaced use of createLanguageInstanceForValue
with call to _NPN_CreateScriptObject because that's what createLanguageInstanceForValue
actually did (but don't ask me for that dollar now; that's cheating.)
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue): Removed. Its only purpose was
to call a single function for WebKit, which WebKit can do on its own.
* kjs/interpreter.h: Removed rtti() because it was unused, and this class
is scheduled for demolition anyway.
* kjs/interpreter.cpp: Removed createLanguageInstanceForValue because it had
nothing to do with the Interpreter, and nothing makes Chuck Norris more mad
than a function whose sole purpose is to call another function of the same
name. (Really, I asked him.)
2006-12-26 Geoffrey Garen <ggaren@apple.com>
Reviewed by Eric Seidel.
Some cleanup in preparation for fixing <rdar://problem/4740328> Safari
crash on quit in _NPN_ReleaseObject from KJS::Bindings::CInstance::~CInstance
* bindings/c/c_instance.cpp:
* bindings/c/c_instance.h: Removed unused copy constructor and assignment
operator. They made tracking data flow more difficult. Unused code is also
dangerous because it can succumb to bit rot with the stealth of a Ninja.
Replaced #include with forward declaration to reduce header dependency.
* bindings/npruntime.cpp: Sorted #includes.
(_NPN_GetStringIdentifier): Replaced assert with ASSERT.
(_NPN_GetStringIdentifiers): ditto
(_NPN_ReleaseVariantValue): ditto
(_NPN_CreateObject): ditto
(_NPN_RetainObject): ditto
(_NPN_ReleaseObject): ditto
(_NPN_DeallocateObject): ditto
2006-12-20 Anders Carlsson <acarlsson@apple.com>
* kjs/string_object.cpp:
(localeCompare):
Another speculative Win32 fix.
2006-12-20 Anders Carlsson <acarlsson@apple.com>
* kjs/string_object.cpp:
(localeCompare):
Speculative Win32 fix.
2006-12-20 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
<rdar://problem/4235733>
<http://bugs.webkit.org/?show_bug.cgi?id=10193>
support String.localeCompare.
Implement localeCompare.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/string_object.cpp:
(localeCompare):
(StringProtoFunc::callAsFunction):
* kjs/string_object.h:
(KJS::StringProtoFunc::):
2006-12-20 Timothy Hatcher <timothy@apple.com>
Reviewed by Mark Rowe.
* JavaScriptCore.xcodeproj/project.pbxproj: use GCC 4.0 for all the other test targets
2006-12-20 Timothy Hatcher <timothy@apple.com>
Reviewed by Mark Rowe.
<rdar://problem/4871613> JavaScriptCore-421.31's dftables target needs to override default compiler and use gcc-4.0
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-12-20 Lars Knoll <lars@trolltech.com>
Reviewed by David Hyatt
Added support to bind QObject's to
JavaScript.
* JavaScriptCore.pro:
* bindings/qt/qt_class.cpp: Added.
(KJS::Bindings::QtClass::QtClass):
(KJS::Bindings::QtClass::~QtClass):
(KJS::Bindings::QtClass::classForObject):
(KJS::Bindings::QtClass::name):
(KJS::Bindings::QtClass::methodsNamed):
(KJS::Bindings::QtClass::fieldNamed):
* bindings/qt/qt_class.h: Added.
(KJS::Bindings::QtClass::constructorAt):
(KJS::Bindings::QtClass::numConstructors):
* bindings/qt/qt_instance.cpp: Added.
(KJS::Bindings::QtInstance::QtInstance):
(KJS::Bindings::QtInstance::~QtInstance):
(KJS::Bindings::QtInstance::operator=):
(KJS::Bindings::QtInstance::getClass):
(KJS::Bindings::QtInstance::begin):
(KJS::Bindings::QtInstance::end):
(KJS::Bindings::QtInstance::implementsCall):
(KJS::Bindings::QtInstance::invokeMethod):
(KJS::Bindings::QtInstance::invokeDefaultMethod):
(KJS::Bindings::QtInstance::defaultValue):
(KJS::Bindings::QtInstance::stringValue):
(KJS::Bindings::QtInstance::numberValue):
(KJS::Bindings::QtInstance::booleanValue):
(KJS::Bindings::QtInstance::valueOf):
* bindings/qt/qt_instance.h: Added.
(KJS::Bindings::QtInstance::getObject):
* bindings/qt/qt_runtime.cpp: Added.
(KJS::Bindings::convertValueToQVariant):
(KJS::Bindings::convertQVariantToValue):
(KJS::Bindings::QtField::name):
(KJS::Bindings::QtField::valueFromInstance):
(KJS::Bindings::QtField::setValueToInstance):
* bindings/qt/qt_runtime.h: Added.
(KJS::Bindings::QtField::QtField):
(KJS::Bindings::QtField::type):
(KJS::Bindings::QtMethod::QtMethod):
(KJS::Bindings::QtMethod::name):
(KJS::Bindings::QtMethod::numParameters):
* bindings/runtime.cpp:
(KJS::Bindings::Instance::createBindingForLanguageInstance):
* bindings/runtime.h:
(KJS::Bindings::Instance::):
* bindings/testbindings.pro: Added.
* bindings/testqtbindings.cpp: Added.
(MyObject::MyObject):
(MyObject::setTestString):
(MyObject::setTestInt):
(MyObject::testString):
(MyObject::testInt):
(MyObject::foo):
(Global::className):
(main):
2006-12-19 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
Add -p option to testkjs which pretty prints the files instead of executing them.
* JavaScriptCore.exp:
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/Parser.cpp:
(KJS::Parser::prettyPrint):
* kjs/Parser.h:
* kjs/testkjs.cpp:
(doIt):
2006-12-19 Brady Eidson <beidson@apple.com>
Rubberstamped by Lou
Removed unneccessary "else"
* wtf/Assertions.cpp:
2006-12-19 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
<rdar://problem/4891774> Local WebCore/WebBrowser builds fail in 9A328 due to warning about ObjC-2.0 language features
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-12-17 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
* kjs/testkjs.pro: Oops, make it also build on machines other than
mine :)
2006-12-17 Simon Hausmann <hausmann@kde.org>
Reviewed by Rob Buis.
* kjs/testkjs.pro: Added .pro file to build testkjs.
2006-12-16 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Rob.
A deleted object was accessed to prepare RegExp construction error messages.
* kjs/regexp_object.cpp:
(RegExpObjectImp::construct): Wrap the RegExp into an OwnPtr.
2006-12-16 Mitz Pettel <mitz@webkit.org>
Reviewed by Alexey.
- fix http://bugs.webkit.org/show_bug.cgi?id=11814
REGRESSION(r18098): Find does not work with capital letters
Test: editing/execCommand/findString-3.html
* wtf/unicode/icu/UnicodeIcu.h:
(WTF::Unicode::foldCase): Changed to not return an error if the result fits
in the buffer without a null terminator.
2006-12-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Anders.
- added equality and inequality operations for HashMap and Vector, useful for comparing more complex types
* wtf/HashMap.h:
(WTF::operator==):
(WTF::operator!=):
* wtf/Vector.h:
(WTF::operator==):
(WTF::operator!=):
2006-12-12 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Geoff. Based on a patch by Maks Orlovich.
http://bugs.webkit.org/show_bug.cgi?id=6257
Throw errors on invalid expressions (KJS merge)
* kjs/regexp.cpp:
(KJS::RegExp::RegExp):
(KJS::RegExp::~RegExp):
(KJS::RegExp::match):
* kjs/regexp.h:
(KJS::RegExp::flags):
(KJS::RegExp::isValid):
(KJS::RegExp::errorMessage):
(KJS::RegExp::subPatterns):
Remember and report RegExp construction failures. Renamed data members not to start with underscores.
* kjs/regexp_object.cpp:
(RegExpObjectImp::construct): Raise an exception if RegExp construction fails.
(RegExpObjectImp::callAsFunction): Removed an obsolete comment.
* tests/mozilla/ecma_3/RegExp/regress-119909.js: Reduced the number of nested parentheses to
a value supported by PCRE.
2006-12-11 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=9673
Add support for window.atob() and window.btoa()
* JavaScriptCore.exp: Export UString::is8Bit().
* JavaScriptCore.xcodeproj/project.pbxproj: Added StringExtras.h as
a private header.
2006-12-11 Darin Adler <darin@apple.com>
Reviewed by Brady.
* JavaScriptCore.xcodeproj/project.pbxproj: Let Xcode update this
(I think Hyatt is using an old Xcode).
2006-12-11 David Hyatt <hyatt@apple.com>
Fix the failing layout test. Just remove Unicode::isSpace and
revert StringImpl to do the same thing it was doing before.
Reviewed by darin
* wtf/unicode/icu/UnicodeIcu.h:
* wtf/unicode/qt4/UnicodeQt4.h:
2006-12-09 George Staikos <staikos@kde.org>
Reviewed by Zack.
Fix bison again on qmake build.
* JavaScriptCore.pro:
2006-12-09 Lars Knoll <lars@trolltech.com>
Reviewed by Zack
Make it possible to build WebKit with qmake.
* JavaScriptCore.pro: Added.
* kjs/kjs.pro: Removed.
* pcre/pcre.pri: Added.
2006-12-09 Zack Rusin <zack@kde.org>
Fixing the compilation with platform kde after the icu changes.
* CMakeLists.txt:
2006-12-09 Adam Roben <aroben@apple.com>
Reviewed by Darin.
Some updates in reaction to r18098.
* wtf/unicode/icu/UnicodeIcu.h: Use !! to convert UBool to bool in all
cases.
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
(WTF::Unicode::isDigit):
(WTF::Unicode::isSpace):
(WTF::Unicode::isPunct):
(WTF::Unicode::isLower):
(WTF::Unicode::isUpper):
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/WTF/WTF.vcproj:
2006-12-09 George Staikos <staikos@kde.org>
Patch by Lars Knoll, comment out ICU dependency on Qt platform (unused code).
Reviewed by Darin.
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertUTF8ToUTF16):
2006-12-08 David Hyatt <hyatt@apple.com>
Land the new ICU abstraction layer. Patch by Lars.
Reviewed by me
* JavaScriptCore.xcodeproj/project.pbxproj:
* wtf/Platform.h:
* wtf/unicode/UnicodeCategory.h: Removed.
* wtf/unicode/UnicodeDecomposition.h: Removed.
* wtf/unicode/UnicodeDirection.h: Removed.
* wtf/unicode/icu/UnicodeIcu.h:
(WTF::Unicode::):
(WTF::Unicode::foldCase):
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
(WTF::Unicode::toTitleCase):
(WTF::Unicode::isDigit):
(WTF::Unicode::isSpace):
(WTF::Unicode::isPunct):
(WTF::Unicode::mirroredChar):
(WTF::Unicode::category):
(WTF::Unicode::direction):
(WTF::Unicode::isLower):
(WTF::Unicode::isUpper):
(WTF::Unicode::digitValue):
(WTF::Unicode::combiningClass):
(WTF::Unicode::decompositionType):
(WTF::Unicode::strcasecmp):
(WTF::Unicode::memset):
* wtf/unicode/qt4/UnicodeQt4.cpp: Removed.
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::):
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
(WTF::Unicode::toTitleCase):
(WTF::Unicode::foldCase):
(WTF::Unicode::isPrintableChar):
(WTF::Unicode::isLower):
(WTF::Unicode::isUpper):
(WTF::Unicode::digitValue):
(WTF::Unicode::combiningClass):
(WTF::Unicode::decompositionType):
(WTF::Unicode::strcasecmp):
(WTF::Unicode::memset):
(WTF::Unicode::direction):
(WTF::Unicode::category):
=== Safari-521.32 ===
2006-12-08 Adam Roben <aroben@apple.com>
Reviewed by Anders.
This is a mo' better fix for ensuring we don't use macro definitions
of min/max.
* kjs/config.h:
* wtf/Vector.h:
2006-12-07 Kevin Fyure <digdog@macports.org>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=11545
Disable the testcases do not follow the ECMA-262v3 specification.
* tests/mozilla/expected.html: Update Results.
* tests/mozilla/js1_2/String/concat.js:
4 tests disabled. The result of concat Array object is not followinig
ECMA 15.5.4.6
* tests/mozilla/js1_2/function/Number.js:
1 test disabled. The result of Array object to Number object conversion
is not following ECMA 9.3. And the test was duplicated in
ecma/TypeConversion/9.3-1.js
* tests/mozilla/js1_2/function/String.js:
2 tests disabled. The result of Object/Array object to String object
conversion is not following ECMA 15.5.1.1 and ECMA 9.8
2006-11-30 Steve Falkenburg <sfalken@apple.com>
Reviewed by Oliver.
Move WTF from JavaScriptCore project into a new WTF project.
* JavaScriptCore.vcproj/JavaScriptCore.sln: Add WTF.vcproj to sln
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Remove WTF source files
* JavaScriptCore.vcproj/WTF/WTF.vcproj: Added.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Add dependency on WTF.lib
2006-11-30 Geoffrey Garen <ggaren@apple.com>
Reviewed by Beth Dakin.
Fixed up garbage collection at window close time.
* kjs/interpreter.cpp:
(KJS::Interpreter::~Interpreter): Garbage collect here, since
destroying the interpreter frees the global object and
therefore creates a lot of garbage.
2006-11-20 W. Andy Carrel <wac@google.com>
Reviewed by Maciej.
http://bugs.webkit.org/show_bug.cgi?id=11501
REGRESSION: \u no longer escapes metacharacters in RegExps
http://bugs.webkit.org/show_bug.cgi?id=11502
Serializing RegExps doesn't preserve Unicode escapes
* kjs/lexer.cpp:
(Lexer::Lexer):
(Lexer::setCode):
(Lexer::shift):
(Lexer::scanRegExp):
Push \u parsing back down into the RegExp object rather than in the
parser. This backs out r17354 in favor of a new fix that better
matches the behavior of other browsers.
* kjs/lexer.h:
* kjs/regexp.cpp:
(KJS::RegExp::RegExp):
(KJS::sanitizePattern):
(KJS::isHexDigit):
(KJS::convertHex):
(KJS::convertUnicode):
* kjs/regexp.h:
Translate \u escaped unicode characters for the benefit of pcre.
* kjs/ustring.cpp:
(KJS::UString::append):
Fix failure to increment length on the first UChar appended to a
UString that was copy-on-write.
* tests/mozilla/ecma_2/RegExp/properties-001.js:
Adjust tests back to the uniform standards.
2006-11-20 Samuel Weinig <sam@webkit.org>
Reviewed by Maciej.
Fix for http://bugs.webkit.org/show_bug.cgi?id=11647
Fix Win32 build
* kjs/config.h: define NOMINMAX instead of min/max
as themselves.
* wtf/Vector.h: put back hack to ensure that min/max
are not defined as macros.
2006-11-19 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
http://bugs.webkit.org/show_bug.cgi?id=11649
Fix CMake Qt-only build without KDE CMake files
* CMakeLists.txt:
* pcre/CMakeLists.txt:
2006-11-17 Anders Carlsson <acarlsson@apple.com>
Reviewed by Adam.
Make sure that we always use std::min and std::max instead of macros.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* kjs/config.h:
* wtf/Vector.h:
=== Safari-521.31 ===
2006-11-12 Geoffrey Garen <ggaren@apple.com>
Reviewed by Beth Dakin.
Added project-wide setting to disable Microsoft's made-up deprecation
warnings related to std:: functions. (Doesn't have any affect yet,
since we currently disable all deprecation warnings.)
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2006-11-12 Mark Rowe <bdash@webkit.org>
Reviewed by Mitz.
Clean up of JavaScriptCore bakefiles.
* JavaScriptCoreSources.bkl:
* jscore.bkl:
2006-11-11 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Maciej.
http://bugs.webkit.org/show_bug.cgi?id=11508
Undisable some warnings for JSImmediate.h
Fix suggested by Don Gibson.
* kjs/JSImmediate.h:
Re-enable all MSVC warnings, move the remaining runtime checks
to compile-time.
2006-11-10 Zalan Bujtas <zalan.bujtas@nokia.com>
Reviewed by Maciej.
Added s60/symbian platform defines.
http://bugs.webkit.org/show_bug.cgi?id=11540
* wtf/Platform.h:
=== Safari-521.30 ===
2006-11-08 Ada Chan <adachan@apple.com>
Reviewed by darin.
Added a method to delete all the keys in a HashMap.
* wtf/HashMap.h:
(WTF::deleteAllPairFirsts):
(WTF::deleteAllKeys):
2006-11-07 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
* API/JSClassRef.cpp:
(OpaqueJSClass::OpaqueJSClass):
Initialize cachedPrototype to 0.
2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Maciej.
Remove warning about garbage after #else. #else clause applies for all
non-mac platforms, not only win.
* kjs/date_object.cpp:
2006-11-06 Mark Rowe <bdash@webkit.org>
Reviewed by the wonderful Mitz Pettel.
http://bugs.webkit.org/show_bug.cgi?id=11524
Bug 11524: REGRESSION(r9842): Array.prototype.join should use ToString operator rather than calling toString on each element
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): Use ToString operator on each element rather than calling their toString method.
2006-11-03 Steve Falkenburg <sfalken@apple.com>
Fix build
* kjs/JSImmediate.h:
2006-11-03 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=11504
Fix warnings on non 32 bit platforms
* kjs/JSImmediate.h:
(KJS::JSImmediate::NanAsBits):
(KJS::JSImmediate::oneAsBits):
Rewrite in a way that moves runtime checks to compile-time.
(KJS::):
(KJS::JSImmediate::fromDouble):
(KJS::JSImmediate::toDouble):
2006-11-02 George Staikos <staikos@kde.org>
Reviewed by Maciej.
* collector.cpp:
Remove a deprecated pthreads call.
2006-11-02 Anders Carlsson <acarlsson@apple.com>
Reviewed by Maciej, landed by Anders.
* CMakeLists.txt:
Make KDE support optional.
2006-11-01 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Brady.
- Fixes many JavaScriptCore tests in other timezones. The root problem is that on mac localtime() returns historically accurate information for DST, but the JavaScript spec explicitly states to not take into account historical information but rather to interpolate from valid years.
* kjs/DateMath.cpp:
(KJS::equivalentYearForDST):
(KJS::getDSTOffsetSimple):
(KJS::getDSTOffset):
2006-10-31 Geoffrey Garen <ggaren@apple.com>
Reviewed by Beth.
Fixed http://bugs.webkit.org/show_bug.cgi?id=11477
REGRESSION: GMail crashes in KJS::FunctionImp::callerGetter
* kjs/function.cpp:
(KJS::FunctionImp::argumentsGetter): Removed unnecessary braces.
(KJS::FunctionImp::callerGetter): More logical NULL checking.
2006-10-31 Oliver Hunt <oliver@apple.com>
Reviewed by Geoff.
Adding definition for PLATFORM(CI)
* wtf/Platform.h:
2006-10-31 Vladimir Olexa <vladimir.olexa@gmail.com>
Reviewed by Geoff.
http://bugs.webkit.org/show_bug.cgi?id=4166
Function object does not support caller property
Test: fast/js/caller-property.html
* kjs/function.cpp:
(KJS::FunctionImp::callerGetter): added
(KJS::FunctionImp::getOwnPropertySlot): added if statement to handle callerGetter()
* kjs/function.h: added callerGetter() declaration
* kjs/identifier.h: added caller property macro
* tests/mozilla/expected.html:
2006-10-30 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Adam.
- Fix some timezone issues and JavaScriptCore date tests. Addresses bugzilla 4930.
* kjs/DateMath.h:
(KJS::GregorianDateTime::GregorianDateTime): Here's the fix, to add parenthesis for order of precedence.
* kjs/date_object.cpp:
(KJS::DateProtoFunc::callAsFunction):
(KJS::DateObjectImp::construct): memset not needed as GregorianDateTime initializes itself.
2006-10-30 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
* kjs/SavedBuiltins.h: Added needed include.
* wtf/OwnPtr.h: (WTF::OwnPtr::set): Fixed mistake in assertion.
2006-10-28 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- renamed PassRefPtr::release to releaseRef to make it clearer that
it's the counterpart of adoptRef, and to make it harder to confuse
it with the safer-to-use RefPtr::release
* kjs/identifier.cpp:
(KJS::CStringTranslator::translate):
(KJS::UCharBufferTranslator::translate):
* kjs/ustring.cpp:
(KJS::UString::Rep::create):
* wtf/PassRefPtr.h:
(WTF::PassRefPtr::PassRefPtr):
(WTF::PassRefPtr::~PassRefPtr):
(WTF::PassRefPtr::get):
(WTF::PassRefPtr::releaseRef):
(WTF::PassRefPtr::operator->):
(WTF::PassRefPtr::operator=):
(WTF::adoptRef):
(WTF::static_pointer_cast):
(WTF::const_pointer_cast):
* wtf/RefPtr.h:
(WTF::RefPtr::RefPtr):
(WTF::RefPtr::operator=):
2006-10-28 Darin Adler <darin@apple.com>
Reviewed by Steve.
* kjs/grammar.y: Add definitions of YYMALLOC and YYFREE to fix
a warning some people see (not sure why others don't see it).
* JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp: Touch
this file to force it to re-build grammar.cpp.
2006-10-28 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- made changes so the code compiles with the highest warning level
under MSVC (disabling some warnings, making some code fixes)
* API/JSCallbackConstructor.cpp:
(KJS::JSCallbackConstructor::construct):
* API/JSCallbackFunction.cpp:
(KJS::JSCallbackFunction::callAsFunction):
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::init):
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::callAsFunction):
* API/JSObjectRef.cpp:
(JSPropertyNameArrayGetNameAtIndex):
* API/JSStringRef.cpp:
(JSStringCreateWithCharacters):
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertUTF8ToUTF16):
(KJS::Bindings::coerceValueToNPVariantStringType):
(KJS::Bindings::convertValueToNPVariant):
* kjs/DateMath.h:
(KJS::GregorianDateTime::GregorianDateTime):
* kjs/ExecState.h:
(KJS::ExecState::hadException):
* kjs/JSImmediate.h:
(KJS::JSImmediate::fromDouble):
(KJS::JSImmediate::toDouble):
(KJS::JSImmediate::NanAsBits):
(KJS::JSImmediate::oneAsBits):
* kjs/Parser.h:
* kjs/PropertyNameArray.h:
(KJS::PropertyNameArray::size):
* kjs/array_object.cpp:
(ArrayObjectImp::callAsFunction):
* kjs/bool_object.cpp:
(BooleanObjectImp::callAsFunction):
* kjs/collector.cpp:
(KJS::Collector::allocate):
(KJS::Collector::markCurrentThreadConservatively):
(KJS::Collector::collect):
* kjs/completion.h:
(KJS::Completion::isValueCompletion):
* kjs/date_object.cpp:
(KJS::findMonth):
* kjs/debugger.cpp:
(Debugger::sourceParsed):
(Debugger::sourceUnused):
(Debugger::exception):
(Debugger::atStatement):
(Debugger::callEvent):
(Debugger::returnEvent):
* kjs/dtoa.cpp:
* kjs/error_object.cpp:
(ErrorObjectImp::callAsFunction):
(NativeErrorImp::callAsFunction):
* kjs/function.cpp:
(KJS::FunctionImp::processVarDecls):
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function_object.cpp:
(FunctionPrototype::callAsFunction):
* kjs/grammar.y:
* kjs/identifier.cpp:
(KJS::CStringTranslator::translate):
(KJS::Identifier::add):
* kjs/internal.h:
* kjs/lexer.cpp:
(Lexer::lex):
(Lexer::isIdentStart):
(Lexer::isIdentPart):
(isDecimalDigit):
(Lexer::isHexDigit):
(Lexer::isOctalDigit):
(Lexer::matchPunctuator):
(Lexer::singleEscape):
(Lexer::convertOctal):
(Lexer::convertHex):
(Lexer::convertUnicode):
(Lexer::record8):
* kjs/lexer.h:
* kjs/math_object.cpp:
(MathFuncImp::callAsFunction):
* kjs/number_object.cpp:
(integer_part_noexp):
(intPow10):
(NumberProtoFunc::callAsFunction):
(NumberObjectImp::callAsFunction):
* kjs/object.cpp:
(KJS::JSObject::deleteProperty):
(KJS::JSObject::callAsFunction):
(KJS::JSObject::toBoolean):
(KJS::JSObject::toObject):
* kjs/object.h:
(KJS::JSObject::getPropertySlot):
* kjs/property_map.cpp:
(KJS::isValid):
(KJS::PropertyMap::put):
(KJS::PropertyMap::insert):
(KJS::PropertyMap::containsGettersOrSetters):
* kjs/property_map.h:
(KJS::PropertyMap::hasGetterSetterProperties):
* kjs/property_slot.h:
* kjs/string_object.cpp:
(StringInstance::getPropertyNames):
(StringObjectImp::callAsFunction):
(StringObjectFuncImp::callAsFunction):
* kjs/ustring.cpp:
(KJS::UString::Rep::computeHash):
(KJS::UString::UString):
(KJS::UString::from):
(KJS::UString::append):
(KJS::UString::ascii):
(KJS::UString::operator=):
(KJS::UString::find):
(KJS::UString::rfind):
* kjs/ustring.h:
(KJS::UChar::high):
(KJS::UChar::low):
(KJS::UCharReference::low):
(KJS::UCharReference::high):
* kjs/value.cpp:
(KJS::JSValue::toUInt16):
* kjs/value.h:
* pcre/pcre_compile.c:
(get_othercase_range):
* pcre/pcre_exec.c:
(match):
* pcre/pcre_internal.h:
* wtf/HashFunctions.h:
(WTF::intHash):
(WTF::PtrHash::hash):
* wtf/MathExtras.h:
(isnan):
(lround):
(lroundf):
* wtf/StringExtras.h:
(strncasecmp):
* wtf/unicode/icu/UnicodeIcu.h:
(WTF::Unicode::isPrintableChar):
2006-10-26 W. Andy Carrel <wac@google.com>
Reviewed by Maciej.
- Fix http://bugs.webkit.org/show_bug.cgi?id=7445 /
<rdar://problem/4614195> (and 7253 / <rdar://4694011>) by changing
inline regexps so that they can have \u escaped Unicode sequences and
still work properly.
* kjs/lexer.cpp:
(Lexer::Lexer):
(Lexer::setCode):
(Lexer::shift): Looking ahead one additional character for the benefit
of scanRegExp
(Lexer::scanRegExp): Change code to support unicode escapes in inline
regexps.
* kjs/lexer.h: Extra lookahead added.
=== Safari-521.29 ===
2006-10-26 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Darin.
Fix build with older gcc 3.3.4.
* kjs/DateMath.cpp: Remove inline prefix.
(KJS::equivalentYearForDST):
2006-10-26 Darin Adler <darin@apple.com>
Reviewed by John.
- fix iteration of properties of string objects (found because of a warning
emitted by the MSVC compiler)
* kjs/string_object.cpp: (StringInstance::getPropertyNames): Change code that
wants to format a number as a string to use UString::from. Before it was using
the UString constructor that makes a string from a character!
* kjs/ustring.h:
* kjs/ustring.cpp: Remove the dangerous and not all that helpful UString(char)
constructor.
* kjs/grammar.y: Change code to not depend on the UString(char) constructor.
This is potentially more efficient anyway because we could overload the + operator
some day to handle char* directly instead of creating a UString.
* kjs/nodes2string.cpp: (SourceStream::operator<<): Change code to not depend on
the UString(char) constructor.
2006-10-25 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Steve (rubber stamp).
- Link against your local build of JavaScriptCore.lib first, this fixes some errors on release builds of testkjs.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2006-10-25 Geoffrey Garen <ggaren@apple.com>
Reviewed by Lou.
Removed duplicate symbol declaration.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/grammar.y:
2006-10-24 Steve Falkenburg <sfalken@apple.com>
Build config change
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2006-10-24 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Brady.
- Fixes a date formatting issue on win. Specifically strftime cannot handle some ranges of time so we shift time call strftime and then manipulate the returned string, if needed.
* kjs/date_object.cpp:
(KJS::):
(KJS::formatLocaleDate):
(KJS::DateProtoFunc::callAsFunction):
2006-10-23 Kevin McCullough <KMcCullough@apple.com>
Reviewed by
- Build fix
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/grammar.y:
2006-10-23 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Maciej.
- Makes the toTM function an operator. Was going to piggy back on a patch but the patch needs more work.
* kjs/DateMath.cpp:
(KJS::equivalentYearForDST):
* kjs/DateMath.h:
(KJS::GregorianDateTime::operator tm):
* kjs/date_object.cpp:
(KJS::formatTime):
(KJS::DateProtoFunc::callAsFunction):
2006-10-23 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Maciej.
- Fixes two regressions on win. Both are stack overflows. For one the number of recursions is capped at 100, and for the other, nested parenthesis pairs are not evaluated (since they would evaluate to whatever is in them anyway).
* kjs/grammar.y:
* kjs/object.cpp:
2006-10-21 Steve Falkenburg <sfalken@apple.com>
Reviewed by Adam.
Add minimal compatibility with MSVCRT leak checker
* wtf/FastMalloc.h:
2006-10-23 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Geof.
- Sets the lowercase range correctly in the test and consolidates a variable to make the test more readable.
* tests/mozilla/ecma/String/15.5.4.11-2.js:
2006-10-21 Darin Adler <darin@apple.com>
Reviewed by Anders.
- http://bugs.webkit.org/show_bug.cgi?id=11377
swap(Vector, Vector) should be O(1) instead of O(n)
* wtf/Vector.h:
(WTF::VectorBuffer::swap): Added.
(WTF::Vector::swap): Added.
(WTF::swap): Added overload that takes two Vector objects.
2006-10-21 Darin Adler <darin@apple.com>
Reviewed by Adam.
- http://bugs.webkit.org/show_bug.cgi?id=11376
build scripts should invoke make with "-j" option for multiple processors
* JavaScriptCore.xcodeproj/project.pbxproj: Pass -j `sysctl -n hw.ncpu` to make.
2006-10-19 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Geof.
Changed test to make us pass Georgian case changing for Unicode 4.0 and 5.0. This incorporates changes from the 1.4 revision of the same mozilla test.
On Tiger we are still using Unicode 4.0 but on win and Leopard we are using Unicode 5.0, so this test currently allows for either answer.
* tests/mozilla/ecma/String/15.5.4.11-2.js:
2006-10-18 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- remove vestiges of KXMLCore name (former name of WTF).
* wtf/Assertions.h:
* wtf/FastMalloc.h:
(operator new):
(operator delete):
(operator new[]):
(operator delete[]):
* wtf/FastMallocInternal.h:
* wtf/Forward.h:
* wtf/GetPtr.h:
* wtf/HashCountedSet.h:
* wtf/HashFunctions.h:
* wtf/HashMap.h:
* wtf/HashSet.h:
* wtf/HashTable.h:
* wtf/HashTraits.h:
* wtf/ListRefPtr.h:
* wtf/MathExtras.h:
* wtf/Noncopyable.h:
* wtf/OwnArrayPtr.h:
* wtf/OwnPtr.h:
* wtf/PassRefPtr.h:
* wtf/Platform.h:
* wtf/RefPtr.h:
* wtf/StringExtras.h:
(snprintf):
* wtf/UnusedParam.h:
* wtf/Vector.h:
* wtf/VectorTraits.h:
2006-10-17 Steve Falkenburg <sfalken@apple.com>
Reviewed by Maciej.
Adjust include paths
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2006-10-17 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Darin.
Fixed a date issue where the UTC offset was not set in win.
* kjs/DateMath.cpp:
(KJS::getDSTOffsetSimple):
(KJS::getDSTOffset):
(KJS::msToGregorianDateTime):
* kjs/DateMath.h:
(KJS::):
(KJS::GregorianDateTime::GregorianDateTime):
2006-10-17 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Brady.
Fixes a JavaScriptCore math issue on win.
* kjs/math_object.cpp:
(MathFuncImp::callAsFunction):
* wtf/MathExtras.h:
(wtf_atan2):
2006-10-16 Kevin McCullough <kmccullough@apple.com>
Reviewed by Geof.
Removed unecessary global specifiers.
* kjs/math_object.cpp:
(MathFuncImp::callAsFunction):
2006-10-16 Kevin McCullough <KMcCullough@apple.com>
Reviewed by John.
Fixes a compile order issue for testkjs on win.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2006-10-15 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Anders.
Remove junk (as gcc calls it) after #else clause.
* wtf/FastMalloc.cpp:
(WTF::do_free):
2006-10-14 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Maciej.
Define KXMLCORE_USE_CURL for platforms that wish to use CURL as
networking, and set it for GDK build
* wtf/Platform.h:
2006-10-13 Brett Wilson <brettw@google.com>
Reviewed by Kevin McCullough.
Fixes http://bugs.webkit.org/show_bug.cgi?id=11283
Fixes Qt/Linux and Windows build
* kjs/DateMath.cpp:
* kjs/DateMath.h:
* kjs/date_object.cpp:
(KJS::DateProtoFunc::callAsFunction):
2006-10-13 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Adam, Geoff, Darin.
Fixed displaying the UTC offset and time zone string, as well as renamed the GregorianDateTime structure and clean up.
* ChangeLog:
* kjs/DateMath.cpp:
(KJS::getUTCOffset):
(KJS::getDSTOffsetSimple):
(KJS::gregorianDateTimeToMS):
(KJS::msToGregorianDateTime):
* kjs/DateMath.h:
(KJS::GregorianDateTime::GregorianDateTime):
(KJS::GregorianDateTime::~GregorianDateTime):
(KJS::GregorianDateTime::toTM):
* kjs/date_object.cpp:
(KJS::gmtoffset):
(KJS::formatDate):
(KJS::formatDateUTCVariant):
(KJS::formatTime):
(KJS::fillStructuresUsingTimeArgs):
(KJS::fillStructuresUsingDateArgs):
(KJS::DateInstance::getTime):
(KJS::DateInstance::getUTCTime):
(KJS::DateProtoFunc::callAsFunction):
(KJS::DateObjectImp::construct):
(KJS::DateObjectImp::callAsFunction):
(KJS::DateObjectFuncImp::callAsFunction):
(KJS::parseDate):
* kjs/date_object.h:
2006-10-13 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Adam.
Gets JavaScripCore tests running on windows.
* Scripts/run-javascriptcore-tests:
* Scripts/webkitdirs.pm:
2006-10-12 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
Removed JSObjectMakeWithPrototype, clarified some comments. We really
don't want people to manage their own prototypes, so we don't want an
extra function in the API devoted to just that. People can still manage
their own prototypes if they really want by using JSObjectSetPrototype.
* API/JSClassRef.cpp:
(OpaqueJSClass::createNoAutomaticPrototype):
(OpaqueJSClass::create):
* API/JSClassRef.h:
* API/JSObjectRef.cpp:
(JSClassCreate):
(JSObjectMake):
* API/JSObjectRef.h:
* API/testapi.c:
(main):
* JavaScriptCore.exp:
2006-10-12 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Adam.
Build breakage fix
* kjs/DateMath.cpp:
(KJS::msToTM):
* kjs/date_object.cpp:
(KJS::gmtoffset):
2006-10-11 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Geoff.
Added our own tm struct to have a consistent set of fields, which lets us display the DST offset and timezone strings correctly. Also there is some code cleanup.
* kjs/DateMath.cpp:
(KJS::timeToMS):
(KJS::getUTCOffset):
(KJS::getDSTOffsetSimple):
(KJS::dateToMS):
(KJS::msToTM):
(KJS::tmToKJStm):
(KJS::KJStmToTm):
* kjs/DateMath.h:
* kjs/date_object.cpp:
(KJS::gmtoffset):
(KJS::formatTime):
(KJS::DateProtoFunc::callAsFunction):
(KJS::DateObjectImp::construct):
(KJS::DateObjectImp::callAsFunction):
(KJS::DateObjectFuncImp::callAsFunction):
(KJS::parseDate):
* kjs/date_object.h:
2006-10-09 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Geoff.
Improve gdk build compiler flags (show warning, no rtti and exceptions).
* jscore.bkl:
2006-10-06 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Brady.
DST and TimeZones were wrong in some cases, specifically on some of the dates where DST changes.
* kjs/DateMath.cpp:
(KJS::equivalentYearForDST):
(KJS::getUTCOffset):
(KJS::getDSTOffsetSimple):
(KJS::getDSTOffset):
(KJS::dateToMseconds):
(KJS::msToTM):
* kjs/DateMath.h:
* kjs/date_object.cpp:
(KJS::gmtoffset):
2006-10-05 Darin Adler <darin@apple.com>
Reviewed by Kevin McCullough.
* wtf/Assertions.cpp: Fix build when _DEBUG is not defined.
2006-10-04 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Adam.
- Removed an unnecessary assert that was stopping many pages. tm_gmtoff was not set for UTC time in mozilla but is always set for us.
* kjs/DateMath.cpp:
(KJS::getUTCOffset):
(KJS::msToTM):
* kjs/date_object.cpp:
(KJS::gmtoffset):
(KJS::formatTime):
2006-10-04 Geoffrey Garen <ggaren@apple.com>
Patch by Darin and me, reviewed by Maciej.
Fixed <rdar://problem/4518397> REGRESSION(?): Oft-seen but unrepro crash
in JavaScript garbage collection (KJS::Collector::collect())
<rdar://problem/4752492> Crash in KJS::collect
The issue here was allocating one garbage-collected object in the midst
of allocating a second garbage-collected object. In such a case, the
zeroIfFree word lies.
* kjs/collector.cpp:
(KJS::Collector::allocate):
(KJS::Collector::collect):
2006-10-04 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Adam.
- Layout test fix
* kjs/DateMath.cpp:
(KJS::dateToDayInYear): accept and correctly handle negative months
2006-10-05 Kevin McCullough <KMcCullough@apple.com>
build fix
* kjs/DateMath.cpp:
(KJS::dateToDayInYear):
2006-10-05 Mark Rowe <bdash@webkit.org>
Reviewed by maculloch.
Gdk build fix.
* JavaScriptCoreSources.bkl: Add DateMath.cpp to file list.
2006-10-05 Kevin McCullough <KMcCullough@apple.com>
Reviewed by aroben
- build fix
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-10-04 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Mitz.
Fix Qt/Linux build by adding DateMath.cpp to compilation.
* CMakeLists.txt: Also replace tabs with spaces.
2006-10-04 Kevin McCullough <KMcCullough@apple.com>
Reviewed by DethBakin.
- Apparently the build bot uses an older version of XCode which warns about conversions and the newest version does not. I hope this fixes the build but I cann't be sure on my system.
* kjs/DateMath.cpp:
(KJS::msToYear):
(KJS::dayInYear):
(KJS::dateToDayInYear):
2006-10-05 Darin Adler <darin@apple.com>
Reviewed by Adam.
* wtf/Assertions.cpp: Changed assertion formatting to omit the "======"
lines so you can see more assertions in less space. Also improved format
of file/line information so it works with more development environments.
2006-10-04 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Tim H.
- The build machine is more sensitive about automatic conversions. These fixes exp
licitly cast or change the input and return types of functions to avoid conversions.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/DateMath.cpp:
(KJS::):
(KJS::msToDays):
(KJS::msToYear):
(KJS::dayInYear):
(KJS::monthToDayInYear):
(KJS::dateToDayInYear):
(KJS::getDSTOffsetSimple):
(KJS::getDSTOffset):
(KJS::dateToMseconds):
(KJS::msToTM):
2006-10-04 Kevin McCullough <KMcCullough@apple.com>
Reviewed by GGaren
- This is a big makeover for our Date implemenetation. This solves many platform specific issues, specifically dates before 1970, and simplifies some ugly code. The purpose of this was to get us to pass many of the JavaScriptCore tests on windows.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/DateMath.cpp: Added.
(KJS::):
(KJS::daysInYear):
(KJS::daysFrom1970ToYear):
(KJS::msFrom1970ToYear):
(KJS::msToDays):
(KJS::msToYear):
(KJS::isLeapYear):
(KJS::isInLeapYear):
(KJS::dayInYear):
(KJS::msToMilliseconds):
(KJS::msToWeekDay):
(KJS::msToSeconds):
(KJS::msToMinutes):
(KJS::msToHours):
(KJS::msToMonth):
(KJS::msToDayInMonth):
(KJS::monthToDayInYear):
(KJS::timeToMseconds):
(KJS::dateToDayInYear):
(KJS::equivalentYearForDST):
(KJS::getUTCOffset):
(KJS::getDSTOffsetSimple):
(KJS::getDSTOffset):
(KJS::localTimeToUTC):
(KJS::UTCToLocalTime):
(KJS::dateToMseconds):
(KJS::msToTM):
(KJS::isDST):
* kjs/DateMath.h: Added.
(KJS::):
* kjs/date_object.cpp:
(KJS::gmtoffset):
(KJS::formatTime):
(KJS::DateInstance::getTime):
(KJS::DateInstance::getUTCTime):
(KJS::DateProtoFunc::callAsFunction):
(KJS::DateObjectImp::construct):
(KJS::DateObjectFuncImp::callAsFunction):
(KJS::parseDate):
* kjs/testkjs.cpp:
* os-win32/stdint.h:
2006-10-02 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed/landed by Adam.
Build testkjs on Qt/Linux.
* CMakeLists.txt:
2006-10-02 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by eseidel. Landed by eseidel.
Fix win32 build, which has no inttypes.h
* wtf/Assertions.h:
2006-10-02 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by eseidel & mjs. Landed by eseidel.
Fix Qt/Linux build with older gcc 3.3.4.
http://bugs.webkit.org/show_bug.cgi?id=11116
* kjs/lookup.h: Move cacheGlobalObject into KJS namespace.
(KJS::cacheGlobalObject): Also remove GCC_ROOT_NS_HACK.
* wtf/Assertions.h: Include inttypes.h for uintptr_t.
2006-09-28 Steve Falkenburg <sfalken@apple.com>
Reviewed by Maciej.
Use $(ConfigSuffix) set via vsprops files to add _debug
to end of debug filenames.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/debug.vsprops: Added.
* JavaScriptCore.vcproj/dftables/dftables.vcproj:
* JavaScriptCore.vcproj/release.vsprops: Added.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2006-09-28 Darin Adler <darin@apple.com>
Reviewed by Alice.
- support for change that should fix <rdar://problem/4733044>
REGRESSION: XML iBench shows 10% perf. regression (copying
strings while decoding)
* wtf/Vector.h: Changed VectorBuffer so that the general case
contains an instance of the 0 case, since deriving from it
was violating the Liskov Substitution Principle.
(WTF::VectorBuffer::releaseBuffer): Added. Releases the buffer so it can
be adopted by another data structure that uses the FastMalloc.h allocator.
Returns 0 if the internal buffer was being used.
(WTF::Vector::releaseBuffer): Added. Releases the buffer as above or creates
a new one in the case where the internal buffer was being used.
2006-09-28 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- change garbage collection to happen at increments proportional to number of live objects, not always
every 1000 allocations
* kjs/collector.cpp:
(KJS::Collector::allocate):
2006-09-28 Maciej Stachowiak <mjs@apple.com>
Reviewed by Mitz.
- fixed REGRESSION (r16606): javascriptCore Crash on website load
Plus style fixes.
- fixed some possible off-by-one bugs
- use indexing, not iterators, for Vectors
- store Vector by pointer instead of by value to avoid blowing out FunctionImp size
* kjs/function.cpp:
(KJS::FunctionImp::addParameter):
(KJS::FunctionImp::parameterString):
(KJS::FunctionImp::processParameters):
(KJS::FunctionImp::lengthGetter):
(KJS::FunctionImp::getParameterName):
* kjs/function.h:
2006-09-27 Steve Falkenburg <sfalken@apple.com>
Reviewed by Maciej.
More build tweaks
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/JavaScriptCore/dstroot-to-sdk.cmd: Removed.
2006-09-27 John Sullivan <sullivan@apple.com>
* kjs/function.cpp:
(KJS::FunctionImp::getParameterName):
removed assertion that displeased gcc 4.0.1 (build 5420):
ASSERT(static_cast<size_t>(index) == index);
2006-09-27 Kevin McCullough <KMcCullough@apple.com>
Reviewed by GGaren.
Cleanup of previous fix which was to address Radar: 4752492
* kjs/function.cpp:
(KJS::FunctionImp::addParameter):
(KJS::FunctionImp::parameterString):
(KJS::FunctionImp::processParameters):
(KJS::FunctionImp::lengthGetter):
(KJS::FunctionImp::getParameterName):
* kjs/function.h:
2006-09-27 Kevin McCullough <KMcCullough@apple.com>
Reviewed by Adele.
Fixes a GC stack overflow crash.
The change is to move from a linked list implementation of Parameters to a Vector.
The problem with the linked list is that each one creates it's own stack frame when being destroyed and in extreme cases this caused the stack to overflow.
* kjs/function.cpp:
(KJS::Parameter::Parameter):
(KJS::FunctionImp::addParameter):
(KJS::FunctionImp::parameterString):
(KJS::FunctionImp::processParameters):
(KJS::FunctionImp::lengthGetter):
(KJS::FunctionImp::getParameterName):
* kjs/function.h:
2006-09-27 Steve Falkenburg <sfalken@apple.com>
Fix last path fix.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2006-09-27 Steve Falkenburg <sfalken@apple.com>
Set path before build.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2006-09-27 Sean Gies <seangies@apple.com>
Reviewed by Adam Roben.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Debug config should link to debug runtime.
* JavaScriptCore.vcproj/dftables/dftables.vcproj: Debug config should link to debug runtime.
2006-09-27 Don Melton <gramps@apple.com>
Reviewed by Adam Roben.
Changed line ending from DOS to UNIX format so it doesn't die running
on my machine. ;)
* JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
2006-09-23 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Maciej.
http://bugs.webkit.org/show_bug.cgi?id=10183
REGRESSION: obfuscated JS decoding breaks because of soft hyphen removal
(Fanfiction.net author pages not listing stories)
Rolled out the fix for bug 4139.
* kjs/lexer.cpp:
(Lexer::setCode):
(Lexer::shift):
* tests/mozilla/ecma/Array/15.4.5.1-1.js:
* tests/mozilla/expected.html:
2006-09-22 Steve Falkenburg <sfalken@apple.com>
Build fix.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2006-09-22 Darin Adler <darin@apple.com>
Reviewed by Alice.
* wtf/Vector.h: Add an append that takes a pointer and length.
Generalize the existing Vector append to work on vectors with
any value for inlineCapacity. Change the append algorithm so
it doesn't check capacity each time through the loop.
2006-09-22 Steve Falkenburg <sfalken@apple.com>
Fix release build.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2006-09-21 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Updated to include the right path.
* wtf/FastMalloc.h: #include Platform.h, since we use Platform macros.
=== Safari-521.27 ===
2006-09-20 Anders Carlsson <acarlsson@apple.com>
Reviewed by Dave Hyatt.
* wtf/MathExtras.h:
Get rid of lrint.
2006-09-20 Sean Gies <seangies@apple.com>
Reviewed by Steve Falkenburg.
* wtf/Assertions.cpp: Debug messages should go into debugger console.
2006-09-20 David Hyatt <hyatt@apple.com>
Add an implementation of lrint for Win32.
Reviewed by anders
* wtf/MathExtras.h:
(lrint):
2006-09-15 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Adam.
http://bugs.webkit.org/show_bug.cgi?id=10864
Bug 10864: Linux\GDK build fixes
* JavaScriptCoreSources.bkl:
* jscore.bkl:
2006-09-15 Adam Roben <aroben@apple.com>
Windows build fix.
* JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
2006-09-15 Anders Carlsson <acarlsson@apple.com>
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Fix the release build.
2006-09-15 Anders Carlsson <acarlsson@apple.com>
Reviewed by Steve.
Add JavaScriptCore API to the build.
* API/JSBase.cpp:
* API/JSCallbackConstructor.cpp:
* API/JSCallbackFunction.cpp:
* API/JSCallbackObject.cpp:
* API/JSClassRef.cpp:
* API/JSContextRef.cpp:
* API/JSObjectRef.cpp:
* API/JSStringRef.cpp:
* API/JSValueRef.cpp:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* os-win32/stdbool.h: Added.
2006-09-12 Steve Falkenburg <sfalken@apple.com>
Reviewed by Ada.
Build tweaks (doing JavaScriptCore now since it doesn't have
dependencies).
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
* JavaScriptCore.vcproj/JavaScriptCore/dstroot-to-sdk.cmd: Added.
* JavaScriptCore.vcproj/dftables/dftables.vcproj:
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
2006-09-11 Brady Eidson <beidson@apple.com>
Build fix - I think Tim's last checkin wasn't tested on Tiger, possibly. I simply
commented out the undefined constants until he can have a chance to make the right call
* bindings/objc/objc_utility.mm:
(KJS::Bindings::objcValueTypeForType): Commented out undefined symbols
2006-09-11 Timothy Hatcher <timothy@apple.com>
Reviewed by Tim O. and Darin.
Add support for more method signatures affecting ObjC methods called from JavaScript:
- Added unsigned types and long long.
- Allow methods that use const, oneway, bycopy and byref type modifiers.
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
* bindings/objc/objc_utility.h:
(KJS::Bindings::):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
(KJS::Bindings::objcValueTypeForType):
2006-09-05 Timothy Hatcher <timothy@apple.com>
Reviewed by Tim O.
<rdar://problem/4715840> SEL is not char*
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::methodsNamed): use sel_getName instead of a char* cast.
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::callAsFunction): ditto
2006-09-03 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Tim H.
http://bugs.webkit.org/show_bug.cgi?id=10693
Convert JavaScript arrays to AppleScript lists
* JavaScriptCore.exp: Export ArrayInstance::info and ArrayInstance::getItem().
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstance::getItem): Added a method to access array items from C++.
2006-09-02 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Tim H.
Bug 10454: Unix bakefile fixes
http://bugs.webkit.org/show_bug.cgi?id=10454
* JavaScriptCoreSources.bkl:
2006-09-01 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by hyatt. Landed by eseidel.
Fix build on Linux.
* pcre/CMakeLists.txt: Add wtf/ include.
2006-09-01 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed and landed by ap.
Fix build on Linux (C89 without gcc extensions enabled).
* pcre/pcre_internal.h: Use C style comments.
* wtf/Assertions.h: Use C style comments.
* wtf/Platform.h: Use C style comments.
2006-09-01 Steve Falkenburg <sfalken@apple.com>
Fix build.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/dftables/dftables.vcproj:
2006-08-31 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
Add new portability functions to MathExtras.h and add StringExtras.h which is for
string portability functions.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* bindings/c/c_instance.cpp:
* kjs/date_object.cpp:
* wtf/MathExtras.h:
(copysign):
(isfinite):
* wtf/StringExtras.h: Added.
(snprintf):
(strncasecmp):
2006-08-31 Anders Carlsson <acarlsson@apple.com>
Reviewed by Tim H.
Fix Windows build.
* JavaScriptCore.vcproj/dftables/dftables.vcproj:
* pcre/pcre_internal.h:
2006-08-31 Timothy Hatcher <timothy@apple.com>
Reviewed by Geoff.
Band-aid fix for PCRE to compile for ppc64 and x86_64 now that
we use -Wshorten-64-to-32. Adds an INT_CAST macro that ASSERTs
the value <= INT_MAX.
I filed <rdar://problem/4712064> to track the need to verify
PCRE's 64-bit compliance.
* pcre/pcre_compile.c:
(complete_callout):
(compile_branch):
(compile_regex):
(pcre_compile2):
* pcre/pcre_exec.c:
(match):
(pcre_exec):
* pcre/pcre_get.c:
(pcre_get_substring_list):
* pcre/pcre_internal.h:
* pcre/pcre_tables.c:
* pcre/pcre_try_flipped.c:
(_pcre_try_flipped):
2006-08-30 Darin Adler <darin@apple.com>
Reviewed by Tim Hatcher.
- add WTF::getPtr, a function template that makes it possible to write
generic code that gets a raw pointer out of any of our pointer types
* JavaScriptCore.xcodeproj/project.pbxproj:
* wtf/GetPtr.h: Added.
* wtf/ListRefPtr.h: (WTF::getPtr): Added.
* wtf/OwnArrayPtr.h: (WTF::getPtr): Added.
* wtf/OwnPtr.h: (WTF::getPtr): Added.
* wtf/PassRefPtr.h: (WTF::getPtr): Added.
* wtf/RefPtr.h: (WTF::getPtr): Added.
2006-08-29 waylonis <waylonis@google.com>
Reviewed, tweaked by ggaren.
- Added storage and accessor functions for ExecState as a fix for
http://bugs.webkit.org/show_bug.cgi?id=10114
* kjs/ExecState.cpp:
(KJS::ExecState::ExecState):
* kjs/ExecState.h:
* kjs/context.h:
(KJS::Context::setExecState):
(KJS::Context::execState):
2006-08-30 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Tim H.
Commit KDE related tweaks, to be able to
differentiate between a Qt-only or a KDE build.
* CMakeLists.txt: Install wtf-unity library.
* wtf/Platform.h: Add define for the KDE platform.
2006-08-28 Darin Adler <darin@apple.com>
Reviewed by Geoff.
* kjs/list.h: Use explicit in constructor (as appropriate).
2006-08-24 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed, tweaked and landed by ap
http://bugs.webkit.org/show_bug.cgi?id=10467
WebKit should have Qt platform support (Part II)
* CMakeLists.txt: Adjust to Anders' build fixes.
* wtf/Platform.h: Fix define for the Qt platform (we don't use/need Cairo.)
2006-08-23 David Hyatt <hyatt@apple.com>
Fix Platform.h to include #defines for graphics features.
Reviewed by darin
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* wtf/Platform.h:
2006-08-23 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
Make the bindings compile without CoreFoundation.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* bindings/c/c_instance.cpp:
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertUTF8ToUTF16):
* bindings/npapi.h:
* bindings/runtime.cpp:
(KJS::Bindings::Instance::createBindingForLanguageInstance):
(KJS::Bindings::Instance::createLanguageInstanceForValue):
* bindings/runtime_root.cpp:
* bindings/runtime_root.h:
* kjs/interpreter.cpp:
(KJS::Interpreter::createLanguageInstanceForValue):
* kjs/interpreter.h:
2006-08-22 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
Move the npruntime code over to using HashMap and the runtime_root code over to using
HashMap and HashCountedSet.
* bindings/NP_jsobject.cpp:
* bindings/c/c_utility.cpp:
(KJS::Bindings::identifierFromNPIdentifier):
* bindings/c/c_utility.h:
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::invoke):
* bindings/npruntime.cpp:
(getStringIdentifierMap):
(getIntIdentifierMap):
(_NPN_GetStringIdentifier):
(_NPN_GetIntIdentifier):
* bindings/runtime_root.cpp:
(getReferencesByRootMap):
(getReferencesSet):
(KJS::Bindings::findReferenceSet):
(KJS::Bindings::rootForImp):
(KJS::Bindings::rootForInterpreter):
(KJS::Bindings::addNativeReference):
(KJS::Bindings::removeNativeReference):
(RootObject::removeAllNativeReferences):
* bindings/runtime_root.h:
2006-08-22 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
Switch over the NPAPI and Java bindings to using HashMaps instead of dictionaries.
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/c/c_class.cpp:
(KJS::Bindings::CClass::CClass):
(KJS::Bindings::CClass::~CClass):
(KJS::Bindings::CClass::classForIsA):
(KJS::Bindings::CClass::methodsNamed):
(KJS::Bindings::CClass::fieldNamed):
* bindings/c/c_class.h:
* bindings/jni/jni_class.cpp:
(JavaClass::JavaClass):
(JavaClass::~JavaClass):
(JavaClass::methodsNamed):
(JavaClass::fieldNamed):
* bindings/jni/jni_class.h:
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
(KJS::Bindings::deleteMethod):
(KJS::Bindings::deleteField):
(KJS::Bindings::):
(KJS::Bindings::ObjcClass::methodsNamed):
(KJS::Bindings::ObjcClass::fieldNamed):
* bindings/runtime.cpp:
* bindings/runtime.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::fieldGetter):
(RuntimeObjectImp::getOwnPropertySlot):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
2006-08-21 Vladimir Olexa <vladimir.olexa@gmail.com>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=6252
JavaScript 1.6 Array.lastIndexOf
Test: fast/js/array-lastIndexOf.html
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): Added a LastIndexOf case.
* kjs/array_object.h:
(KJS::ArrayProtoFunc::): Added LastIndexOf to enum.
* tests/mozilla/expected.html: Two more tests now pass.
2006-08-20 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Maciej. Landed by rwlbuis.
Fixes parts of: http://bugs.webkit.org/show_bug.cgi?id=10463
WebKit should have Qt platform support
Removing obsolete QConstString/QString constructors in kjs code.
* kjs/identifier.h:
* kjs/ustring.h:
2006-08-17 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Maciej. Landed by rwlbuis.
Fixes: http://bugs.webkit.org/show_bug.cgi?id=10463
WTF Changes needed for Qt platform code.
* wtf/Platform.h:
* wtf/unicode/UnicodeDecomposition.h: Added.
(WTF::Unicode::):
* wtf/unicode/UnicodeDirection.h: Added.
(WTF::Unicode::):
* wtf/unicode/qt4/UnicodeQt4.cpp: Added.
(WTF::Unicode::direction):
(WTF::Unicode::category):
(WTF::Unicode::decomposition):
* wtf/unicode/qt4/UnicodeQt4.h:
(WTF::Unicode::toLower):
(WTF::Unicode::toUpper):
(WTF::Unicode::isPrintableChar):
(WTF::Unicode::isSpace):
(WTF::Unicode::isPunct):
(WTF::Unicode::isDigit):
(WTF::Unicode::mirroredChar):
(WTF::Unicode::compare):
2006-08-17 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Eric. Landed by rwlbuis.
Fixes: http://bugs.webkit.org/show_bug.cgi?id=10464
Offer a cmake build system for Qt platform.
* CMakeLists.txt: Added.
* pcre/CMakeLists.txt: Added.
2006-08-17 Anders Carlsson <acarlsson@apple.com>
Reviewed by Maciej.
* bindings/npapi.h:
Fix ifdef.
2006-08-15 Steve Falkenburg <sfalken@apple.com>
Reviewed by mjs.
Build fix.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* wtf/Assertions.h:
2006-08-15 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by Tim H.
Build fix: DWARF and -gfull are incompatible with symbol separation.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-08-15 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by Tim H.
http://bugs.webkit.org/show_bug.cgi?id=10394
Bug 10394: WebKit Release and Production configurations should enable dead code stripping
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-08-15 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by Tim H.
http://bugs.webkit.org/show_bug.cgi?id=10384
Bug 10384: Switch to DWARF for Release configuration
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-08-13 Maks Orlovich <maksim@kde.org>
Reviewed (and tweaked a little) by Maciej.
- shrank the size of JSObject by 8 bytes and made the corresponding reduction to the cell size, resulting
in a 1.2% speed improvement on JS iBench (and probably overall memory savings).
This was done by removing _scope and _internalValue data members
from JSObject and moving them only to the subclasses that actually
make use of them.
* kjs/object.cpp:
(KJS::JSObject::mark): No need to mark scope or internal value here.
* kjs/object.h:
(KJS::JSObject::JSObject): Don't initialize them.
* kjs/JSWrapperObject.cpp: Added. New base class for object types that
wrap primitive values (Number, String, Boolean, Date).
(KJS::JSWrapperObject::mark):
* kjs/JSWrapperObject.h: Added.
(KJS::JSWrapperObject::JSWrapperObject):
(KJS::JSWrapperObject::internalValue):
(KJS::JSWrapperObject::setInternalValue):
* kjs/array_object.cpp:
(ArrayPrototype::ArrayPrototype): Don't set useless internal value.
* kjs/bool_object.cpp:
(BooleanInstance::BooleanInstance): Inherit from JSWrapperObject.
(BooleanProtoFunc::callAsFunction): Fixed to account for fact that not all
JSObjects have an internal value.
(BooleanObjectImp::construct): ditto.
* kjs/bool_object.h:
* kjs/collector.cpp: Lowered cell size to 48.
(KJS::Collector::allocate): meaningless whitespace change
* kjs/date_object.cpp:
(KJS::DateInstance::DateInstance): Inherit from JSWrapperObject.
(KJS::DateProtoFunc::callAsFunction): adjusted for move of internalValue
(KJS::DateObjectImp::construct): ditto
* kjs/date_object.h:
* kjs/error_object.cpp:
(ErrorPrototype::ErrorPrototype): don't set internal value
* kjs/function.cpp: move _scope and related handling here
(KJS::FunctionImp::mark): mark scope
* kjs/function.h:
(KJS::FunctionImp::scope): moved here from JSObject
(KJS::FunctionImp::setScope): ditto
* kjs/number_object.cpp:
(NumberInstance::NumberInstance): inherit from JSWrapperObject
(NumberProtoFunc::callAsFunction): adjusted
(NumberObjectImp::construct): adjusted
* kjs/number_object.h: shring RegExp-related objects a little
* kjs/regexp_object.cpp:
(RegExpPrototype::RegExpPrototype): Adjust for size tweaks
(RegExpObjectImp::RegExpObjectImp): ditto
* kjs/regexp_object.h:
* kjs/string_object.cpp:
(StringInstance::StringInstance): inherit from JSWrapperObject
(StringProtoFunc::callAsFunction): adjusted
* kjs/string_object.h:
* JavaScriptCore.exp: Exported new methods as needed.
* JavaScriptCore.xcodeproj/project.pbxproj: Added new files to build.
2006-08-04 Brady Eidson <beidson@apple.com>
Reviewed by Geoff's rubber stamp
Fix a build break on Intel hardware causes by adapting stricter
compiler warnings (-Wshorten-64-to-32)
* API/testapi.c:
(assertEqualsAsNumber): manually cast some doubles to floats
(main): ditto
2006-08-04 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Darin.
- patch for http://bugs.webkit.org/show_bug.cgi?id=10192
Make WebCore (and friends) compile with -Wshorten-64-to-32
* Adds -Wshorten-64-to-32 flag to Xcode project.
* Adds explicit casts where OK.
* API/JSNodeList.c:
(JSNodeList_item):
(JSNodeList_getProperty):
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-08-04 Adam Roben <aroben@apple.com>
Reviewed by Anders.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Convert
spaces to tabs
2006-08-03 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Darin.
- patch for http://bugs.webkit.org/show_bug.cgi?id=10176
Make WebCore compile with -Wundef
* Adds -Wundef flag to Xcode project
* Converts #ifs to #ifdef and #ifndefs where needed.
* Added #define YYMAXDEPTH 10000 in kjs/grammar.y
to fix a warning from within Bison.
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::getSlot):
(JavaJSObject::setSlot):
* bindings/npapi.h:
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::methodsNamed):
(KJS::Bindings::ObjcClass::fieldNamed):
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
* bindings/objc/objc_runtime.mm:
(ObjcMethod::getMethodSignature):
(ObjcField::name):
(ObjcField::type):
* kjs/grammar.y:
* kjs/identifier.h:
2006-08-03 Anders Carlsson <acarlsson@apple.com>
Reviewed by John Sullivan.
* wtf/HashSet.h:
(WTF::::operator):
Return *this in operator=
2006-08-03 Adam Roben <aroben@apple.com>
Reviewed by Anders.
- Fixed Windows build
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* wtf/MathExtras.h: Implement inline versions of these functions
(nextafter):
(nextafterf):
2006-08-02 Adam Roben <aroben@apple.com>
Reviewed by Darin.
- Fixed build
* kjs/date_object.cpp:
(KJS::formatTime):
2006-07-29 Darin Adler <darin@apple.com>
- Removed tabs from these source files that still had them.
We don't use them; that way source files look fine in editors
that have tabs set to 8 spaces or to 4 spaces.
- Removed allow-tabs Subversion property from the files too.
* bindings/NP_jsobject.cpp:
* bindings/c/c_utility.cpp:
* bindings/jni/jni_runtime.cpp:
* bindings/jni/jni_utility.cpp:
* bindings/objc/objc_utility.mm:
* bindings/runtime.cpp:
* bindings/runtime_method.cpp:
* bindings/testbindings.cpp:
* bindings/testbindings.mm:
* kjs/date_object.cpp:
* kjs/function.cpp:
* kjs/list.cpp:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/string_object.cpp:
* kjs/ustring.cpp:
2006-07-29 Darin Adler <darin@apple.com>
* tests/mozilla/expected.html: Update test results now that regress-185165.js
is succeeding. I suspect Anders fix for bug 4620655 is the reason.
2006-07-29 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Darin.
- patch for http://bugs.webkit.org/show_bug.cgi?id=10080
Adopt pedantic changes from the Unity project to improve
cross-compiler compatibility
Changes include:
* Removing trailing semicolon from namespace braces.
* Removing trailing comma from last enum declaration.
* Updating to match style guidelines.
* Adding missing newline to the end of the file.
* Turning on gcc warning for missing newline at the end of a source file
(GCC_WARN_ABOUT_MISSING_NEWLINE in Xcode, -Wnewline in gcc).
* Alphabetical sorting of Xcode source list files.
* Replace use of non-portable variable-size array with Vector.
* Use C-style comments instead of C++ comments in files that might
be included by either C or C++ files.
* API/JSCallbackConstructor.cpp:
(KJS::JSCallbackConstructor::construct):
* API/JSCallbackFunction.cpp:
(KJS::JSCallbackFunction::callAsFunction):
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::callAsFunction):
* JavaScriptCore.xcodeproj/project.pbxproj:
* JavaScriptCorePrefix.h:
* bindings/jni/jni_class.cpp:
(JavaClass::fieldNamed):
* bindings/jni/jni_class.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::JavaInstance):
(JavaInstance::valueOf):
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
* bindings/jni/jni_runtime.cpp:
(JavaParameter::JavaParameter):
(JavaArray::JavaArray):
* bindings/jni/jni_runtime.h:
* bindings/jni/jni_utility.h:
* bindings/objc/objc_instance.h:
* bindings/runtime_array.h:
* kjs/collector.h:
* kjs/config.h:
* kjs/ustring.cpp:
* wtf/Platform.h:
2006-07-29 Mike Emmel <mike.emmel@gmail.com>
Reviewed by Darin.
- fixes for Linux build
* JavaScriptCoreSources.bkl: Added new files to build, kjs/PropertyNameArray.cpp
and kjs/testkjs.cpp, and removed old files.
2006-07-24 Dan Waylonis <waylonis@google.com>
Reviewed and tweaked a bit by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=9902
jsNull and NSNull not properly converted between JS and ObjC
* bindings/objc/objc_utility.mm: (KJS::Bindings::convertObjcValueToValue):
Added case for converting NSNull to jsNull.
2006-07-24 Rob Buis <buis@kde.org>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=4258
Date().toString() only includes GMT offset, not timezone string
Use the info in tm_zone to append timezone abbreviation
to Date().toString().
* kjs/date_object.cpp:
(KJS::formatTime):
2006-07-24 Rob Buis <buis@kde.org>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=5257
setYear() does not match FireFox/IE behavior
Make sure the right values end up in tm_year.
* kjs/date_object.cpp:
(KJS::formatTime):
2006-07-23 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by Maciej.
Bug 9686: [Drosera] Need the ability to break into Drosera on Javascript exceptions
http://bugs.webkit.org/show_bug.cgi?id=9686
JavaScriptCore portion of the fix.
* JavaScriptCore.exp: Update symbol for change in argument type.
* kjs/debugger.cpp:
(Debugger::detach): Clear map of recent exceptions.
(Debugger::hasHandledException): Track the most recent exception
thrown by an interpreter.
(Debugger::exception): Change exception argument to a JSValue.
* kjs/debugger.h:
* kjs/nodes.cpp:
(Node::debugExceptionIfNeeded): Notify the debugger of an exception
if it hasn't seen it before.
(ThrowNode::execute): Notify the debugger that an exception is being thrown.
* kjs/nodes.h:
2006-07-23 Geoffrey Garen <ggaren@apple.com>
Patch by Eric Albert, reviewed by Darin and me.
- Fixed <rdar://problem/4645931> JavaScriptCore stack-scanning code
crashes (Collector::markStackObjectsConservatively)
* bindings/jni/jni_jsobject.cpp: On 64bit systems, jint is a long, not an
int.
(JavaJSObject::getSlot):
(JavaJSObject::setSlot):
* kjs/collector.cpp:
(KJS::Collector::markCurrentThreadConservatively): Use a pointer instead of
an int as 'dummy,' because on LP64 systems, an int is not pointer-aligned,
and we want to scan the stack for pointers.
* JavaScriptCore.xcodeproj/project.pbxproj: After a tense cease-fire, the
XCode war has started up again!
=== Safari-521.20 ===
2006-07-21 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
<rdar://problem/4507265> REGRESSION: overlays don't work on HousingMaps.com (Google Maps-based site)
- Added support for strings that masquerade as undefined. Currently used
by WebCore to implement undetectable style.filter.
The name is a little long, but it's only used in one line of code, so I
thought clarity should win over brevity.
* JavaScriptCore.exp:
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/object.h:
* kjs/string_object.h:
(KJS::StringInstanceThatMasqueradesAsUndefined::StringInstanceThatMasqueradesAsUndefined):
(KJS::StringInstanceThatMasqueradesAsUndefined::masqueradeAsUndefined):
(KJS::StringInstanceThatMasqueradesAsUndefined::toBoolean):
=== Safari-521.19 ===
2006-07-20 Steve Falkenburg <sfalken@apple.com>
Fix the build
* kjs/function.cpp:
(KJS::escapeStringForPrettyPrinting):
2006-07-19 Anders Carlsson <acarlsson@apple.com>
Reviewed by Darin.
<rdar://problem/4620655> REGRESSION(10.4.7-10.5): preview button for a blogger.com post doesn't work
* kjs/nodes2string.cpp:
(StringNode::streamTo):
Return the escaped string.
(RegExpNode::streamTo):
Use the correct syntax.
* kjs/function.cpp:
(KJS::escapeStringForPrettyPrinting):
* kjs/function.h:
Add escape function which escapes a string for pretty-printing so it can be parsed again.
* wtf/unicode/icu/UnicodeIcu.h:
(WTF::Unicode::isPrintableChar):
New function.
2006-07-18 Maciej Stachowiak <mjs@apple.com>
Reviewed by Adele Peterson.
<rdar://problem/4589530> REGRESSION: null character in JS string causes parse error (works in Tiger and in other browsers)
* kjs/lexer.cpp:
(Lexer::shift):
(Lexer::lex):
(Lexer::record16):
(Lexer::scanRegExp):
* kjs/lexer.h:
2006-07-18 Tim Omernick <timo@apple.com>
Reviewed by Tim Hatcher.
Removed a misleading comment; we recently added support for the NPNVPluginElementNPObject
variable.
* bindings/npapi.h:
=== Safari-521.18 ===
2006-07-18 Timothy Hatcher <timothy@apple.com>
Made the following headers public:
* JavaScriptCore.h
* JSBase.h
* JSContextRef.h
* JSObjectRef.h
* JSStringRef.h
* JSValueRef.h
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Added automatic prototype creation for classes.
A class stores a weak reference to a prototype, which is cleared when
the prototype is garbage collected, to avoid a reference cycle.
We now have an attributes field in JSClassDefinition, that currently is
used only to override automatic prototype creation when you want to manage your
own prototypes, but can be extended in the future for other nefarious purposes.
Similarly, we have JSObjectMake and JSObjectMakeWithPrototype, the latter
allowing you to manage your own prototypes.
JSObjectMakeConstructor is more interesting now, able to make a constructor
on your behalf if you just give it a class.
- Removed bogus old code from minidom.js.
- Tweaked the headerdocs.
- Added more GC testing, which caught some leaks, and tested more funny
edge cases in lookup, which caught a lookup bug. Removed some testing
we used to do with MyObject because it was redundant with the new, cool
stuff.
While fixing the lookup bug I retracted this change:
"If a static setProperty callback returns 'false', to indicate that the
property was not set, we no longer forward the set request up the class
chain, because that's almost certainly not what the programmer expected."
Returning false when setting a static property is a little silly, but you can see
it being useful when shadowing a base class's static properties, and, regardless
of usefullness, this is the defined behavior of the setProperty callback.
- Plus a little ASCII art, for the kids.
2006-07-17 Timothy Hatcher <timothy@apple.com>
Reviewed by Maciej.
<rdar://problem/4634874> WebScriptObject and WebUndefined are no longer defined by WebKit
Moves WebScriptObject and WebUndefined up to WebCore.
This change does create an upwards-dependancy on WebScriptObject existing
in the loaded process, but this code path in JavaScriptCore does not get used
unless it is through WebKit/WebCore. Moving all of the binding code out of
JavaScriptCore might make sense in the future.
* JavaScriptCore.exp:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/objc/WebScriptObject.h: Replaced.
* bindings/objc/WebScriptObject.mm: Removed.
* bindings/objc/WebScriptObjectPrivate.h: Removed.
* bindings/objc/objc_class.h:
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::~ObjcInstance):
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(convertValueToObjcObject):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
(KJS::Bindings::createObjcInstanceForValue):
2006-07-17 Darin Adler <darin@apple.com>
* API/JSBase.h: Fix comment formatting where things used to be lined up but
are now ragged. Got rid of spaces that attempted to line things up.
* API/JSObjectRef.h: Ditto. Also add missing periods for a couple of comments.
2006-07-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Removed the exception parameter from the initialize callback and, by extension,
JSObjectMake. We have never had a need for exceptions when iniitializing,
so the parameter seemed likely to "get in the way."
Also, an exception in JavaScript is thrown in response to input --
"invalid URL", "index not a number", etc., so it's the job of the
constructor function, not the initialize method, to throw.
If initialize *really* wants to throw, it can communicate the throw to
the constructor through the constructed object's private data (e.g., set
it to NULL, signaling to the consntructor that initialization failed.)
- Added JSObjectMakeWithData, which enables a constructor to set private
data on an object *before* it has been initialized. That way, the initialize
methods can properly operate on the data.
* API/JSNode.c: Moved ref into the initialize method, for better encapsulation,
now that it's possible.
* API/JSNodeList.c: ditto
* API/minidom.c:
(main): Do more aggressive garbage collection to test ref/deref and
initialize/finalize.
* API/minidom.js: store childNodes in a temporary so it doesn't get re-created
like a thousand times. This makes debugging ref/deref easier
2006-07-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Changed the initialize callback to run from least derived class (parent
class) to most derived class. This enables C++ style initialization,
and derived class overriding of member data.
- Added excpetion propopgation to JSObjectMake, to support initialize
exceptions, and generally round out our policy of making function
signatures as long as possible.
* API/JSCallbackObject.h: Use ExecState instead of ContextRef, cuz we're
in C++ land now.
2006-07-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Changed JSObjectMakeConstructor to JSObjectMakeConstructorWithCallback,
to match JSObjectMakeFunctionWithCallback.
- Added prototype parameter, so the generated constructor
automatically works with hasInstance / instanceof
- Moved hasInstance implementation from InternalFunctionImp to JSObject
so that subclasses can inherit it without inheriting function-related baggage.
More refactoring here would be good, but this seems like a good short-term
solution.
(KJS::JSCallbackFunction::implementsHasInstance): override and return false,
because callback functions aren't constructors.
2006-07-17 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- add a JSContextRef parameter to all JSValueRef, JSObjectRef, and JSContextRef operations;
except JSObject{Get,Set}PrivateData which can be assumed to be simple pure accessors.
Also renamed the parameter "context" to "ctx" because it makes the code read better with this pervasive
but usually uninteresting parameter.
* API/JSBase.cpp:
(JSEvaluateScript):
(JSCheckScriptSyntax):
(JSGarbageCollect):
* API/JSBase.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::JSCallbackObject):
(KJS::JSCallbackObject::init):
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::toNumber):
(KJS::JSCallbackObject::toString):
* API/JSContextRef.cpp:
(JSGlobalContextCreate):
(JSGlobalContextRetain):
(JSGlobalContextRelease):
(JSContextGetGlobalObject):
* API/JSContextRef.h:
* API/JSNode.c:
(JSNodePrototype_appendChild):
(JSNodePrototype_removeChild):
(JSNodePrototype_replaceChild):
(JSNode_getNodeType):
(JSNode_getFirstChild):
(JSNode_prototype):
* API/JSNodeList.c:
(JSNodeListPrototype_item):
(JSNodeList_length):
(JSNodeList_getProperty):
(JSNodeList_prototype):
* API/JSObjectRef.cpp:
(JSObjectMake):
(JSObjectMakeFunctionWithCallback):
(JSObjectMakeConstructor):
(JSObjectMakeFunction):
(JSObjectGetPrototype):
(JSObjectSetPrototype):
(JSObjectHasProperty):
(JSObjectGetProperty):
(JSObjectSetProperty):
(JSObjectGetPropertyAtIndex):
(JSObjectSetPropertyAtIndex):
(JSObjectDeleteProperty):
(JSObjectIsFunction):
(JSObjectCallAsFunction):
(JSObjectIsConstructor):
(JSObjectCallAsConstructor):
(JSObjectCopyPropertyNames):
* API/JSObjectRef.h:
* API/JSStringRef.cpp:
* API/JSValueRef.cpp:
(JSValueGetType):
(JSValueIsUndefined):
(JSValueIsNull):
(JSValueIsBoolean):
(JSValueIsNumber):
(JSValueIsString):
(JSValueIsObject):
(JSValueIsObjectOfClass):
(JSValueIsEqual):
(JSValueIsStrictEqual):
(JSValueIsInstanceOfConstructor):
(JSValueMakeUndefined):
(JSValueMakeNull):
(JSValueMakeBoolean):
(JSValueMakeNumber):
(JSValueMakeString):
(JSValueToBoolean):
(JSValueToNumber):
(JSValueToStringCopy):
(JSValueToObject):
(JSValueProtect):
(JSValueUnprotect):
* API/JSValueRef.h:
* API/minidom.c:
(print):
* API/testapi.c:
(MyObject_getProperty):
(MyObject_deleteProperty):
(MyObject_callAsFunction):
(MyObject_callAsConstructor):
(MyObject_convertToType):
(print_callAsFunction):
(main):
2006-07-16 Geoffrey Garen <ggaren@apple.com>
Approved by Maciej, RS by Beth.
JSObjectMakeFunction -> JSObjectMakeFunctionWithCallback
JSObjectMakeFunctionWithBody -> JSObjectMakeFunction
because the latter is more common, and more fundamental, than the former.
* API/APICast.h:
(toJS):
* API/JSBase.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::getPropertyNames):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::staticFunctionGetter):
* API/JSClassRef.cpp:
(OpaqueJSClass::OpaqueJSClass):
(OpaqueJSClass::~OpaqueJSClass):
* API/JSClassRef.h:
* API/JSObjectRef.cpp:
(JSClassCreate):
(JSObjectMakeFunctionWithCallback):
(JSObjectMakeFunction):
(OpaqueJSPropertyNameArray::OpaqueJSPropertyNameArray):
(JSObjectCopyPropertyNames):
* API/JSObjectRef.h:
* API/minidom.c:
(main):
* API/testapi.c:
(main):
* ChangeLog:
* JavaScriptCore.exp:
2006-07-16 Geoffrey Garen <ggaren@apple.com>
Laughed at by Beth.
Replace __JS with OpaqueJS because the former, while used by CF, is
a prefix that's triply-reserved by the compiler. (_* is reserved in global
names, _[A-Z] is reserved in all names, and __ is reserved in all names
in C++.)
Opaque is an alternative used by other Mac OS X framewokrs.
* API/APICast.h:
(toJS):
* API/JSBase.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::getPropertyNames):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::staticFunctionGetter):
* API/JSClassRef.cpp:
(OpaqueJSClass::OpaqueJSClass):
(OpaqueJSClass::~OpaqueJSClass):
* API/JSClassRef.h:
* API/JSObjectRef.cpp:
(JSClassCreate):
(OpaqueJSPropertyNameArray::OpaqueJSPropertyNameArray):
(JSObjectCopyPropertyNames):
2006-07-16 Darin Adler <darin@apple.com>
- try to fix Windows build
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Added some recently added files, removed some recently removed.
2006-07-16 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Change getProperty* to return undefined, rather than NULL, for missing
properties, since that's what the spec says. Also added exception out
parameters to the *Index functions, because they can call through to the
regular functions, which can throw for custom objects.
* API/JSObjectRef.cpp:
(JSObjectGetProperty):
(JSObjectGetPropertyAtIndex):
(JSObjectSetPropertyAtIndex):
* API/JSObjectRef.h:
* API/testapi.c:
(main):
2006-07-16 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Properly document and handle NULL callbacks for static properties. We
throw an exception in any case other than a ReadOnly property with a NULL
setProperty callback, because a NULL callback almost certainly indicates
a programming error. Also throw an exception if hasProperty returns true
for a property that getProperty can't get.
- If a static setProperty callback returns 'false', to indicate that the
property was not set, we no longer forward the set request up the class
chain, because that's almost certainly not what the programmer expected.
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::staticFunctionGetter):
(KJS::JSCallbackObject::callbackGetter):
* API/JSObjectRef.h:
* API/minidom.js:
* API/testapi.c:
(MyObject_hasProperty):
* API/testapi.js:
2006-07-16 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Added names to functions.
- Removed GetPrivate/SetPrivate from callbackFunctions and callbackConstructors.
The private data idiom is that a JS object stores its native implementation
as private data. For functions and constructors, the native implementation is nothing
more than the callback they already store, so supporting private data, too,
confuses the idiom. If you *really* want, you can still create a custom
function with private data.
* API/JSCallbackConstructor.cpp:
* API/JSCallbackConstructor.h:
* API/JSCallbackFunction.cpp:
(KJS::JSCallbackFunction::JSCallbackFunction):
* API/JSCallbackFunction.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::staticFunctionGetter):
* API/JSObjectRef.cpp:
(JSObjectMakeFunction):
(JSObjectMakeFunctionWithBody):
(JSObjectGetPrivate):
(JSObjectSetPrivate):
* API/JSObjectRef.h:
* API/minidom.c:
(main):
* API/testapi.c:
(main):
2006-07-15 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- switch property lists to be vector+set of Identifiers instead of list of References
This has the following benefits:
- no duplicates in property lists
- simplifies API calls
- probably more efficient, since linked list is gone
- entirely removed Reference, ReferenceList and ProtectedReference types from the API
* kjs/PropertyNameArray.cpp: Added.
(KJS::PropertyNameArray::add): Check set, if not already there, add to
vector.
* kjs/PropertyNameArray.h: Added.
(KJS::PropertyNameArray::PropertyNameArray): Newly added type, combines
a set and a vector to make a unique but ordered list of identifiers.
(KJS::PropertyNameArray::begin): ditto
(KJS::PropertyNameArray::end): ditto
(KJS::PropertyNameArray::size): ditto
(KJS::PropertyNameArray::operator[]): ditto
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstance::getPropertyNames): renamed from getPropertyList, updated
for PropertyNameArray
(ArrayInstance::setLength): updated for PropertyNameArray
(ArrayInstance::pushUndefinedObjectsToEnd): ditto
* kjs/nodes.cpp:
(ForInNode::execute): updated for PropertyNameArray
* kjs/nodes.h:
* kjs/object.cpp:
(KJS::JSObject::getPropertyNames): renamed from getPropertyList, updated
for PropertyNameArray
* kjs/object.h:
* kjs/property_map.cpp:
(KJS::PropertyMap::getEnumerablePropertyNames): updated for PropertyNameArray
(KJS::PropertyMap::getSparseArrayPropertyNames): ditto
* kjs/property_map.h:
* kjs/protected_reference.h: Removed.
* kjs/reference.cpp: Removed.
* kjs/reference.h: Removed.
* kjs/reference_list.cpp: Removed.
* kjs/reference_list.h: Removed.
* kjs/scope_chain.cpp:
(KJS::ScopeChain::print): Use PropertyNamesArray instead of ReferenceList.
* kjs/string_object.cpp:
(StringInstance::getPropertyNames): Updated for new approach.
* kjs/string_object.h:
* kjs/ustring.h:
* API/APICast.h:
(toJS): Added overload for PropertyNameAccumulatorRef / PropertyNameArray*
(toRef): ditto
* API/JSBase.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::getPropertyNames): Fixed for new API.
* API/JSCallbackObject.h:
* API/JSObjectRef.cpp:
(__JSPropertyNameArray::__JSPropertyNameArray): Type used for a publicly vended
JSPropertyNameArrayRef.
(JSObjectCopyPropertyNames): New API call - renamed / refactored from
JSObjectCreatePropertyList
(JSPropertyNameArrayRetain): new retain call for JSPropertyNameArray.
(JSPropertyNameArrayRelease): new release call for - " -.
(JSPropertyNameArrayGetCount): Instead of having to use a stateful enumerator you
can now get the count and items in any order.
(JSPropertyNameArrayGetNameAtIndex): See above.
(JSPropertyNameAccumulatorAddName): What you add properties to is now an opaque
accumulator object.
* API/JSObjectRef.h: Prototyped new functions, removed old ones
* JavaScriptCore.exp: Updated exported symbols.
* JavaScriptCore.xcodeproj/project.pbxproj: Added new files, removed old.
* API/testapi.c:
(MyObject_getPropertyNames): Renamed / fixed callback to fit new paradigm.
(main): Updated for new API.
2006-07-15 Darin Adler <darin@apple.com>
- oops, missed a few more arrays that had to be const
* API/JSNode.c:
(JSNodePrototype_appendChild): Added const.
(JSNodePrototype_removeChild): Ditto.
(JSNodePrototype_replaceChild): Ditto.
(JSNode_construct): Ditto.
* API/JSNodeList.c:
(JSNodeListPrototype_item): Ditto.
* API/JSObjectRef.cpp:
(JSObjectMakeFunctionWithBody): Ditto.
(JSObjectCallAsFunction): Ditto.
(JSObjectCallAsConstructor): Ditto.
* API/minidom.c:
(print): Ditto.
* API/testapi.c:
(MyObject_callAsFunction): Ditto.
(MyObject_callAsConstructor): Ditto.
(print_callAsFunction): Ditto.
(myConstructor_callAsConstructor): Ditto.
2006-07-15 Darin Adler <darin@apple.com>
Reviewed by Maciej.
* API/JSNode.h: Made an array parameter const.
* API/JSObjectRef.h: Made array parameters const. Fixed a comment.
2006-07-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- JSObjectMakeFunctionWithBody includes a function name and named parameters now.
* API/JSObjectRef.cpp:
(JSObjectMakeFunctionWithBody):
* API/JSObjectRef.h:
* API/testapi.c:
(assertEqualsAsUTF8String): More informative failure reporting.
(main): Test more function cases.
2006-07-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Moved the arguments passed to JSClassCreate into a single structure,
called JSClassDefinition. This will enable easier structure
migration/versioning in the future, if necessary.
- Added support for class names.
- kJSClassDefinitionNull replaces kJSObjectCallbacksNone.
- JSClass is becoming a fairly complex struct, so I migrated all of its
implementation other than reference counting to the sruct.
- Also moved JSClass* functions in the API to JSObjectRef.cpp, since they're
declared in JSObjectRef.h
- Also added some more informative explanation to the class structure doc.
2006-07-15 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- fix http://bugs.webkit.org/show_bug.cgi?id=8395
<rdar://problem/4613467>
REGRESSION: RegEx seems broken for hex escaped non breaking space
Test: fast/js/regexp-extended-characters-more.html
* pcre/pcre_exec.c:
(match): Got rid of utf16Length local variable to guarantee there's no
extra stack usage in recursive calls. Fixed two places in the PCRE_UTF16
code that were using the length variable, which is the UTF-8 length of
a character in the pattern, to move in the UTF-16 subject string. Instead
they hardcode lengths of 1 and 2 since the code already handles BMP
characters and surrogate pairs separately. Also fixed some DPRINTF so
I could compile with DEBUG on.
(pcre_exec): Changed a place that was checking for multibyte characters
in the subject string to use ISMIDCHAR. Instead it was using hardcoded
logic that was right for UTF-8 but wrong for UTF-16.
* pcre/pcre_compile.c: (pcre_compile2): Fixed a DPRINTF so I could compile
with DEBUG on.
2006-07-14 Geoffrey Garen <ggaren@apple.com>
RS by Maciej.
Global replace in the API of argc/argv with argumentCount/arguments.
2006-07-14 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Finalized exception handling in the API.
setProperty can throw because it throws for built-in arrays. getProperty
and deleteProperty can throw because setProperty can throw and we want
to be consistent, and also because they seem like "actions." callAsFunction,
callAsConstructor, and hasInstance can throw, because they caan throw for
all built-ins.
toBoolean can't throw because it's defined that way in the spec.
- Documented that toBoolean and toObject can't be overridden by custom
objects because they're defined that way in the spec.
=== Safari-521.17 ===
2006-07-14 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Implemented ref-counting of JSContexts by splitting into two datatypes:
JSGlobalContext, which you can create/retain/release, and JSContext, which
you can't.
Internally, you retain a JSGlobalContext/ExecState by retaining its
interpreter, which, in the case of a global ExecState, owns it.
- Also made ~Interpreter() protected to catch places where Interpreter
is manually deleted. (Can't make it private because some crazy fool
decided it would be a good idea to subclass Interpreter in other frameworks.
I pity da fool.)
* API/APICast.h:
(toJS): Added cast for new JSGlobalContext
* API/JSStringRef.h: Changed vague "you must" language to more specific
(but, ultimately, equally vague) "behavior is undefined if you don't"
language.
(KJS::Interpreter::Interpreter): Factored more common initialization into
init()
* kjs/interpreter.h:
(KJS::Interpreter::ref): new
(KJS::Interpreter::deref): new
(KJS::Interpreter::refCount): new
* kjs/testkjs.cpp:
(doIt): Ref-count the interpreter.
2006-07-14 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- removed bool return value from JSObjectSetProperty, since it is inefficient and
also doesn't work quite right
- added JSObjectGetPropertyAtIndex and JSObjectSetPropertyAtIndex
* API/JSObjectRef.cpp:
(JSObjectSetProperty): Removed return value and canPut stuff.
(JSObjectGetPropertyAtIndex): Added.
(JSObjectSetPropertyAtIndex): Added.
* API/JSObjectRef.h: Prototyped and documented new functions.
2006-07-14 Geoffrey Garen <ggaren@apple.com>
Reviewed by Beth.
Moved JSCheckScriptSyntax, JSEvaluateScript, and JSGarbageCollect into
JSBase.h/.cpp. They don't belong in the value-specific or context-specific
files because they're not part of the value or context implementations.
* API/JSBase.h:
* API/JSContextRef.cpp:
(JSContextGetGlobalObject):
* API/JSContextRef.h:
* API/JSValueRef.cpp:
(JSValueUnprotect):
* API/JSValueRef.h:
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-13 Timothy Hatcher <timothy@apple.com>
Reviewed by Maciej.
Moved JavaScriptCore to be a public framework.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-13 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by Geoffrey.
http://bugs.webkit.org/show_bug.cgi?id=9742
Bug 9742: REGRESSION: WebKit hangs when loading <http://www.vtbook.com>
* kjs/value.h:
(KJS::JSValue::getUInt32): Only types tagged as numeric can be converted to UInt32.
2006-07-13 Geoffrey Garen <ggaren@apple.com>
Pleasing to Maciej.
- Renamed JSEvaluate -> JSEvaluateScript, JSCheckSyntax -> JSCheckScriptSyntax
- Added exception out parameters to JSValueTo* and JSValueIsEqual because
they can throw
- Removed JSObjectGetDescription because it's useless and vague, and
JSValueToString/JSValueIsObjectOfClass do a better job, anyway
- Clarified comments about "IsFunction/Constructor" to indicate that they
are true of all functions/constructors, not just those created by JSObjectMake*
2006-07-12 Geoffrey Garen <ggaren@apple.com>
RS by Beth.
Finished previously approved JSInternalString -> JSString conversion
by renaming the files.
* API/JSCallbackObject.cpp:
* API/JSInternalStringRef.cpp: Removed.
* API/JSInternalStringRef.h: Removed.
* API/JSStringRef.cpp: Added.
* API/JSStringRef.h: Added.
* API/JavaScriptCore.h:
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-12 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Removed context and exception parameters from JSObjectGetPropertyEnumerator,
removing the spurious use of ExecState inside JavaScriptCore that made
us think this was necessary in the first place.
(StringInstance::getPropertyList): Use getString instead of toString because
we know we're dealing with a string -- we put it there in the first place.
While we're at it, store the string's size instead of retrieving it each time
through the loop, to avoid the unnecessary killing of puppies.
* kjs/string_object.h:
2006-07-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- add handling of hasInstance callback for API objects
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::implementsHasInstance): Check if callback is present.
(KJS::JSCallbackObject::hasInstance): Invoke appropriate callback.
* API/JSCallbackObject.h:
* API/JSClassRef.cpp:
* API/JSObjectRef.h:
* API/testapi.c:
(MyObject_hasInstance): Test case; should match what construct would do.
* API/testapi.js:
2006-07-11 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Implemented a vast number of renames and comment clarifications
suggested during API review.
JSInternalString -> JSString
JS*Make -> JSValueMake*, JSObjectMake*
JSTypeCode -> JSType
JSValueIsInstanceOf -> JSValueIsInstanceOfConstructor (reads strangely well in client code)
JSGC*Protect -> JSValue*Protect
JS*Callback -> JSObject*Callback
JSGetPropertyListCallback -> JSObjectAddPropertiesToListCallback
JSPropertyEnumeratorGetNext -> JSPropertyEnumeratorGetNextName
JSString* ->
JSStringCreateWithUTF8CString, JSStringGetUTF8CString,
JSStringGetMaximumUTF8CStringSize JSStringIsEqualToUTF8CString,
JSStringCreateWithCFString, JSStringCopyCFString, JSStringCreateWithCharacters.
- Changed functions taking a JSValue out arg and returning a bool indicating
whether it was set to simply return a JSValue or NULL.
- Removed JSStringGetCharacters because it's more documentation than code,
and it's just a glorified memcpy built on existing API functionality.
- Moved standard library includes into the headers that actually require them.
- Standardized use of the phrase "Create Rule."
- Removed JSLock from make functions that don't allocate.
- Added exception handling to JSValueToBoolean, since we now allow
callback objects to throw exceptions upon converting to boolean.
- Renamed JSGCCollect to JSGarbageCollect.
2006-07-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- Changed public header includes to the <JavaScriptCore/ style.
- Changed instances of 'buffer' to 'string' since we decided on
JSInternalString instead of JSStringBuffer.
* API/JSContextRef.h:
* API/JSInternalStringRef.cpp:
(JSStringMake):
(JSInternalStringRetain):
(JSInternalStringRelease):
(JSValueCopyStringValue):
(JSInternalStringGetLength):
(JSInternalStringGetCharactersPtr):
(JSInternalStringGetCharacters):
(JSInternalStringGetMaxLengthUTF8):
(JSInternalStringGetCharactersUTF8):
(CFStringCreateWithJSInternalString):
* API/JSInternalStringRef.h:
* API/JSNode.c:
(JSNodePrototype_appendChild):
(JSNode_getNodeType):
* API/JSObjectRef.cpp:
(JSObjectCallAsConstructor):
* API/JSValueRef.h:
* API/JavaScriptCore.h:
* API/minidom.c:
(main):
(print):
* API/testapi.c:
(MyObject_getPropertyList):
(myConstructor_callAsConstructor):
(main): I noticed that we were prematurely releasing some string buffers,
so I moved their release calls to the end of main(). I got rid of 'Buf' in *Buf
(sometimes changing to 'IString', when necessary to differentiate a variable)
to match the buffer->string change.
=== Safari-521.16 ===
2006-07-10 Darin Adler <darin@apple.com>
* kjs/value.cpp: (KJS::JSValue::toInt32Inline): Added inline keyword one more place.
Just in case.
2006-07-10 Darin Adler <darin@apple.com>
- fix the release build
* kjs/value.h:
* kjs/value.cpp:
(KJS::JSValue::toInt32Inline): Move the code here to an inline.
(KJS::JSValue::toInt32): Call the inline from both overloaded toInt32 functions.
2006-07-10 David Kilzer <ddkilzer@kilzer.net>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=9179
Implement select.options.add() method
* JavaScriptCore.exp: Added overloaded KJS::JSValue::toInt32() method.
* JavaScriptCore.xcodeproj/project.pbxproj: Altered attributes metadata for
kjs/value.h to make it available as a forwarded header.
* kjs/lookup.h:
(KJS::lookupPut): Extracted a lookupPut() method from the existing lookupPut() method.
The new method returns a boolean value if no entry is found in the lookup table.
* kjs/value.cpp:
(KJS::JSValue::toInt32): Overloaded toInt32() method with boolean "Ok" argument.
* kjs/value.h: Ditto.
2006-07-10 Geoffrey Garen <ggaren@apple.com>
No review necessary. Removed bogus file I accidentally checked in before.
* API/JSInternalSringRef.h: Removed.
2006-07-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
Added exception out parameter to API object callbacks, removed semi-bogus
JSContext(.*)Exception functions.
To make these calls syntactically simple, I added an exceptionSlot()
method to the ExecState class, which provides a JSValue** slot in which to
store a JSValue* exception.
* API/APICast.h:
(toRef):
* API/JSCallbackConstructor.cpp:
(KJS::JSCallbackConstructor::construct):
* API/JSCallbackFunction.cpp:
(KJS::JSCallbackFunction::callAsFunction):
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::init):
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::callAsFunction):
(KJS::JSCallbackObject::getPropertyList):
(KJS::JSCallbackObject::toBoolean):
(KJS::JSCallbackObject::toNumber):
(KJS::JSCallbackObject::toString):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::callbackGetter):
* API/JSContextRef.cpp:
(JSCheckSyntax):
* API/JSContextRef.h:
* API/JSNode.c:
(JSNodePrototype_appendChild):
(JSNodePrototype_removeChild):
(JSNodePrototype_replaceChild):
(JSNode_getNodeType):
(JSNode_getChildNodes):
(JSNode_getFirstChild):
(JSNode_construct):
* API/JSNode.h:
* API/JSNodeList.c:
(JSNodeListPrototype_item):
(JSNodeList_length):
(JSNodeList_getProperty):
* API/JSObjectRef.h:
* API/minidom.c:
(print):
* API/testapi.c:
(MyObject_initialize):
(MyObject_hasProperty):
(MyObject_getProperty):
(MyObject_setProperty):
(MyObject_deleteProperty):
(MyObject_getPropertyList):
(MyObject_callAsFunction):
(MyObject_callAsConstructor):
(MyObject_convertToType):
(print_callAsFunction):
(myConstructor_callAsConstructor):
(main):
* JavaScriptCore.exp:
* kjs/ExecState.h:
(KJS::ExecState::exceptionHandle):
2006-07-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
Improved type safety by implementing opaque JSValue/JSObject typing through
abuse of 'const', not void*. Also fixed an alarming number of bugs
exposed by this new type safety.
I made one design change in JavaScriptCore, which is that the JSObject
constructor should take a JSValue* as its prototype argument, not a JSObject*,
since we allow the prototype to be any JSValue*, including jsNull(), for
example.
* API/APICast.h:
(toJS):
* API/JSBase.h:
* API/JSCallbackConstructor.cpp:
(KJS::JSCallbackConstructor::construct):
* API/JSCallbackFunction.cpp:
(KJS::JSCallbackFunction::callAsFunction):
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::JSCallbackObject):
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::callAsFunction):
(KJS::JSCallbackObject::staticFunctionGetter):
* API/JSCallbackObject.h:
* API/JSContextRef.cpp:
(JSEvaluate):
* API/JSNode.c:
(JSNodePrototype_appendChild):
(JSNodePrototype_removeChild):
(JSNodePrototype_replaceChild):
* API/JSObjectRef.cpp:
(JSObjectMake):
(JSFunctionMakeWithBody):
(JSObjectGetProperty):
(JSObjectCallAsFunction):
(JSObjectCallAsConstructor):
* API/JSObjectRef.h:
* API/testapi.c:
(main):
* ChangeLog:
* kjs/object.h:
(KJS::JSObject::JSObject):
2006-07-10 Geoffrey Garen <ggaren@apple.com>
Approved by Maciej, Darin.
Renamed JSStringBufferRef to JSInternalStringRef. "Internal string" means the
JavaScript engine's internal string representation, which is the most
low-level and efficient representation to use when interfacing with JavaScript.
* API/APICast.h:
(toJS):
(toRef):
* API/JSBase.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::callbackGetter):
* API/JSContextRef.cpp:
(JSEvaluate):
(JSCheckSyntax):
* API/JSContextRef.h:
* API/JSInternalStringRef.cpp: Added.
(JSStringMake):
(JSInternalStringCreate):
(JSInternalStringCreateUTF8):
(JSInternalStringRetain):
(JSInternalStringRelease):
(JSValueCopyStringValue):
(JSInternalStringGetLength):
(JSInternalStringGetCharactersPtr):
(JSInternalStringGetCharacters):
(JSInternalStringGetMaxLengthUTF8):
(JSInternalStringGetCharactersUTF8):
(JSInternalStringIsEqual):
(JSInternalStringIsEqualUTF8):
(JSInternalStringCreateCF):
(CFStringCreateWithJSInternalString):
* API/JSInternalStringRef.h: Added.
* API/JSNode.c:
(JSNodePrototype_appendChild):
(JSNode_getNodeType):
(JSNode_getChildNodes):
(JSNode_getFirstChild):
* API/JSNodeList.c:
(JSNodeList_length):
(JSNodeList_getProperty):
* API/JSObjectRef.cpp:
(JSFunctionMakeWithBody):
(JSObjectGetDescription):
(JSObjectHasProperty):
(JSObjectGetProperty):
(JSObjectSetProperty):
(JSObjectDeleteProperty):
(JSPropertyEnumeratorGetNext):
(JSPropertyListAdd):
* API/JSObjectRef.h:
* API/JSStringBufferRef.cpp: Removed.
* API/JSStringBufferRef.h: Removed.
* API/JSValueRef.h:
* API/JavaScriptCore.h:
* API/minidom.c:
(main):
(print):
* API/testapi.c:
(assertEqualsAsUTF8String):
(assertEqualsAsCharactersPtr):
(assertEqualsAsCharacters):
(MyObject_hasProperty):
(MyObject_getProperty):
(MyObject_setProperty):
(MyObject_deleteProperty):
(MyObject_getPropertyList):
(print_callAsFunction):
(myConstructor_callAsConstructor):
(main):
* JavaScriptCore.exp:
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-08 Tim Omernick <timo@apple.com>
Reviewed by Maciej.
Added an OpenGL drawing model to the Netscape Plug-in API.
* bindings/npapi.h:
2006-07-08 Timothy Hatcher <timothy@apple.com>
Reviewed by Maciej.
Moved KJS_GetCreatedJavaVMs to jni_utility.cpp.
Switched KJS_GetCreatedJavaVMs over to use dlopen and dlsym
now that NSAddImage, NSLookupSymbolInImage and NSAddressOfSymbol
are deprecated in Leopard.
* JavaScriptCore.exp:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::KJS_GetCreatedJavaVMs):
* bindings/softlinking.c: Removed.
* bindings/softlinking.h: Removed.
2006-07-08 Geoffrey Garen <ggaren@apple.com>
Reviewed by Anders.
- Make JSObjectGetProperty return a JSValue or NULL, like JSEvaluate does.
* API/JSObjectRef.cpp:
(JSObjectGetProperty):
* API/JSObjectRef.h:
* API/testapi.c:
(main):
2006-07-08 Geoffrey Garen <ggaren@apple.com>
Style change -- no review necessary.
Use 0 instead of NULL in API .cpp files, to match our style guidelines.
* API/JSContextRef.cpp:
(JSEvaluate):
* API/JSObjectRef.cpp:
(JSFunctionMakeWithBody):
(JSObjectCallAsFunction):
(JSObjectCallAsConstructor):
* API/JSValueRef.cpp:
(JSValueToObject):
2006-07-08 Geoffrey Garen <ggaren@apple.com>
Reviewed by TimO.
- Added ability to pass NULL for thisObject when calling JSObjectCallAsFunction,
to match JSEvaluate.
* API/JSObjectRef.cpp:
(JSObjectCallAsFunction):
* API/JSObjectRef.h:
* API/testapi.c:
(main):
=== Safari-521.15 ===
2006-07-07 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Standardized which functions take a JSContext as an argument. The rule is:
if you might execute JavaScript, you take a JSContext, otherwise you don't.
The FIXME in JSObjectRef.h requires refactoring some parts of Interpreter,
but not API changes, so I'm putting it off until later.
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::JSCallbackObject):
(KJS::JSCallbackObject::init):
* API/JSCallbackObject.h:
* API/JSContextRef.cpp:
(JSContextCreate):
* API/JSContextRef.h:
* API/JSObjectRef.cpp:
(JSObjectMake):
(JSPropertyEnumeratorGetNext):
* API/JSObjectRef.h:
* API/testapi.c:
(MyObject_initialize):
(main):
* JavaScriptCore.exp:
* kjs/array_object.cpp:
(ArrayInstance::setLength):
(ArrayInstance::pushUndefinedObjectsToEnd):
* kjs/nodes.cpp:
(ForInNode::execute):
* kjs/reference.cpp:
(KJS::Reference::getPropertyName):
(KJS::Reference::getValue):
* kjs/reference.h:
* kjs/scope_chain.cpp:
(KJS::ScopeChain::print):
2006-07-06 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
More API action.
- Headerdoc finished
Semantic Changes:
- Added a JSContextRef argument to many functions, because you need a
JSContextRef for doing virtually anything. I expect to add this argument
to even more functions in a future patch.
- Removed the globalObjectPrototype argument to JSContextCreate because
you can't create an object until you have a context, so it's impossible
to pass a prototype object to JSContextCreate. That's OK because (1) there's
no reason to give the global object a prototype and (2) if you really want
to, you can just use a separate call to JSObjectSetPrototype.
- Removed the JSClassRef argument to JSClassCreate because it was unnecessary,
and you need to be able to make the global object's class before you've
created a JSContext.
- Added an optional exception parameter to JSFunctionMakeWithBody because anything
less would be uncivilized.
- Made the return value parameter to JSObjectGetProperty optional to match
all other return value parameters in the API.
- Made JSObjectSetPrivate/JSObjectGetPrivate work on JSCallbackFunctions
and JSCallbackConstructors. You could use an abstract base class or strategic
placement of m_privateData in the class structure to implement this, but
the former seemed like overkill, and the latter seemed too dangerous.
- Fixed a bug where JSPropertyEnumeratorGetNext would skip the first property.
Cosmetic Changes:
- Reversed the logic of the JSChar #ifdef to avoid confusing headerdoc
- Removed function names from @function declarations because headeroc
can parse them automatically, and I wanted to rule out manual mismatch.
- Changed Error::create to take a const UString& instead of a UString*
because it was looking at me funny.
- Renamed JSStringBufferCreateWithCFString to JSStringBufferCreateCF
because the latter is more concise and it matches JSStringBufferCreateUTF8.
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::getPropertyList):
(KJS::JSCallbackObject::toBoolean):
(KJS::JSCallbackObject::toNumber):
(KJS::JSCallbackObject::toString):
* API/JSClassRef.cpp:
(JSClassCreate):
* API/JSContextRef.cpp:
(JSContextCreate):
(JSContextSetException):
* API/JSContextRef.h:
* API/JSNode.c:
(JSNodePrototype_class):
(JSNode_class):
* API/JSNodeList.c:
(JSNodeListPrototype_class):
(JSNodeList_class):
* API/JSObjectRef.cpp:
(JSObjectGetProperty):
(JSObjectGetPrivate):
(JSObjectSetPrivate):
(JSObjectCallAsFunction):
(JSObjectCallAsConstructor):
(JSPropertyEnumeratorGetNext):
* API/JSObjectRef.h:
* API/JSStringBufferRef.cpp:
(JSStringBufferCreateCF):
* API/JSStringBufferRef.h:
* API/JSValueRef.cpp:
(JSValueIsInstanceOf):
* API/JSValueRef.h:
* API/minidom.c:
(main):
* API/minidom.js:
* API/testapi.c:
(MyObject_hasProperty):
(MyObject_setProperty):
(MyObject_deleteProperty):
(MyObject_getPropertyList):
(MyObject_convertToType):
(MyObject_class):
(main):
* JavaScriptCore.exp:
2006-07-07 Geoffrey Garen <ggaren@apple.com>
Reviewed by John.
- Fixed a few crashes resulting from NULL parameters to JSClassCreate.
* API/JSClassRef.cpp:
(JSClassCreate):
(JSClassRelease):
* API/testapi.c: Added test for NULL parameters.
(main):
2006-07-07 Geoffrey Garen <ggaren@apple.com>
Reviewed by John, mocked by Darin.
- Changed JSEvaluate to take a JSObjectRef instead of a JSValueRef as
"this," since "this" must be an object.
* API/JSContextRef.cpp:
(JSEvaluate):
* API/JSContextRef.h:
2006-07-07 Geoffrey Garen <ggaren@apple.com>
Reviewed by John.
- More headerdoc
* API/JSBase.h:
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-05 Geoffrey Garen <ggaren@apple.com>
RS by Beth.
Renamed JSCharBufferRef, which was universally unpopular, to JSStringBufferRef,
which, hopefully, will be less unpopular.
* API/APICast.h:
(toJS):
(toRef):
* API/JSBase.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::callbackGetter):
* API/JSCharBufferRef.cpp: Removed.
* API/JSCharBufferRef.h: Removed.
* API/JSContextRef.cpp:
(JSEvaluate):
(JSCheckSyntax):
* API/JSContextRef.h:
* API/JSNode.c:
(JSNodePrototype_appendChild):
(JSNode_getNodeType):
(JSNode_getChildNodes):
(JSNode_getFirstChild):
* API/JSNodeList.c:
(JSNodeList_length):
(JSNodeList_getProperty):
* API/JSObjectRef.cpp:
(JSFunctionMakeWithBody):
(JSObjectGetDescription):
(JSObjectHasProperty):
(JSObjectGetProperty):
(JSObjectSetProperty):
(JSObjectDeleteProperty):
(JSPropertyEnumeratorGetNext):
(JSPropertyListAdd):
* API/JSObjectRef.h:
* API/JSStringBufferRef.cpp: Added.
(JSStringMake):
(JSStringBufferCreate):
(JSStringBufferCreateUTF8):
(JSStringBufferRetain):
(JSStringBufferRelease):
(JSValueCopyStringValue):
(JSStringBufferGetLength):
(JSStringBufferGetCharactersPtr):
(JSStringBufferGetCharacters):
(JSStringBufferGetMaxLengthUTF8):
(JSStringBufferGetCharactersUTF8):
(JSStringBufferIsEqual):
(JSStringBufferIsEqualUTF8):
(JSStringBufferCreateWithCFString):
(CFStringCreateWithJSStringBuffer):
* API/JSStringBufferRef.h: Added.
* API/JSValueRef.h:
* API/JavaScriptCore.h:
* API/minidom.c:
(main):
(print):
* API/testapi.c:
(assertEqualsAsUTF8String):
(assertEqualsAsCharactersPtr):
(assertEqualsAsCharacters):
(MyObject_hasProperty):
(MyObject_getProperty):
(MyObject_setProperty):
(MyObject_deleteProperty):
(MyObject_getPropertyList):
(print_callAsFunction):
(myConstructor_callAsConstructor):
(main):
* JavaScriptCore.exp:
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-05 Geoffrey Garen <ggaren@apple.com>
RS by Beth.
Moved some code around for more logical file separation.
* API/JSBase.h:
* API/JSContextRef.h:
* API/JSObjectRef.cpp:
* API/JSValueRef.cpp:
(JSValueToObject):
* API/JSValueRef.h:
2006-07-03 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
Implemented JSFunctionMakeWithBody, which parses a script as a function body
in the global scope, and returns the resulting anonymous function.
I also removed private data from JSCallbackFunction. It never worked,
since JSCallbackFunction doesn't inherit from JSCallbackObject.
* API/JSCallbackConstructor.cpp: Removed.
* API/JSCallbackConstructor.h: Removed.
* API/JSCallbackFunction.cpp:
(KJS::JSCallbackFunction::JSCallbackFunction):
(KJS::JSCallbackFunction::implementsConstruct):
(KJS::JSCallbackFunction::construct):
(KJS::JSCallbackFunction::implementsCall):
(KJS::JSCallbackFunction::callAsFunction):
* API/JSCallbackFunction.h:
* API/JSCallbackObject.cpp:
(KJS::JSCallbackObject::staticFunctionGetter):
* API/JSObjectRef.cpp:
(JSFunctionMake):
(JSFunctionMakeWithCallbacks):
* API/JSObjectRef.h:
* API/JSValueRef.h:
* API/minidom.c:
(main):
* API/testapi.c:
(main):
* JavaScriptCore.exp: Programmatically added all symbols exported by
API object files, and sorted results
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-07-03 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Return syntax error in JSCheckSyntax through a JSValueRef* exception
argument
* API/JSBase.h:
* API/JSContextRef.cpp:
(JSCheckSyntax):
* API/testapi.c:
(main):
* JavaScriptCore.exp:
* kjs/interpreter.cpp:
(KJS::Interpreter::checkSyntax):
* kjs/interpreter.h:
2006-07-04 Darin Adler <darin@apple.com>
- fixed build
* wtf/MathExtras.h: Oops. Added missing #endif.
2006-07-04 Bjoern Graf <bjoern.graf@gmail.com>
Reviewed by Maciej.
Tweaked a bit by Darin.
- http://bugs.webkit.org/show_bug.cgi?id=9678
work around MSVCRT's fmod function returning NaN for fmod(x, infinity) instead of x
* wtf/MathExtras.h: Added include of <float.h>.
(isinf): Fix to return false for NAN.
(wtf_fmod): Added. An inline that works around the bug.
* kjs/nodes.cpp:
* kjs/number_object.cpp:
* kjs/operations.cpp:
* kjs/value.cpp:
Added includes of MathExtras.h to all files using fmod.
* JavaScriptCore.xcodeproj/project.pbxproj: Let Xcode 2.3 have its way with
the project.
2006-07-01 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- Refined value conversions in the API:
- failed toNumber returns NaN
- failed toObject returns NULL
- failed toString returns empty string
- Refined excpetion handling in the API:
- failed value conversions do not throw exceptions
- uncaught exceptions in JSEvaluate, JSObjectCallAsFunction, and
JSObjectCallAsConstructor are returned through a JSValueRef* exception
argument
- removed JSContextHasException, because JSContextGetException does
the same job
* API/JSBase.h:
* API/JSCharBufferRef.cpp:
(JSValueCopyStringValue):
* API/JSContextRef.cpp:
(JSEvaluate):
* API/JSContextRef.h:
* API/JSNodeList.c: Added test code demonstrating how you would use
toNumber, and why you probably don't need toUInt32, etc.
(JSNodeListPrototype_item):
(JSNodeList_getProperty):
* API/JSObjectRef.cpp:
(JSValueToObject):
(JSObjectCallAsFunction):
(JSObjectCallAsConstructor):
* API/JSObjectRef.h:
* API/JSValueRef.cpp:
(JSValueToNumber):
* API/JSValueRef.h:
* API/minidom.c:
(main):
* API/testapi.c:
(main): Added tests for new rules, and call to JSGCProtect to fix Intel
crash
* JavaScriptCore.exp:
2006-07-03 Darin Adler <darin@apple.com>
- Rolled out HashMap implementation of NPRuntime, at least temporarily.
Fixes hang in the bindings section of layout tests seen on the
buildbot.
This code was using HashMap<const char*, PrivateIdentifier*>.
But that hashes based on pointer identity, not string value.
The default hash for any pointer type is to hash based on the pointer.
And WTF doesn't currently have a string hash for char*.
We'll need to fix that before re-landing this patch.
(Formatting was also incorrect -- extra spaces in parentheses.)
* bindings/npruntime.cpp: Rolled out last change.
2006-07-02 Justin Haygood <jhaygood@spsu.edu>
Reviewed, tweaked, landed by ggaren.
- Port NPRuntime from CFDictionary to HashMap.
* bindings/npruntime.cpp:
(getStringIdentifierDictionary):
(getIntIdentifierDictionary):
(_NPN_GetStringIdentifier):
(_NPN_GetIntIdentifier):
* bindings/npruntime.h:
2006-07-01 Geoffrey Garen <ggaren@apple.com>
Reviewed by Adele.
- Fixed <rdar://problem/4611197> REGRESSION: Liveconnect with Java test
fails at http://www-sor.inria.fr/~dedieu/notes/liveconnect/simple_example.html
* JavaScriptCore.exp: Export symbols used by liveconnect
2006-06-29 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Phase 2 in the JS API.
- Added support for specifying static tables of values -- this should
obviate the need for using complicated callbacks for most lookups.
- API objects are now created with classes (JSClassRef) -- in order to support
static values, and in order to prevent API objects from storing their
data inline, and thus falling into the oversized (read: slow and prone to
giving Maciej the frowny face) heap.
- Added two specialized JSObject subclasses -- JSCallbackFunction and JSCallbackConstructor --
to allow JSFunctionMake and JSConstructorMake to continue to work with
the new class model. Another solution to this problem would be to create
a custom class object for each function and constructor you make. This
solution is more code but also more efficient.
- Substantially beefed up the minidom example to demonstrate and test a
lot of these techniques. Its output is still pretty haphazard, though.
- Gave the <kjs/ preface to some includes -- I'm told this matters to
building on some versions of Linux.
- Implemented JSValueIsInstanceOf and JSValueIsObjectOfClass
- Removed GetDescription callback. Something in the class datastructure
should take care of this.
* API/JSBase.h:
* API/JSCallbackConstructor.cpp: Added.
(KJS::):
(KJS::JSCallbackConstructor::JSCallbackConstructor):
(KJS::JSCallbackConstructor::implementsConstruct):
(KJS::JSCallbackConstructor::construct):
(KJS::JSCallbackConstructor::setPrivate):
(KJS::JSCallbackConstructor::getPrivate):
* API/JSCallbackConstructor.h: Added.
(KJS::JSCallbackConstructor::classInfo):
* API/JSCallbackFunction.cpp: Added.
(KJS::):
(KJS::JSCallbackFunction::JSCallbackFunction):
(KJS::JSCallbackFunction::implementsCall):
(KJS::JSCallbackFunction::callAsFunction):
(KJS::JSCallbackFunction::setPrivate):
(KJS::JSCallbackFunction::getPrivate):
* API/JSCallbackFunction.h: Added.
(KJS::JSCallbackFunction::classInfo):
* API/JSCallbackObject.cpp:
(KJS::):
(KJS::JSCallbackObject::JSCallbackObject):
(KJS::JSCallbackObject::init):
(KJS::JSCallbackObject::~JSCallbackObject):
(KJS::JSCallbackObject::className):
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::implementsConstruct):
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::implementsCall):
(KJS::JSCallbackObject::callAsFunction):
(KJS::JSCallbackObject::getPropertyList):
(KJS::JSCallbackObject::toBoolean):
(KJS::JSCallbackObject::toNumber):
(KJS::JSCallbackObject::toString):
(KJS::JSCallbackObject::inherits):
(KJS::JSCallbackObject::staticValueGetter):
(KJS::JSCallbackObject::staticFunctionGetter):
(KJS::JSCallbackObject::callbackGetter):
* API/JSCallbackObject.h:
* API/JSCharBufferRef.cpp:
* API/JSClassRef.cpp: Added.
(JSClassCreate):
(JSClassRetain):
(JSClassRelease):
* API/JSClassRef.h: Added.
(StaticValueEntry::StaticValueEntry):
(StaticFunctionEntry::StaticFunctionEntry):
(__JSClass::__JSClass):
* API/JSContextRef.cpp:
(JSContextCreate):
(JSEvaluate):
* API/JSContextRef.h:
* API/JSNode.c: Added.
(JSNodePrototype_appendChild):
(JSNodePrototype_removeChild):
(JSNodePrototype_replaceChild):
(JSNodePrototype_class):
(JSNode_getNodeType):
(JSNode_getChildNodes):
(JSNode_getFirstChild):
(JSNode_finalize):
(JSNode_class):
(JSNode_prototype):
(JSNode_new):
(JSNode_construct):
* API/JSNode.h: Added.
* API/JSNodeList.c: Added.
(JSNodeListPrototype_item):
(JSNodeListPrototype_class):
(JSNodeList_length):
(JSNodeList_getProperty):
(JSNodeList_finalize):
(JSNodeList_class):
(JSNodeList_prototype):
(JSNodeList_new):
* API/JSNodeList.h: Added.
* API/JSObjectRef.cpp:
(JSObjectMake):
(JSFunctionMake):
(JSConstructorMake):
(__JSPropertyEnumerator::__JSPropertyEnumerator):
(JSObjectCreatePropertyEnumerator):
(JSPropertyEnumeratorGetNext):
(JSPropertyEnumeratorRetain):
(JSPropertyEnumeratorRelease):
* API/JSObjectRef.h:
(__JSObjectCallbacks::):
* API/JSValueRef.cpp:
(JSValueIsObjectOfClass):
(JSValueIsInstanceOf):
* API/JSValueRef.h:
* API/Node.c: Added.
(Node_new):
(Node_appendChild):
(Node_removeChild):
(Node_replaceChild):
(Node_ref):
(Node_deref):
* API/Node.h: Added.
* API/NodeList.c: Added.
(NodeList_new):
(NodeList_length):
(NodeList_item):
(NodeList_ref):
(NodeList_deref):
* API/NodeList.h: Added.
* API/minidom.c:
(main):
(print):
(createStringWithContentsOfFile):
* API/minidom.js:
* API/testapi.c:
(assertEqualsAsCharacters):
(MyObject_getProperty):
(MyObject_class):
(myConstructor_callAsConstructor):
(main):
* API/testapi.js:
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-06-26 Kevin Ollivier <kevino@theolliviers.com>
Reviewed and tweaked by Darin.
- Compile fixes for wx port / gcc 4.0.2
* kjs/array_object.cpp:
Added missing headers.
* kjs/ExecState.h:
gcc needs class prototypes before defining those classes as friend classes
2006-06-30 Mike Emmel <mike.emmel@gmail.com>
Reviewed by Darin.
Compilation fixes for Linux/Gdk.
* JavaScriptCore/kjs/interpreter.cpp: added include of signal.h
* JavaScriptCore/kjs/ExecState.h: added missing class declaration
* JavaScriptCore/kjs/ExecState.cpp: case wrong on include of context.h
* JavaScriptCore/JavaScriptCoreSources.bkl: added Context.cpp and ExecState.cpp
=== Safari-521.14 ===
2006-06-29 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- add headerdoc comments to some of the new JS API headers
* API/JSBase.h:
* API/JSValueRef.h:
2006-06-28 Timothy Hatcher <timothy@apple.com>
Prefer the Stabs debugging symbols format until DWARF bugs are fixed.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-06-27 Timothy Hatcher <timothy@apple.com>
Reviewed by Tim O.
<rdar://problem/4448350> Deprecated ObjC language API used in JavaScriptCore, WebCore, WebKit and WebBrowser
Switch to the new ObjC 2 API, ifdefed the old code around OBJC_API_VERSION so it still works on Tiger.
Removed the use of the old stringWithCString, switched to the new Tiger version that accepts an encoding.
Lots of code style cleanup.
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::~ObjcClass):
(KJS::Bindings::_createClassesByIsAIfNecessary):
(KJS::Bindings::ObjcClass::classForIsA):
(KJS::Bindings::ObjcClass::name):
(KJS::Bindings::ObjcClass::methodsNamed):
(KJS::Bindings::ObjcClass::fieldNamed):
(KJS::Bindings::ObjcClass::fallbackObject):
* bindings/objc/objc_header.h:
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::ObjcInstance):
(ObjcInstance::~ObjcInstance):
(ObjcInstance::operator=):
(ObjcInstance::begin):
(ObjcInstance::end):
(ObjcInstance::getClass):
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
(ObjcInstance::setValueOfField):
(ObjcInstance::supportsSetValueOfUndefinedField):
(ObjcInstance::setValueOfUndefinedField):
(ObjcInstance::getValueOfField):
(ObjcInstance::getValueOfUndefinedField):
(ObjcInstance::defaultValue):
(ObjcInstance::stringValue):
(ObjcInstance::numberValue):
(ObjcInstance::booleanValue):
(ObjcInstance::valueOf):
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcMethod::ObjcMethod):
(ObjcMethod::name):
(ObjcMethod::getMethodSignature):
(ObjcMethod::setJavaScriptName):
(ObjcField::name):
(ObjcField::type):
(ObjcField::valueFromInstance):
(convertValueToObjcObject):
(ObjcField::setValueToInstance):
(ObjcArray::operator=):
(ObjcArray::setValueAt):
(ObjcArray::valueAt):
(ObjcFallbackObjectImp::ObjcFallbackObjectImp):
(ObjcFallbackObjectImp::callAsFunction):
(ObjcFallbackObjectImp::defaultValue):
2006-06-28 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
http://bugs.webkit.org/show_bug.cgi?id=8636
REGRESSION: JavaScript access to Java applet causes hang (_webViewURL not implemented)
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
Just pass nil as the calling URL. This will cause the Java plugin to use the URL of the page
containing the applet (which is what we used to do).
2006-06-27 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
<rdar://problem/4406785> Add an export file to TOT JavaScriptCore like the Safari-2-0-branch
* JavaScriptCore.exp: Added.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-06-25 Geoffrey Garen <ggaren@apple.com>
Reviewed by Adele.
- Added JSConstructorMake to match JSFunctionMake, along with test code.
[ I checked in the ChangeLog before without the actual files. ]
* API/JSObjectRef.cpp:
(JSConstructorMake):
* API/JSObjectRef.h:
* API/testapi.c:
(myConstructor_callAsConstructor):
(main):
* API/testapi.js:
* ChangeLog:
* JavaScriptCore.xcodeproj/project.pbxproj: Moved testapi.c to the testapi
target -- this was an oversight in my earlier check-in.
2006-06-25 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
Bug 9574: Drosera should show inline scripts within the original HTML
http://bugs.webkit.org/show_bug.cgi?id=9574
Pass the starting line number and error message to the debugger.
* kjs/debugger.cpp:
(Debugger::sourceParsed):
* kjs/debugger.h:
* kjs/function.cpp:
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/interpreter.cpp:
(KJS::Interpreter::evaluate):
2006-06-24 Alexey Proskuryakov <ap@nypop.com>
Rubber-stamped by Eric.
Add a -h (do not follow symlinks) option to ln in derived sources build script (without it,
a symlink was created inside the source directory on second build).
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-06-24 David Kilzer <ddkilzer@kilzer.net>
Reviewed by Timothy.
* Info.plist: Fixed copyright to include 2003-2006.
2006-06-24 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
- http://bugs.webkit.org/show_bug.cgi?id=9418
WebKit will not build when Space exists in path
* JavaScriptCore.xcodeproj/project.pbxproj: Enclose search paths in quotes; create symlinks to
avoid passing paths with spaces to make.
2006-06-23 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
Adding more operator[] overloads for long and short types.
* wtf/Vector.h:
(WTF::Vector::operator[]):
=== JavaScriptCore-521.13 ===
2006-06-22 Alexey Proskuryakov <ap@nypop.com>
Build fix.
- http://bugs.webkit.org/show_bug.cgi?id=9539
Another case error preventing build
* API/JSObjectRef.cpp: Changed "identifier.h" to "Identifier.h"
2006-06-22 David Kilzer <ddkilzer@kilzer.net>
Build fix.
http://bugs.webkit.org/show_bug.cgi?id=9539
Another case error preventing build
* API/APICast.h: Changed "UString.h" to "ustring.h".
2006-06-21 Geoffrey Garen <ggaren@apple.com>
Fixed release build, fixed accidental infinite recursion due to
last minute global replace gone awry.
* API/APICast.h:
(toRef):
* API/testapi.c:
(assertEqualsAsBoolean):
(assertEqualsAsNumber):
(assertEqualsAsUTF8String):
(assertEqualsAsCharactersPtr):
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-06-21 Geoffrey Garen <ggaren@apple.com>
Reviewed by Anders.
- First cut at C API to JavaScript. Includes a unit test, 'testapi.c',
and the outline of a test app, 'minidom.c'.
Includes one change to JSC internals: Rename propList to getPropertyList and have it
take its target property list by reference so that subclasses can
add properties to the list before calling through to their superclasses.
Also, I just ran prepare-ChangeLog in about 10 seconds, and I would like
to give a shout-out to that.
* API/APICast.h: Added.
(toJS):
(toRef):
* API/JSBase.h: Added.
* API/JSCallbackObject.cpp: Added.
(KJS::):
(KJS::JSCallbackObject::JSCallbackObject):
(KJS::JSCallbackObject::~JSCallbackObject):
(KJS::JSCallbackObject::className):
(KJS::JSCallbackObject::getOwnPropertySlot):
(KJS::JSCallbackObject::put):
(KJS::JSCallbackObject::deleteProperty):
(KJS::JSCallbackObject::implementsConstruct):
(KJS::JSCallbackObject::construct):
(KJS::JSCallbackObject::implementsCall):
(KJS::JSCallbackObject::callAsFunction):
(KJS::JSCallbackObject::getPropertyList):
(KJS::JSCallbackObject::toBoolean):
(KJS::JSCallbackObject::toNumber):
(KJS::JSCallbackObject::toString):
(KJS::JSCallbackObject::setPrivate):
(KJS::JSCallbackObject::getPrivate):
(KJS::JSCallbackObject::cachedValueGetter):
(KJS::JSCallbackObject::callbackGetter):
* API/JSCallbackObject.h: Added.
(KJS::JSCallbackObject::classInfo):
* API/JSCharBufferRef.cpp: Added.
(JSStringMake):
(JSCharBufferCreate):
(JSCharBufferCreateUTF8):
(JSCharBufferRetain):
(JSCharBufferRelease):
(JSValueCopyStringValue):
(JSCharBufferGetLength):
(JSCharBufferGetCharactersPtr):
(JSCharBufferGetCharacters):
(JSCharBufferGetMaxLengthUTF8):
(JSCharBufferGetCharactersUTF8):
(JSCharBufferIsEqual):
(JSCharBufferIsEqualUTF8):
(JSCharBufferCreateWithCFString):
(CFStringCreateWithJSCharBuffer):
* API/JSCharBufferRef.h: Added.
* API/JSContextRef.cpp: Added.
(JSContextCreate):
(JSContextDestroy):
(JSContextGetGlobalObject):
(JSEvaluate):
(JSCheckSyntax):
(JSContextHasException):
(JSContextGetException):
(JSContextClearException):
(JSContextSetException):
* API/JSContextRef.h: Added.
* API/JSObjectRef.cpp: Added.
(JSValueToObject):
(JSObjectMake):
(JSFunctionMake):
(JSObjectGetDescription):
(JSObjectGetPrototype):
(JSObjectSetPrototype):
(JSObjectHasProperty):
(JSObjectGetProperty):
(JSObjectSetProperty):
(JSObjectDeleteProperty):
(JSObjectGetPrivate):
(JSObjectSetPrivate):
(JSObjectIsFunction):
(JSObjectCallAsFunction):
(JSObjectIsConstructor):
(JSObjectCallAsConstructor):
(__JSPropertyListEnumerator::__JSPropertyListEnumerator):
(JSObjectCreatePropertyEnumerator):
(JSPropertyEnumeratorGetNext):
(JSPropertyEnumeratorRetain):
(JSPropertyEnumeratorRelease):
(JSPropertyListAdd):
* API/JSObjectRef.h: Added.
* API/JSValueRef.cpp: Added.
(JSValueGetType):
(JSValueIsUndefined):
(JSValueIsNull):
(JSValueIsBoolean):
(JSValueIsNumber):
(JSValueIsString):
(JSValueIsObject):
(JSValueIsEqual):
(JSValueIsStrictEqual):
(JSUndefinedMake):
(JSNullMake):
(JSBooleanMake):
(JSNumberMake):
(JSValueToBoolean):
(JSValueToNumber):
(JSGCProtect):
(JSGCUnprotect):
(JSGCCollect):
* API/JSValueRef.h: Added.
* API/JavaScriptCore.h: Added.
* API/minidom.c: Added.
(main):
* API/minidom.html: Added.
* API/minidom.js: Added.
* API/testapi.c: Added.
(assertEqualsAsBoolean):
(assertEqualsAsNumber):
(assertEqualsAsUTF8String):
(assertEqualsAsCharactersPtr):
(assertEqualsAsCharacters):
(MyObject_initialize):
(MyObject_copyDescription):
(MyObject_hasProperty):
(MyObject_getProperty):
(MyObject_setProperty):
(MyObject_deleteProperty):
(MyObject_getPropertyList):
(MyObject_callAsFunction):
(MyObject_callAsConstructor):
(MyObject_convertToType):
(MyObject_finalize):
(print_callAsFunction):
(main):
(createStringWithContentsOfFile):
* API/testapi.js: Added.
* ChangeLog:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/npruntime_impl.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstance::getPropertyList):
* kjs/interpreter.cpp:
(KJS::Interpreter::evaluate):
* kjs/nodes.cpp:
(ForInNode::execute):
* kjs/object.cpp:
(KJS::JSObject::put):
(KJS::JSObject::canPut):
(KJS::JSObject::deleteProperty):
(KJS::JSObject::propertyIsEnumerable):
(KJS::JSObject::getPropertyAttributes):
(KJS::JSObject::getPropertyList):
* kjs/object.h:
* kjs/property_map.cpp:
(KJS::PropertyMap::get):
* kjs/property_map.h:
* kjs/scope_chain.cpp:
(KJS::ScopeChain::print):
* kjs/string_object.cpp:
(StringInstance::getPropertyList):
* kjs/string_object.h:
* kjs/ustring.h:
(KJS::UString::Rep::ref):
2006-06-20 Timothy Hatcher <timothy@apple.com>
Reviewed by Geoff.
Make sure we clear the exception before returning so
that future calls will not fail because of an earlier
exception state. Assert on entry that the WebScriptObject
is working with an ExecState that dose not have an exception.
Document that evaluateWebScript and callWebScriptMethod return
WebUndefined when an exception is thrown.
* bindings/objc/WebScriptObject.h:
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject webScriptValueAtIndex:]):
(-[WebScriptObject setWebScriptValueAtIndex:value:]):
2006-06-19 Anders Carlsson <acarlsson@apple.com>
Reviewed by John.
* kjs/interpreter.cpp:
(KJS::TimeoutChecker::pauseTimeoutCheck):
(KJS::TimeoutChecker::resumeTimeoutCheck):
Fix argument order in setitimer calls.
2006-06-18 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
* kjs/interpreter.cpp:
(KJS::TimeoutChecker::pauseTimeoutCheck):
Do nothing if the timeout check hasn't been started.
(KJS::TimeoutChecker::resumeTimeoutCheck):
Do nothing if the timeout check hasn't been started.
Use the right signal handler when unblocking.
(KJS::Interpreter::handleTimeout):
pause/resume the timeout check around the call to
shouldInterruptScript().
2006-06-16 Ben Goodger <beng@google.com>
Reviewed by Maciej
http://bugs.webkit.org/show_bug.cgi?id=9491
Windows build breaks in interpreter.cpp
* kjs/interpreter.cpp
(KJS::TimeoutChecker::pauseTimeoutCheck):
(KJS::TimeoutChecker::resumeTimeoutCheck):
Make sure to only assert equality with s_executingInterpreter when it
is being used (i.e. when HAVE(SYS_TIME_H) == true)
2006-06-17 David Kilzer <ddkilzer@kilzer.net>
Reviewed by darin.
http://bugs.webkit.org/show_bug.cgi?id=9477
REGRESSION: fast/dom/replaceChild.html crashes on WebKit ToT in debug build
* kjs/function.cpp:
(KJS::FunctionImp::callAsFunction): Refetch the debugger after executing the function
in case the WebFrame it was running in has since been destroyed.
2006-06-17 David Kilzer <ddkilzer@kilzer.net>
Reviewed by ggaren.
http://bugs.webkit.org/show_bug.cgi?id=9476
REGRESSION: Reproducible crash after closing window after viewing
css2.1/t0803-c5501-imrgn-t-00-b-ag.html
* kjs/debugger.cpp:
(Debugger::detach): Call setDebugger(0) for all interpreters removed from
the 'attached to a debugger' list.
2006-06-17 Anders Carlsson <acarlsson@apple.com>
Reviewed by Maciej and Geoff.
http://bugs.webkit.org/show_bug.cgi?id=7080
Provide some way to stop a JavaScript infinite loop
* kjs/completion.h:
(KJS::):
Add Interrupted completion type.
* kjs/function.cpp:
(KJS::FunctionImp::callAsFunction):
(KJS::GlobalFuncImp::callAsFunction):
Only set the exception on the new ExecState if the current one has had one.
* kjs/interpreter.cpp:
(KJS::TimeoutChecker::startTimeoutCheck):
(KJS::TimeoutChecker::stopTimeoutCheck):
(KJS::TimeoutChecker::alarmHandler):
(KJS::TimeoutChecker::pauseTimeoutCheck):
(KJS::TimeoutChecker::resumeTimeoutCheck):
New TimeoutChecker class which handles setting Interpreter::m_timedOut flag after a given
period of time. This currently only works on Unix platforms where setitimer and signals are used.
(KJS::Interpreter::Interpreter):
Initialize new member variables.
(KJS::Interpreter::~Interpreter):
Destroy the timeout checker.
(KJS::Interpreter::startTimeoutCheck):
(KJS::Interpreter::stopTimeoutCheck):
(KJS::Interpreter::pauseTimeoutCheck):
(KJS::Interpreter::resumeTimeoutCheck):
Call the timeout checker.
(KJS::Interpreter::handleTimeout):
Called on timeout. Resets the m_timedOut flag and calls shouldInterruptScript.
* kjs/interpreter.h:
(KJS::Interpreter::setTimeoutTime):
New function for setting the timeout time.
(KJS::Interpreter::shouldInterruptScript):
New function. The idea is that this should be overridden by subclasses in order to for example
pop up a dialog asking the user if the script should be interrupted.
(KJS::Interpreter::checkTimeout):
New function which checks the m_timedOut flag and calls handleTimeout if it's set.
* kjs/nodes.cpp:
(DoWhileNode::execute):
(WhileNode::execute):
(ForNode::execute):
Call Interpreter::checkTimeout after each iteration of the loop.
2006-06-15 Timothy Hatcher <timothy@apple.com>
Reviewed by Geoff and Darin.
Prefer the DWARF debugging symbols format for use in Xcode 2.3.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-06-14 Geoffrey Garen <ggaren@apple.com>
Reviewed by Beth.
- fixed http://bugs.webkit.org/show_bug.cgi?id=9438
Someone broke ToT: cannot build
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/runtime_root.h: Changed "Interpreter.h" to "interpreter.h"
2006-06-12 Geoffrey Garen <ggaren@apple.com>
build fix
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject throwException:]): Restore assignment I accidentally
deleted in previous commit
2006-06-12 Geoffrey Garen <ggaren@apple.com>
Reviewed by TimO, Maciej.
- Merged InterpreterImp code into Interpreter, which implements
all interpreter functionality now. This is part of my continuing quest
to create an external notion of JS "execution context" that is unified and simple --
something to replace the mix of Context, ContextImp, ExecState, Interpreter,
InterpreterImp, and JSRun.
All tests pass. Leaks test has not regressed from its baseline ~207 leaks
with ~3460 leaked nodes.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/NP_jsobject.cpp:
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject throwException:]):
* bindings/runtime_root.cpp:
* bindings/runtime_root.h:
* kjs/Context.cpp:
(KJS::Context::Context):
* kjs/ExecState.cpp: Added.
(KJS::ExecState::lexicalInterpreter):
* kjs/ExecState.h: Added.
(KJS::ExecState::dynamicInterpreter):
* kjs/SavedBuiltins.h: Added.
* kjs/bool_object.cpp:
(BooleanPrototype::BooleanPrototype):
* kjs/collector.cpp:
(KJS::Collector::collect):
(KJS::Collector::numInterpreters):
* kjs/context.h:
* kjs/debugger.cpp:
(Debugger::attach):
(Debugger::detach):
* kjs/function.cpp:
(KJS::FunctionImp::callAsFunction):
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/interpreter.cpp:
(KJS::interpreterMap):
(KJS::Interpreter::Interpreter):
(KJS::Interpreter::init):
(KJS::Interpreter::~Interpreter):
(KJS::Interpreter::globalObject):
(KJS::Interpreter::initGlobalObject):
(KJS::Interpreter::globalExec):
(KJS::Interpreter::checkSyntax):
(KJS::Interpreter::evaluate):
(KJS::Interpreter::builtinObject):
(KJS::Interpreter::builtinFunction):
(KJS::Interpreter::builtinArray):
(KJS::Interpreter::builtinBoolean):
(KJS::Interpreter::builtinString):
(KJS::Interpreter::builtinNumber):
(KJS::Interpreter::builtinDate):
(KJS::Interpreter::builtinRegExp):
(KJS::Interpreter::builtinError):
(KJS::Interpreter::builtinObjectPrototype):
(KJS::Interpreter::builtinFunctionPrototype):
(KJS::Interpreter::builtinArrayPrototype):
(KJS::Interpreter::builtinBooleanPrototype):
(KJS::Interpreter::builtinStringPrototype):
(KJS::Interpreter::builtinNumberPrototype):
(KJS::Interpreter::builtinDatePrototype):
(KJS::Interpreter::builtinRegExpPrototype):
(KJS::Interpreter::builtinErrorPrototype):
(KJS::Interpreter::builtinEvalError):
(KJS::Interpreter::builtinRangeError):
(KJS::Interpreter::builtinReferenceError):
(KJS::Interpreter::builtinSyntaxError):
(KJS::Interpreter::builtinTypeError):
(KJS::Interpreter::builtinURIError):
(KJS::Interpreter::builtinEvalErrorPrototype):
(KJS::Interpreter::builtinRangeErrorPrototype):
(KJS::Interpreter::builtinReferenceErrorPrototype):
(KJS::Interpreter::builtinSyntaxErrorPrototype):
(KJS::Interpreter::builtinTypeErrorPrototype):
(KJS::Interpreter::builtinURIErrorPrototype):
(KJS::Interpreter::mark):
(KJS::Interpreter::interpreterWithGlobalObject):
(KJS::Interpreter::saveBuiltins):
(KJS::Interpreter::restoreBuiltins):
* kjs/interpreter.h:
(KJS::Interpreter::setCompatMode):
(KJS::Interpreter::compatMode):
(KJS::Interpreter::firstInterpreter):
(KJS::Interpreter::nextInterpreter):
(KJS::Interpreter::prevInterpreter):
(KJS::Interpreter::debugger):
(KJS::Interpreter::setDebugger):
(KJS::Interpreter::setContext):
(KJS::Interpreter::context):
* kjs/nodes.cpp:
(StatementNode::hitStatement):
(RegExpNode::evaluate):
* kjs/protect.h:
2006-06-12 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Have *.lut.h files #include lookup.h to eliminate surprising header
include order dependency.
* DerivedSources.make:
* kjs/array_object.cpp:
* kjs/date_object.cpp:
* kjs/date_object.h:
(KJS::DateProtoFunc::):
* kjs/lexer.cpp:
* kjs/math_object.cpp:
* kjs/number_object.cpp:
* kjs/regexp_object.cpp:
* kjs/string_object.cpp:
2006-06-10 Geoffrey Garen <ggaren@apple.com>
- http://bugs.webkit.org/show_bug.cgi?id=8515
Linux porting compile bug
Fix by Mike Emmel, Reviewed by Darin.
* JavaScriptCoreSources.bkl:
* jscore.bkl:
* wtf/Platform.h:
2006-06-09 Geoffrey Garen <ggaren@apple.com>
Build fix -- I think :).
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/context.h:
2006-06-09 Geoffrey Garen <ggaren@apple.com>
Reviewed by Eric (yay!).
- Removed Context wrapper for ContextImp, renamed ContextImp to Context,
split Context into its own file -- Context.cpp -- renamed _var to m_var,
change ' *' to '* '.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/Context.cpp: Added.
(KJS::Context::Context):
(KJS::Context::~Context):
(KJS::Context::mark):
* kjs/context.h:
(KJS::Context::scopeChain):
(KJS::Context::variableObject):
(KJS::Context::setVariableObject):
(KJS::Context::thisValue):
(KJS::Context::callingContext):
(KJS::Context::activationObject):
(KJS::Context::currentBody):
(KJS::Context::function):
(KJS::Context::arguments):
(KJS::Context::pushScope):
(KJS::Context::seenLabels):
* kjs/function.cpp:
(KJS::FunctionImp::callAsFunction):
(KJS::FunctionImp::processParameters):
(KJS::FunctionImp::argumentsGetter):
(KJS::GlobalFuncImp::callAsFunction):
* kjs/internal.cpp:
(KJS::InterpreterImp::evaluate):
* kjs/internal.h:
(KJS::InterpreterImp::setContext):
(KJS::InterpreterImp::context):
* kjs/interpreter.cpp:
* kjs/interpreter.h:
(KJS::ExecState::context):
(KJS::ExecState::ExecState):
* kjs/nodes.cpp:
(currentSourceId):
(currentSourceURL):
(ThisNode::evaluate):
(ResolveNode::evaluate):
(FunctionCallResolveNode::evaluate):
(PostfixResolveNode::evaluate):
(DeleteResolveNode::evaluate):
(TypeOfResolveNode::evaluate):
(PrefixResolveNode::evaluate):
(AssignResolveNode::evaluate):
(VarDeclNode::evaluate):
(VarDeclNode::processVarDecls):
(DoWhileNode::execute):
(WhileNode::execute):
(ForNode::execute):
(ForInNode::execute):
(ContinueNode::execute):
(BreakNode::execute):
(ReturnNode::execute):
(WithNode::execute):
(SwitchNode::execute):
(LabelNode::execute):
(TryNode::execute):
(FuncDeclNode::processFuncDecl):
(FuncExprNode::evaluate):
2006-06-07 Geoffrey Garen <ggaren@apple.com>
Removed API directory I prematurely/accidentally added.
* API: Removed.
2006-06-05 Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed and landed by Geoff.
- fix a regression in ecma_3/String/regress-104375.js
* kjs/string_object.cpp:
(substituteBackreferences): If a 2-digit back reference is out of range,
parse it as a 1-digit reference (followed by the other digit). This matches
Firefox's behavior.
2006-06-05 Geoffrey Garen <ggaren@apple.com>
Reviewed By Maciej.
Darin already reviewed this change on the branch. See <rdar://problem/4317701>.
- Fixed <rdar://problem/4291345> PCRE overflow in Safari JavaScriptCore
No test case because there's no behavior change.
* pcre/pcre_compile.c:
(read_repeat_counts): Check for integer overflow / out of bounds
2006-06-05 Geoffrey Garen <ggaren@apple.com>
Reviewed by aliu.
- Changed CString length from int to size_t. We sould probably do this
for UString, too. (Darin, if you're reading this: Maciej said so.)
* kjs/function.cpp:
(KJS::encode):
* kjs/ustring.cpp:
(KJS::CString::CString):
(KJS::operator==):
* kjs/ustring.h:
(KJS::CString::size):
2006-06-04 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- http://bugs.webkit.org/show_bug.cgi?id=9304
Minor cleanup in JavaScriptCore
* kjs/value.h: Removed redundant declarations
2006-06-04 Darin Adler <darin@apple.com>
Reviewed by Anders.
- changed deleteAllValues so it can work on "const" collections
Deleting the values affects the values, not the pointers in the
collection, so it's legitimate to do it to a const collection,
and a case of that actually came up in the XPath code.
* wtf/HashMap.h:
(WTF::deleteAllPairSeconds): Use const iterators.
(WTF::deleteAllValues): Take const HashMap reference as a parameter.
* wtf/HashSet.h:
(WTF::deleteAllValues): Take const HashSet reference as a parameter,
and use const iterators.
* wtf/Vector.h:
(WTF::deleteAllValues): Take const Vector reference as a parameter.
- added more functions that are present in <math.h> on some platforms,
but not on others; moved here from various files in WebCore
* wtf/MathExtras.h:
(isinf): Added.
(isnan): Added.
(lround): Added.
(lroundf): Tweaked.
(round): Added.
(roundf): Tweaked.
(signbit): Added.
2006-06-02 Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by ggaren.
- http://bugs.webkit.org/show_bug.cgi?id=9234
Implement $&, $' and $` replacement codes in String.prototype.replace
Test: fast/js/string-replace-3.html
* kjs/string_object.cpp:
(substituteBackreferences): Added support for $& (matched substring),
$` (everything preceding matched substring), $' (everything following
matched substring) and 2-digit back references, and cleaned up a little.
2006-06-02 Adele Peterson <adele@apple.com>
Reviewed by Darin.
Set incremental linking to no. This seems to fix a build problem I was seeing
where dftables couldn't find a dll.
* JavaScriptCore.vcproj/dftables/dftables.vcproj:
2006-05-26 Steve Falkenburg <sfalken@apple.com>
Build fixes/tweaks
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
=== JavaScriptCore-521.11 ===
2006-05-24 Geoffrey Garen <ggaren@apple.com>
Reviewed by mjs.
- JSC half of fix for <rdar://problem/4557926> TOT REGRESSSION: Crash
occurs when attempting to view image in slideshow mode at
http://d.smugmug.com/gallery/581716 ( KJS::IfNode::execute
(KJS::ExecState*) + 312)
On alternate threads, DOMObjects remain in the
ScriptInterpreter's cache because they're not collected. So, they
need an opportunity to mark their children.
I'm not particularly happy with this solution because it fails to
resolve many outstanding issues with the DOM object cache. Since none
of those issues is a crasher or a serious compatibility concern,
and since the behavior of other browsers is not much to go on in this
case, I've filed <rdar://problem/4561439> about that, and I'm moving on
with my life.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/collector.cpp:
(KJS::Collector::collect):
* kjs/internal.cpp:
(KJS::InterpreterImp::mark):
* kjs/internal.h:
* kjs/interpreter.cpp:
(KJS::Interpreter::mark):
* kjs/interpreter.h:
=== JavaScriptCore-521.10 ===
2006-05-22 Timothy Hatcher <timothy@apple.com>
Reviewed by Eric, Kevin and Geoff.
Merge open source build fixes. <rdar://problem/4555500>
* kjs/collector.cpp: look at the rsp register in x86_64
(KJS::Collector::markOtherThreadConservatively):
* wtf/Platform.h: add x86_64 to the platform list
2006-05-19 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
http://bugs.webkit.org/show_bug.cgi?id=8993
Support function declaration in case statements
* kjs/grammar.y: Get rid of StatementList and use SourceElements instead.
* kjs/nodes.cpp:
(CaseClauseNode::evalStatements):
(CaseClauseNode::processVarDecls):
(CaseClauseNode::processFuncDecl):
(ClauseListNode::processFuncDecl):
(CaseBlockNode::processFuncDecl):
(SwitchNode::processFuncDecl):
* kjs/nodes.h:
(KJS::CaseClauseNode::CaseClauseNode):
(KJS::ClauseListNode::ClauseListNode):
(KJS::ClauseListNode::getClause):
(KJS::ClauseListNode::getNext):
(KJS::ClauseListNode::releaseNext):
(KJS::SwitchNode::SwitchNode):
Add processFuncDecl for the relevant nodes.
* kjs/nodes2string.cpp:
(CaseClauseNode::streamTo):
next got renamed to source.
2006-05-17 George Staikos <staikos@kde.org>
Reviewed by Maciej, Alexey, and Eric.
* pcre/pcre_compile.c:
* pcre/pcre_get.c:
* pcre/pcre_exec.c:
* wtf/UnusedParam.h:
Use /**/ in .c files to compile with non-C99 and non-GCC compilers.
* kjs/testkjs.cpp:
Change include to <wtf/HashTraits.h> from "HashTraits.h" to avoid -I
* wtf/unicode/qt4/UnicodeQt4.h:
Use correct parentheses and correct mask for utf-32 support.
2006-05-17 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=8870
Crash typing in Yahoo auto-complete widget.
Test: fast/js/regexp-stack-overflow.html
* pcre/pcre-config.h: Define NO_RECURSE.
2006-05-16 George Staikos <staikos@kde.org>
Reviewed by Maciej.
Fix some warnings and strict compilation errors.
* kjs/nodes.cpp:
* kjs/value.cpp:
2006-05-15 Alexey Proskuryakov <ap@nypop.com>
* make-generated-sources.sh: Changed to be executable and removed
text in the file generated by "svn diff".
2006-05-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- Fixed <rdar://problem/4534904> please do not treat "debugger" as
a reserved word while parsing JavaScript (and other ECMA reserved
words)
AKA
http://bugs.webkit.org/show_bug.cgi?id=6179
We treat "char" as a reserved word in JavaScript and firefox/IE do
not
(1) I unreserved most of the spec's "future reserved words" because
they're not reserved in IE or FF. (Most, but not all, because IE
somewhat randomly *does* reserve a few of them.)
(2) I made 'debugger' a legitimate statement that acts like an empty
statement because FF and IE support it.
* kjs/grammar.y:
* kjs/keywords.table:
2006-05-15 Tim Omernick <timo@apple.com>
Reviewed by John Sullivan.
Part of <rdar://problem/4466508> Add 64-bit support to the Netscape Plugin API
Added to the Netscape Plugin API the concept of "plugin drawing models". The drawing model
determines the kind of graphics context created by the browser for the plugin, as well as
the Mac types of various Netscape Plugin API data structures.
There is a drawing model to represent the old QuickDraw-based API. It is used by default
if QuickDraw is available on the system, unless the plugin specifies another drawing model.
The big change is the addition of the CoreGraphics drawing model. A plugin may request this
drawing model to obtain access to a CGContextRef for drawing, instead of a QuickDraw CGrafPtr.
* bindings/npapi.h:
Define NP_NO_QUICKDRAW when compiling 64-bit; there is no 64-bit QuickDraw.
Added NPNVpluginDrawingModel, NPNVsupportsQuickDrawBool, and NPNVsupportsCoreGraphicsBool
variables.
Added NPDrawingModel enumeration. Currently the only drawing models are QuickDraw and
CoreGraphics.
NPRegion's type now depends on the drawing model specified by the plugin.
NP_Port is now only defined when QuickDraw is available.
Added NP_CGContext, which is the type of the NPWindow's "window" member in CoreGraphics mode.
2006-05-13 Kevin M. Ollivier <kevino@theolliviers.com>
Reviewed by Darin, landed by ap.
- http://bugs.webkit.org/show_bug.cgi?id=8528
Bakefiles (and generated Makefiles) for wx and gdk ports
* make-generated-sources.sh:
Added script to configure environment to run DerivedSources.make
* JavaScriptCoreSources.bkl:
Added JavaScriptCore sources list for Bakefile.
* jscore.bkl:
Bakefile used to generate JavaScriptCore project files
(currently only used by wx and gdk ports)
2006-05-09 Steve Falkenburg <sfalken@apple.com>
Fix Windows build.
Minor fixes to WTF headers.
Reviewed by kevin.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Fix include dirs, paths to files.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Fix include dirs.
* wtf/Assertions.h: include Platform.h to get definition for COMPILER()
* wtf/Vector.h: include FastMalloc.h for definition of fastMalloc, fastFree
2006-05-09 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Anders.
- renamed kxmlcore to wtf
kxmlcore --> wtf
KXMLCore --> WTF
KXC --> WTF
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/c/c_instance.cpp:
* bindings/objc/WebScriptObject.mm:
* kjs/JSImmediate.h:
* kjs/Parser.cpp:
* kjs/Parser.h:
* kjs/array_object.cpp:
* kjs/collector.cpp:
(KJS::Collector::registerThread):
* kjs/collector.h:
* kjs/config.h:
* kjs/function.cpp:
(KJS::isStrWhiteSpace):
* kjs/function.h:
* kjs/identifier.cpp:
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/lexer.cpp:
(Lexer::shift):
(Lexer::isWhiteSpace):
(Lexer::isIdentStart):
(Lexer::isIdentPart):
* kjs/lookup.cpp:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/number_object.cpp:
* kjs/object.h:
* kjs/property_map.cpp:
* kjs/property_map.h:
* kjs/string_object.cpp:
(StringProtoFunc::callAsFunction):
* kjs/testkjs.cpp:
(testIsInteger):
* kjs/ustring.cpp:
* kjs/ustring.h:
* kxmlcore: Removed.
* kxmlcore/AlwaysInline.h: Removed.
* kxmlcore/Assertions.cpp: Removed.
* kxmlcore/Assertions.h: Removed.
* kxmlcore/FastMalloc.cpp: Removed.
* kxmlcore/FastMalloc.h: Removed.
* kxmlcore/FastMallocInternal.h: Removed.
* kxmlcore/Forward.h: Removed.
* kxmlcore/HashCountedSet.h: Removed.
* kxmlcore/HashFunctions.h: Removed.
* kxmlcore/HashMap.h: Removed.
* kxmlcore/HashSet.h: Removed.
* kxmlcore/HashTable.cpp: Removed.
* kxmlcore/HashTable.h: Removed.
* kxmlcore/HashTraits.h: Removed.
* kxmlcore/ListRefPtr.h: Removed.
* kxmlcore/Noncopyable.h: Removed.
* kxmlcore/OwnArrayPtr.h: Removed.
* kxmlcore/OwnPtr.h: Removed.
* kxmlcore/PassRefPtr.h: Removed.
* kxmlcore/Platform.h: Removed.
* kxmlcore/RefPtr.h: Removed.
* kxmlcore/TCPageMap.h: Removed.
* kxmlcore/TCSpinLock.h: Removed.
* kxmlcore/TCSystemAlloc.cpp: Removed.
* kxmlcore/TCSystemAlloc.h: Removed.
* kxmlcore/UnusedParam.h: Removed.
* kxmlcore/Vector.h: Removed.
* kxmlcore/VectorTraits.h: Removed.
* kxmlcore/unicode: Removed.
* kxmlcore/unicode/Unicode.h: Removed.
* kxmlcore/unicode/UnicodeCategory.h: Removed.
* kxmlcore/unicode/icu: Removed.
* kxmlcore/unicode/icu/UnicodeIcu.h: Removed.
* kxmlcore/unicode/posix: Removed.
* kxmlcore/unicode/qt3: Removed.
* kxmlcore/unicode/qt4: Removed.
* kxmlcore/unicode/qt4/UnicodeQt4.h: Removed.
* pcre/pcre_get.c:
* wtf: Added.
* wtf/Assertions.cpp:
* wtf/Assertions.h:
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_ThreadCache::Scavenge):
(WTF::do_malloc):
(WTF::do_free):
(WTF::TCMallocGuard::TCMallocGuard):
(WTF::malloc):
(WTF::free):
(WTF::calloc):
(WTF::cfree):
(WTF::realloc):
* wtf/FastMalloc.h:
* wtf/FastMallocInternal.h:
* wtf/Forward.h:
* wtf/HashCountedSet.h:
* wtf/HashFunctions.h:
* wtf/HashMap.h:
* wtf/HashSet.h:
* wtf/HashTable.cpp:
* wtf/HashTable.h:
* wtf/HashTraits.h:
* wtf/ListRefPtr.h:
* wtf/Noncopyable.h:
* wtf/OwnArrayPtr.h:
* wtf/OwnPtr.h:
* wtf/PassRefPtr.h:
* wtf/RefPtr.h:
* wtf/TCSystemAlloc.cpp:
(TCMalloc_SystemAlloc):
* wtf/Vector.h:
* wtf/VectorTraits.h:
* wtf/unicode/UnicodeCategory.h:
* wtf/unicode/icu/UnicodeIcu.h:
2006-05-08 Timothy Hatcher <timothy@apple.com>
Reviewed by Tim O.
* bindings/npapi.h: do not define #pragma options align=mac68k if we are 64-bit
2006-05-07 Darin Adler <darin@apple.com>
Reviewed and landed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=8765
Random crashes on TOT since the form state change
I haven't figured out how to construct a test for this, but this does seem to fix the
problem; Mitz mentioned that a double-destroy was occurring in these functions.
* kxmlcore/HashMap.h: (KXMLCore::HashMap::remove): Use RefCounter::deref instead of calling
~ValueType, because ~ValueType often results in a double-destroy, since the HashTable also
destroys the element based on the storage type. The RefCounter template correctly does work
only in cases where ValueType and ValueStorageType differ and this class is what's used
elsewhere for the same purpose; I somehow missed this case when optimizing HashMap.
* kxmlcore/HashSet.h: (KXMLCore::HashSet::remove): Ditto.
2006-05-05 Darin Adler <darin@apple.com>
- http://bugs.webkit.org/show_bug.cgi?id=8722
IE compatibility fix in date parsing
* kjs/date_object.cpp: (KJS::parseDate): Merged change that George Staikos provided
from KDE 3.4.3 branch that allows day values of 0 and values that are > 1000.
2006-05-04 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
http://bugs.webkit.org/show_bug.cgi?id=8734
Would like a Vector::append that takes another Vector
* kxmlcore/Vector.h:
(KXMLCore::::append):
New function that takes another array.
2006-05-02 Steve Falkenburg <sfalken@apple.com>
Reviewed by eric.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: set NDEBUG for release build
* kxmlcore/FastMalloc.cpp: Prevent USE_SYSTEM_MALLOC from being defined twice
2006-05-02 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
* kxmlcore/HashMap.h:
(KXMLCore::::operator):
Return *this
2006-05-01 Tim Omernick <timo@apple.com>
Reviewed by Tim Hatcher.
<rdar://problem/4476875> Support printing for embedded Netscape plugins
* bindings/npapi.h:
Fixed struct alignment problem in our npapi.h. Structs must be 68k-aligned on both pre-Mac OS X
and Mac OS X systems, as this is what plugins expect.
2006-05-01 Timothy Hatcher <timothy@apple.com>
Reviewed by Maciej.
<rdar://problem/4308243> 8F36 Regression: crash in malloc_consolidate if you use a .PAC file
The original fix missed the oversized cell case. Added a test for "currentThreadIsMainThread ||
imp->m_destructorIsThreadSafe" where we collect oversized cells.
We don't have a way to test PAC files yet, so there's no test attached.
* kjs/collector.cpp:
(KJS::Collector::collect): test the thread when we collect oversized cells
2006-05-01 Tim Omernick <timo@apple.com>
Reviewed by Adele.
<rdar://problem/4526114> REGRESSION (two days ago): LOG() just prints @ for NSObject substitutions
* kxmlcore/Assertions.cpp:
Changed sense of strstr("%@") check. I already made the same fix to the WebBrowser assertions.
2006-04-28 Steve Falkenburg <sfalken@apple.com>
Reviewed by kdecker
Actually apply the change that was reviewed insted of checking it in with an #if 0 (oops).
* kjs/testkjs.cpp:
(main): Suppress C runtime alerts
2006-04-28 Steve Falkenburg <sfalken@apple.com>
Reviewed by kdecker
Suppress error reporting dialog that blocks Javascript tests from completing.
Real error is due to an overflow in the date/time handling functions that needs
to be addressed, but this will prevent the hang running the Javascript tests
on the build bot (along with the related changes).
* kjs/testkjs.cpp:
(main): Suppress C runtime alerts
2006-04-27 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej
- Minor fixups I discovered while working on the autogenerator.
* kjs/lookup.cpp:
(findEntry): ASSERT that size is not 0, because otherwise we'll % by 0,
compute a garbage address, and possibly crash.
* kjs/lookup.h:
(cacheGlobalObject): Don't enumerate cached objects -- ideally, they
would be hidden entirely.
2006-04-21 Kevin M. Ollivier <kevino@theolliviers.com>
Reviewed by Darin.
- http://bugs.webkit.org/show_bug.cgi?id=8507
Compilation fixes for building on gcc 4.0.2, and without precomp headers
* kjs/operations.h:
* kxmlcore/Assertions.cpp:
* kxmlcore/FastMalloc.cpp:
Added necessary headers to resolve compilation issues when not using
precompiled headers.
* kjs/value.h: Declare the JSCell class before friend declaration
to resolve compilation issues with gcc 4.0.2.
* kxmlcore/Platform.h: Set Unicode support to use ICU on platforms
other than KDE (previously only defined for Win and Mac OS)
2006-04-18 Eric Seidel <eseidel@apple.com>
Reviewed by ggaren.
Fix "new Function()" to correctly use lexical scoping.
Add ScopeChain::print() function for debugging.
<rdar://problem/4067864> REGRESSION (125-407): JavaScript failure on PeopleSoft REN Server
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/scope_chain.cpp:
(KJS::ScopeChain::print):
* kjs/scope_chain.h:
2006-04-14 James G. Speth <speth@end.com>
Reviewed by Timothy.
Bug 8389: support for Cocoa bindings - binding an NSTreeController to the WebView's DOM
http://bugs.webkit.org/show_bug.cgi?id=8389
Adds a category to WebScriptObject with array accessors for KVC/KVO.
If super valueForKey: fails it will call valueForUndefinedKey:, which is
important because it causes the right behavior to happen with bindings using
the "Raises for Not Applicable Keys" flag and the "Not Applicable Placeholder"
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject count]):
(-[WebScriptObject objectAtIndex:]):
(-[WebUndefined description]): return "undefined"
2006-04-13 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
* kjs/internal.cpp:
(KJS::InterpreterImp::initGlobalObject): Add the built-in object
prototype to the end of the global object's prototype chain instead of
just blowing away its existing prototype. We need to do this because
the window object has a meaningful prototype now.
2006-04-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- fix testkjs to not show false-positive KJS::Node leaks in debug builds
* kjs/testkjs.cpp:
(doIt):
(kjsmain):
2006-04-11 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
Minor code cleanup -- passes all the JS tests.
* kjs/object_object.cpp:
(ObjectObjectImp::construct):
(ObjectObjectImp::callAsFunction):
2006-04-11 Darin Adler <darin@apple.com>
- another attempt to fix Windows build -- Vector in Forward.h was not working
* kxmlcore/Forward.h: Remove Vector.
* kxmlcore/Vector.h: Add back default arguments, remove include of
Forward.h.
2006-04-11 Darin Adler <darin@apple.com>
- try to fix Windows build -- HashForward.h was not working
* kxmlcore/HashForward.h: Removed.
* JavaScriptCore.xcodeproj/project.pbxproj: Remove HashForward.h.
* kjs/collector.h: Remove use of HashForward.h.
* kxmlcore/HashCountedSet.h: Remove include of HashForward.h, restore
default arguments.
* kxmlcore/HashMap.h: Ditto.
* kxmlcore/HashSet.h: Ditto.
2006-04-11 David Harrison <harrison@apple.com>
Reviewed by Darin.
- fixed clean build, broken by Darin's check-in
* kjs/date_object.cpp: Add needed include of lookup.h.
* kjs/regexp_object.cpp: Move include of .lut.h file below other includes.
2006-04-10 Darin Adler <darin@apple.com>
Rubber-stamped by John Sullivan.
- switched from a shell script to a makefile for generated files
- removed lots of unneeded includes
- added new Forward.h and HashForward.h headers that allow compiling with
fewer unneeded templates
* DerivedSources.make: Added.
* generate-derived-sources: Removed.
* JavaScriptCore.xcodeproj/project.pbxproj: Added new files, changed to use
DerivedSources.make.
* kxmlcore/Forward.h: Added.
* kxmlcore/HashForward.h: Added.
* kxmlcore/HashCountedSet.h: Include HashForward for default args.
* kxmlcore/HashMap.h: Ditto.
* kxmlcore/HashSet.h: Ditto.
* kjs/object.h:
* kjs/object.cpp:
Moved KJS_MAX_STACK into the .cpp file.
* bindings/NP_jsobject.cpp:
* bindings/c/c_instance.h:
* bindings/jni/jni_class.h:
* bindings/jni/jni_runtime.h:
* bindings/jni/jni_utility.h:
* bindings/objc/WebScriptObject.mm:
* bindings/objc/WebScriptObjectPrivate.h:
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
* bindings/objc/objc_runtime.mm:
* bindings/objc/objc_utility.mm:
* bindings/runtime.h:
* bindings/runtime_array.cpp:
* bindings/runtime_array.h:
* bindings/runtime_method.cpp:
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
* bindings/runtime_root.h:
* kjs/JSImmediate.cpp:
* kjs/Parser.h:
* kjs/array_object.cpp:
* kjs/array_object.h:
* kjs/bool_object.cpp:
* kjs/bool_object.h:
* kjs/collector.h:
* kjs/context.h:
* kjs/debugger.cpp:
* kjs/error_object.h:
* kjs/function_object.h:
* kjs/internal.h:
* kjs/lexer.cpp:
* kjs/math_object.cpp:
* kjs/math_object.h:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/number_object.cpp:
* kjs/number_object.h:
* kjs/object_object.cpp:
* kjs/operations.cpp:
* kjs/protected_reference.h:
* kjs/reference.h:
* kjs/reference_list.h:
* kjs/regexp_object.h:
* kjs/string_object.cpp:
* kjs/string_object.h:
* kjs/testkjs.cpp:
* kjs/value.cpp:
* kjs/value.h:
* kxmlcore/HashTable.h:
* kxmlcore/ListRefPtr.h:
* kxmlcore/TCPageMap.h:
* kxmlcore/Vector.h:
Removed unneeded header includes.
2006-04-09 Geoffrey Garen <ggaren@apple.com>
Reviewed by eric.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=8284
prevent unnecessary entries in the "nodes with extra refs" hash table
This patch switches manually RefPtr exchange with use of
RefPtr::release to ensure that a node's ref count never tops 1
(in the normal case).
* kjs/nodes.cpp:
(BlockNode::BlockNode):
(CaseBlockNode::CaseBlockNode):
* kjs/nodes.h:
(KJS::ArrayNode::ArrayNode):
(KJS::ObjectLiteralNode::ObjectLiteralNode):
(KJS::ArgumentsNode::ArgumentsNode):
(KJS::VarStatementNode::VarStatementNode):
(KJS::ForNode::ForNode):
(KJS::CaseClauseNode::CaseClauseNode):
(KJS::FuncExprNode::FuncExprNode):
(KJS::FuncDeclNode::FuncDeclNode):
2006-04-08 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
One more attempt - use reinterpret_cast, rather than static_cast.
2006-04-08 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
An attempt to fix Win32 build - ICU uses wchar_t on Windows, so we need a type cast.
* kxmlcore/unicode/icu/UnicodeIcu.h:
(KXMLCore::Unicode::toLower):
(KXMLCore::Unicode::toUpper):
2006-04-08 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=8264
toLowerCase and toUpperCase don't honor special mappings
Test: fast/js/string-capitalization.html
* JavaScriptCore.xcodeproj/project.pbxproj: Added KXMLCore::Unicode headers to the project.
* icu/unicode/putil.h: Added (copied from WebCore).
* icu/unicode/uiter.h: Ditto.
* icu/unicode/ustring.h: Ditto.
* kjs/string_object.cpp:
(StringProtoFunc::callAsFunction): Use the new KXMLCore::Unicode::toUpper() and toLower().
* kjs/ustring.cpp: Removed unused (and evil) UChar::toLower() and toUpper().
* kjs/ustring.h: Ditto.
* kxmlcore/unicode/Unicode.h: Corrected capitalization of the word Unicode.
* kxmlcore/unicode/UnicodeCategory.h: Renamed include guard macro to match file name.
* kxmlcore/unicode/icu/UnicodeIcu.h:
(KXMLCore::Unicode::toLower): Work on strings, not individual characters. Use ICU root locale.
(KXMLCore::Unicode::toUpper): Ditto.
(KXMLCore::Unicode::isFormatChar): Use int32_t, which can hold a complete code point.
(KXMLCore::Unicode::isSeparatorSpace): Ditto.
(KXMLCore::Unicode::category): Ditto.
* kxmlcore/unicode/qt4/UnicodeQt4.h:
(KXMLCore::Unicode::toLower): Work on strings, not individual characters.
(KXMLCore::Unicode::toUpper): Ditto.
(KXMLCore::Unicode::isFormatChar): Use int32_t, which can hold a complete code point.
(KXMLCore::Unicode::isSeparatorSpace): Ditto.
(KXMLCore::Unicode::category): Ditto.
* tests/mozilla/ecma/String/15.5.4.12-1.js: Corrected expected results.
* tests/mozilla/ecma/String/15.5.4.12-5.js: Corrected expected results.
2006-04-05 Darin Adler <darin@apple.com>
- attempt to fix Windows build
* kxmlcore/HashMap.h: (KXMLCore::HashMap::remove): Use (*it). instead of it->.
* kxmlcore/HashSet.h: (KXMLCore::HashSet::remove): Ditto.
2006-04-05 Darin Adler <darin@apple.com>
- attempt to fix Windows build
* os-win32/stdint.h: Add int8_t, uint8_t, int64_t.
2006-04-05 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix memory leak introduced by the previous change
* kxmlcore/HashTable.h: Specialize NeedsRef so that it correctly returns true when
the value in question is a pair where one of the pair needs a ref and the other
of the pair does not.
2006-04-05 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- JavaScriptCore part of fix for http://bugs.webkit.org/show_bug.cgi?id=8049
StringImpl hash traits deleted value creates an init routine for WebCore
<rdar://problem/4442248> REGRESSION: WebCore has init routines (8049)
Change HashMap and HashSet implementation so they fold various types together.
This allows us to implement maps and sets that use RefPtr<WebCore::StringImpl>
and WebCore::String in terms of the underlying raw pointer type, and hence use
-1 for the deleted value.
* kxmlcore/HashTraits.h: Added a new type to HashTraits, StorageTraits, which is a
type to be used when storing a value that has the same layout as the type itself.
This is used only for non-key cases. In the case of keys, the hash function must also
be considered. Moved emptyValue out of GenericHashTraitsBase into GenericHashTraits.
Added a new bool to HashTraits, needsRef, which indicates whether the type needs
explicit reference counting. If the type itself has needsRef true, but the storage
type has needsRef false, then the HashSet or HashMap has to handle the reference
counting explicitly. Added hash trait specializations for all signed integer values
that give -1 as the deleted value. Gave all integers StorageTraits of the canonical
integer type of the same size so int and long will share code. Gave all pointers and
RefPtrs StorageTraits of the appropriately sized integer type. Removed redundant
TraitType and emptyValue definitions in the pointer specialization for HashTraits.
Added PairBaseHashTraits, which doesn't try to set up needsDestruction and deletedValue.
Useful for types where we don't want to force the existence of deletedValue, such as
the type of a pair in a HashMap which is not the actual storage type. Removed an
unneeded parameter from the DeletedValueAssigner template. Added HashKeyStorageTraits
template, which determines what type can be used to store a given hash key type with
a given hash function, and specialized it for pointers and RefPtr so that pointer
hash tables share an underlying HashTable that uses IntHash.
* kxmlcore/HashTable.h: Added HashTableConstIteratorAdapter, HashTableIteratorAdapter,
NeedsRef, RefCountManagerBase, RefCountManager, HashTableRefCountManagerBase, and
HashTableRefCountManager. All are used by both HashSet and HashMap to handle hash
tables where the type stored is not the same as the real value type.
* kxmlcore/HashFunctions.h: Added a new struct named IntTypes that finds an
integer type given a sizeof value. Renamed pointerHash to intHash and made it
use overloading and take integer parameters. Added an IntHash struct which is
a hash function that works for integers. Changed PtrHash to call IntHash with
an appropriately sized integer. Made IntHash the default hash function for
many integer types. Made PtrHash the default hash function for RefPtr as well
as for raw pointers.
* kxmlcore/HashSet.h: Changed implementation to use a separate "storage type"
derived from the new traits. The HashTable will use the storage type and all
necessary translation and ref/deref is done at the HashSet level. Also reorganized
the file so that the HashSet is at the top and has no inline implementation inside
it so it's easy to read the interface to HashSet.
* kxmlcore/HashMap.h: Changed implementation to use a separate "storage type"
derived from the new traits. The HashTable will use the storage type and all
necessary translation and ref/deref is done at the HashMap level. Also reorganized
the file so that the HashMap is at the top and has no inline implementation inside
it so it's easy to read the interface to HashMap.
* kxmlcore/HashMapPtrSpec.h: Removed. Superceded by optimizations in HashMap itself.
* JavaScriptCore.xcodeproj/project.pbxproj: Remove HashMapPtrSpec.h, resort files,
and also remove some unnecessary build settings from the aggregate target that
generates derived sources.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Ditto.
2006-04-04 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
The Debug and Release frameworks are now built with install paths relative to the build products directory.
This removes the need for other projects to build with -framework WebCore and -framework JavaScriptCore.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-04-04 Eric Seidel <eseidel@apple.com>
Reviewed by ggaren.
Fix win32 build.
Disable ASSERT redefinition warnings for now.
* JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
* kxmlcore/Assertions.h:
2006-04-04 Bjrn Graf <bjoern.graf@gmail.com>
Reviewed by ggaren & darin. Landed by eseidel.
Integrate CURL version of gettimeofday
http://bugs.webkit.org/show_bug.cgi?id=7399
Disable crash report dialogs for testkjs.exe in Release mode
http://bugs.webkit.org/show_bug.cgi?id=8113
* kjs/testkjs.cpp:
(StopWatch::start):
(StopWatch::stop):
(StopWatch::getElapsedMS):
(main):
(kjsmain):
2006-04-04 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
* kjs/number_object.cpp:
(NumberProtoFunc::callAsFunction): remove trunc() to fix win32.
2006-03-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fixed "toPrecision sometimes messes up the last digit on intel Macs"
http://bugs.webkit.org/show_bug.cgi?id=7748
* kjs/number_object.cpp:
(intPow10): Compute integer powers of 10 using exponentiation by squaring.
(NumberProtoFunc::callAsFunction): Use intPow10(n) in place of all pow(10.0, n),
plus a bit of refactoring.
2006-04-03 Darin Adler <darin@apple.com>
- tweak config.h and Platform.h to try to get buildbot working
(making some small changes at the same time)
* kjs/config.h: Removed now-unneeded HAVE_ICU.
* kxmlcore/Platform.h: Tweak how platform gets set up. Move all the
USE stuff to the end.
2006-04-03 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej.
Fix Win32 build breakage from previous commit, remove unused forward.
2006-04-03 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej.
Implement a unicode abstraction layer to make JavaScriptCore much more
easily ported to other platforms without having to take in libicu. Also
makes the unicode related code easier to understand.
2006-04-03 Timothy Hatcher <timothy@apple.com>
Reviewed by Adele.
Fixes <rdar://problem/4498338> JavaScriptCore fails to compile for ppc64
Other 64 bit build fixes.
* kjs/collector.cpp:
(KJS::Collector::markOtherThreadConservatively): test for __DARWIN_UNIX03 and use __r1
* kjs/dtoa.cpp:
(Bigint::): cast PRIVATE_mem to unsigned to prevent warning
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJavaVM): cast jniError to long to prevent format warning
(KJS::Bindings::getJNIEnv): cast jniError to long to prevent format warning
* bindings/runtime_root.cpp:
(KJS::Bindings::addNativeReference): cast CFDictionaryGetValue to unsigned long to prevent warning
(KJS::Bindings::removeNativeReference): cast CFDictionaryGetValue to unsigned long to prevent warning
2006-03-31 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- <rdar://problem/4395622> API: WebScriptObject.h incorrectly reports that -isSelectorExcludedFromWebScript returns NO by default
* bindings/objc/WebScriptObject.h: Fixed comment.
2006-03-31 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
A bit more code cleanup.
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertValueToNPVariant):
* bindings/objc/objc_runtime.mm:
(convertValueToObjcObject):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
* kjs/function.cpp:
(KJS::GlobalFuncImp::callAsFunction):
* kjs/interpreter.cpp:
(KJS::ExecState::lexicalInterpreter):
* kjs/interpreter.h:
* kjs/operations.cpp:
(KJS::equal):
2006-03-30 Eric Seidel <eseidel@apple.com>
Reviewed by anders.
Small code-style update.
* kjs/operations.cpp:
(KJS::isNaN):
(KJS::isInf):
(KJS::isPosInf):
(KJS::isNegInf):
(KJS::equal):
(KJS::strictEqual):
(KJS::relation):
(KJS::maxInt):
(KJS::minInt):
(KJS::add):
(KJS::mult):
2006-03-31 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
Make sure the GetterSetterImp objects are marked as well.
* kjs/internal.cpp:
(KJS::GetterSetterImp::mark):
Call JSCell::mark().
2006-03-30 Eric Seidel <eseidel@apple.com>
Reviewed by ggaren.
* kjs/nodes.h: Some various small style fixes.
2006-03-30 Eric Seidel <eseidel@apple.com>
Reviewed by ggaren.
Clean-up style issues in node.h, remove redundant initializations.
* kjs/nodes.h:
(KJS::StatementNode::evaluate):
(KJS::ArrayNode::ArrayNode):
(KJS::ObjectLiteralNode::ObjectLiteralNode):
(KJS::ArgumentsNode::ArgumentsNode):
(KJS::NewExprNode::NewExprNode):
(KJS::CaseClauseNode::CaseClauseNode):
(KJS::FuncDeclNode::FuncDeclNode):
2006-03-30 Tim Omernick <timo@apple.com>
Reviewed by Geoff.
<rdar://problem/4212626> REGRESSION: LIVECONNECT: JavaScript type for Java Strings is function,
not object
* bindings/runtime.h:
(KJS::Bindings::Instance::implementsCall):
New method. Returns false by default. Concrete subclasses can override this return true when
the bound object may be called as a function.
(KJS::Bindings::Instance::invokeDefaultMethod):
Since bound objects are no longer treated as functions by default, we can return jsUndefined()
here instead of in concrete subclasses that decide not to implement the default method
functionality.
* bindings/runtime_object.cpp:
(RuntimeObjectImp::implementsCall):
Don't assume that the bound object is a function; instead, let the object instance decide whether
it is callable.
* bindings/c/c_instance.h:
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::implementsCall):
The object is callable if its class has an invokeDefault function.
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::implementsCall):
The object is callable if the ObjC instance responds to -invokeDefaultMethodWithArguments:.
* bindings/jni/jni_instance.h:
* bindings/jni/jni_instance.cpp:
Moved bogus invokeDefaultMethod() to superclass.
2006-03-29 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- JavaScriptCore side of fix for <rdar://problem/4308243> 8F36
Regression: crash in malloc_consolidate if you use a .PAC file
The crash was a result of threaded deallocation of thread-unsafe
objects. Pure JS objects are thread-safe because all JS execution
is synchronized through JSLock. However, JS objects that wrap WebCore
objects are thread-unsafe because JS and WebCore execution are not
synchronized. That unsafety comes into play when the collector
deallocates a JS object that wraps a WebCore object, thus causing the
WebCore object to be deallocated.
The solution here is to have each JSCell know whether it is safe to
collect on a non-main thread, and to avoid collecting unsafe cells
when on a non-main thread.
We don't have a way to test PAC files yet, so there's no test
attached to this patch.
* kjs/collector.cpp:
(KJS::Collector::collect):
(1) Added the test "currentThreadIsMainThread ||
imp->m_destructorIsThreadSafe".
* kjs/protect.h:
(KJS::gcProtectNullTolerant):
(KJS::gcUnprotectNullTolerant):
* kjs/value.h:
(KJS::JSCell::JSCell): The bools here must be bitfields, otherwise
m_destructorIsThreadSafe becomes another whole word, ruining the
collector optimizations we've made based on the size of a JSObject.
* kxmlcore/FastMalloc.cpp:
(KXMLCore::currentThreadIsMainThread):
(KXMLCore::fastMallocRegisterThread):
* kxmlcore/FastMalloc.h:
2006-03-28 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- change some code that resulted in init routines on Mac OS X -- if the framework has
init routines it will use memory and slow down applications that link with WebKit
even in cases where those applications don't use WebKit
* kjs/date_object.cpp: Changed constants that were derived by multiplying other constants
to use immediate numbers instead. Apparently, double constant expressions of the type we
had here are evaluated at load time.
* kjs/list.cpp: Can't use OwnArrayPtr in ListImp because of the global instances of
ListImp, so go back to using a plain old pointer.
(KJS::List::List): Set overflow to 0 when initializing ListImp.
(KJS::List::release): Replace a clear call with a delete and explicit set to 0.
(KJS::List::append): Use raw pointers, and do a delete [] instead of finessing it with
a swap of OwnArrayPtr.
(KJS::List::copyFrom): Remove now-unneeded get().
(KJS::List::copyTail): Ditto.
* kjs/ustring.cpp: Changed UString::Rep::empty initializer a bit so that it doesn't get
a static initializer routine. Had to get rid of one level of constant to get the compiler
to understand it could initialize without any code.
- added a build step that checks for init routines
* JavaScriptCore.xcodeproj/project.pbxproj: Deleted now-unused custom build rule that
was replaced by the generate-derived-sources script a while back. Added a custom build
phase that invokes the check-for-global-initializers script.
2006-03-28 Timothy Hatcher <timothy@apple.com>
Reviewed by Eric.
fixes <rdar://problem/4458539> Unable to include Security(public) and WebKit(private) headers
* bindings/npapi.h: added #defines after the #ifndefs
2006-03-27 Maciej Stachowiak <mjs@apple.com>
Reviewed by Anders.
- fixed <rdar://problem/4489745> REGRESSION: Safari crashes at to display http://www.lgphilips-lcd.com/
* kjs/nodes.cpp:
(Node::deref): take into account the case where the extra refcount table was never created
2006-03-23 David Carson <dacarson@gmail.com>
Reviewed by Darin.
- JSObject in LiveConnect not working.
http://bugs.webkit.org/show_bug.cgi?id=7917
* bindings/jni_jsobject.cpp:
(JavaJSObject::convertJObjectToValue): Was trying to retrieve the native pointer from the wrong base
class, and the GetFieldID was using the wrong signature.
2006-03-23 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix buildbot
* JavaScriptCore.xcodeproj/project.pbxproj: Change target name to JavaScriptCore (it was "include"!?).
Also add -Y 3 option for linker.
2006-03-23 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=7726
REGRESSION: orbitz calendar fails (JavaScript function serialization/parsing)
* kjs/object.h: Take function name, as well as source URL and line number, when
using the special overloaded construct for making functions.
* kjs/object.cpp: (KJS::JSObject::construct): Ditto.
* kjs/function_object.h: Ditto.
* kjs/function_object.cpp: (FunctionObjectImp::construct): Pass a name when
constructing the function rather than null. Use "anonymous" when making a
function using the default function constructor.
* kjs/nodes2string.cpp: (FuncDeclNode::streamTo): Put a line break just before
a function declaration.
- unrelated fix
* kxmlcore/HashMapPtrSpec.h: Add missing needed friend declaration.
2006-03-23 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=7805
LEAK: method name leaks in KJS::Bindings::CInstance::invokeMethod
* bindings/c/c_utility.h: Remove NPN_UTF16FromString declaration (not implemented).
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertValueToNPVariant): Use DOUBLE_TO_NPVARIANT,
BOOLEAN_TO_NPVARIANT, VOID_TO_NPVARIANT, NULL_TO_NPVARIANT, and
OBJECT_TO_NPVARIANT. In the case of OBJECT, call _NPN_RetainObject in
one case and remove a _NPN_ReleaseObject in another because this
should return a retained value.
(KJS::Bindings::convertNPVariantToValue): Use NPVARIANT_TO_BOOLEAN,
NPVARIANT_TO_INT32, and NPVARIANT_TO_DOUBLE.
* bindings/c/c_runtime.h: Removed implementations of CMethod::name and
CField::name that called _NPN_UTF8FromIdentifier and hence leaked.
* bindings/c/c_runtime.cpp:
(KJS::Bindings::CMethod::name): Added. Returns the string from inside the
method object.
(KJS::Bindings::CField::name): Added. Returns the string from inside the
field object.
(KJS::Bindings::CField::valueFromInstance): Added call to _NPN_ReleaseVariantValue
on the result of getProperty after using it to fix a storage leak.
(KJS::Bindings::CField::setValueToInstance): Added call to _NPN_ReleaseVariantValue
after pasing a value to setProperty now that the conversion function does a retain.
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::invokeMethod): Changed to use Vector for a local
stack buffer. Removed special case for NPVARIANT_IS_VOID because the
convertNPVariantToValue function handles that properly.
(KJS::Bindings::CInstance::invokeDefaultMethod): Ditto.
* bindings/NP_jsobject.h: Formatting changes only.
* bindings/NP_jsobject.cpp:
(jsDeallocate): Changed parameter type so we don't need a function cast.
(_NPN_InvokeDefault): Use VOID_TO_NPVARIANT.
(_NPN_Invoke): Use NULL_TO_NPVARIANT and VOID_TO_NPVARIANT.
(_NPN_Evaluate): Use VOID_TO_NPVARIANT.
(_NPN_GetProperty): Use NULL_TO_NPVARIANT and VOID_TO_NPVARIANT.
* bindings/c/c_class.cpp: Formatting changes only.
* bindings/c/c_class.h: Formatting changes only.
* bindings/npruntime_priv.h: Removed obsolete and now-unused functions:
NPN_VariantIsVoid, NPN_VariantIsNull, NPN_VariantIsUndefined,
NPN_VariantIsBool, NPN_VariantIsInt32, NPN_VariantIsDouble,
NPN_VariantIsString, NPN_VariantIsObject, NPN_VariantToBool,
NPN_VariantToInt32, NPN_VariantToDouble, NPN_VariantToString,
NPN_VariantToStringCopy, NPN_VariantToObject, NPN_InitializeVariantAsVoid,
NPN_InitializeVariantAsNull, NPN_InitializeVariantAsUndefined,
NPN_InitializeVariantWithBool, NPN_InitializeVariantWithInt32,
NPN_InitializeVariantWithDouble, NPN_InitializeVariantWithString,
NPN_InitializeVariantWithObject, and NPN_InitializeVariantWithVariant.
* bindings/npruntime.cpp:
(getIntIdentifierDictionary): Don't bother creating custom callbacks for the
integer dictionary since the default behavior is fine for integers.
2006-03-23 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed and landed by Maciej.
- WebKit no longer builds with bison 2.1
http://bugs.webkit.org/show_bug.cgi?id=7923
* generate-derived-sources: Handle generated header named either grammar.cpp.h
or grammar.hpp.
2006-03-22 Maciej Stachowiak <mjs@apple.com>
- fix the build
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-03-21 Maciej Stachowiak <mjs@apple.com>
* kjs/generate-derived-sources: Set executable property.
2006-03-21 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
Ensure that generated source dependencies are handled properly, as follows:
- Made an external script that generates the sources into a
DerivedSources dir in the build products directory.
- Added a new build target that builds all the generated sources
if needed. Sadly it has to be a target, not a phase for Xcode to notice changes.
- Added the DerivedSources dir in question to the include path.
- Added the new DerivedSources dir and its contents to the project as build-relative.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/generate-derived-sources: Added. Based on the windows version - maybe someday they
can share more.
2006-03-11 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fixed "charAt layout test fails on intel macs; some NaNs are printed as -NaN"
http://bugs.webkit.org/show_bug.cgi?id=7745
* kjs/ustring.cpp:
(KJS::UString::from): Use "NaN" for all NaN values, regardless of sign.
2006-03-16 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- tweaks to my change to redo KJS::Node refcounting
* kjs/nodes.cpp:
(Node::ref):
(Node::deref):
(Node::refcount):
(Node::clearNewNodes):
* kjs/nodes.h:
2006-03-16 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed Vector so that you can pass a reference to something in the vector
to the append or insert functions
* kxmlcore/Vector.h:
(KXMLCore::Vector::expandCapacity): Added new overloads that take a pointer to adjust
and return the adjusted value of the pointer.
(KXMLCore::Vector::append): Pass a pointer when expanding the vector, and use it when
adding the new element. Makes the case where the element moves when the vector
is expanded work.
(KXMLCore::Vector::insert): Ditto.
2006-03-15 Eric Seidel <eseidel@apple.com>
Reviewed by adele.
Build fix.
* kjs/date_object.cpp:
(KJS::DateProtoFunc::callAsFunction): use size() not "len()"
2006-03-15 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
Fix CString copy constructor, fixes Date.parse("") on Win32.
* kjs/date_object.cpp:
(KJS::DateProtoFunc::callAsFunction):
* kjs/ustring.cpp:
(KJS::CString::CString):
(KJS::CString::operator=):
2006-03-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Anders.
- KJS::Node and KJS::StatementNode are bigger than they need to be
http://bugs.webkit.org/show_bug.cgi?id=7775
The memory usage of Node was reduced by 2 machine words per node:
- sourceURL was removed and only kept on FunctionBodyNode. The
source URL can only be distinct per function or top-level program node,
and you always have one.
- refcount was removed and kept in a separate hashtable when
greater than 1. newNodes set represents floating nodes with
refcount of 0. This helps because almost all nodes have a refcount of 1
for almost all of their lifetime.
* bindings/runtime_method.cpp:
(RuntimeMethod::RuntimeMethod): Pass null body, added FIXME.
* kjs/Parser.cpp:
(KJS::clearNewNodes): New nodes are tracked in nodes.cpp now, but still clear
them at the appropriate time.
* kjs/context.h:
(KJS::ContextImp::currentBody): added; used to retrieve source URL and sid
for current code.
(KJS::ContextImp::pushIteration): moved here from LabelStack
(KJS::ContextImp::popIteration): ditto
(KJS::ContextImp::inIteration): ditto
(KJS::ContextImp::pushSwitch): ditto
(KJS::ContextImp::popSwitch): ditto
(KJS::ContextImp::inSwitch): ditto
* kjs/function.cpp:
(KJS::FunctionImp::FunctionImp): Add FunctionBodyNode* parameter.
(KJS::FunctionImp::callAsFunction): Pass body to ContextImp.
(KJS::FunctionImp::argumentsGetter): _context renamed to m_context.
(KJS::DeclaredFunctionImp::DeclaredFunctionImp): Pass body to superclass
constructor.
(KJS::GlobalFuncImp::callAsFunction): Pass progNode as body for ContextImp in
eval.
* kjs/function.h: Move body field from DeclaredFunctionImp to
FunctionImp.
* kjs/grammar.y: Change DBG; statements no longer have a sourceid.
* kjs/internal.cpp:
(KJS::ContextImp::ContextImp): Initialize new m_currentBody, m_iterationDepth
and m_switchDepth data members. New FunctionBodyNode* parameter - the
function body provides source URL and SourceId.
(KJS::InterpreterImp::mark): Use exception() function, not _exception directly.
(KJS::InterpreterImp::evaluate): Pass progNode to ContextImp constructor
to use as the body.
* kjs/internal.h:
(KJS::LabelStack::LabelStack): Remove iteration depth and switch depth;
statement label stacks don't need these and it bloats their size. Put them
in the ContextImp instead.
* kjs/interpreter.cpp:
(KJS::ExecState::lexicalInterpreter): Renamed _context to m_context.
* kjs/interpreter.h:
(KJS::ExecState::dynamicInterpreter): Renamed _context to m_context.
(KJS::ExecState::context): ditto
(KJS::ExecState::setException): Renamed _exception to m_exception
(KJS::ExecState::clearException): ditto
(KJS::ExecState::exception): ditto
(KJS::ExecState::hadException): ditto
(KJS::ExecState::ExecState): ditto both above renames
* kjs/nodes.cpp:
(Node::Node): Removed initialization of line, source URL and refcount. Add to
local newNodes set instead of involving parser.
(Node::ref): Instead of managing refcount directly, story refcount over 1 in a
HashCountedSet, and keep a separate HashSet of "floating" nodes with refcount
0.
(Node::deref): ditto
(Node::refcount): ditto
(Node::clearNewNodes): Destroy anything left in the new nodes set.
(currentSourceId): Inline helper to get sourceId from function body via context.
(currentSourceURL): ditto for sourceURL.
(Node::createErrorCompletion): use new helper
(Node::throwError): ditto
(Node::setExceptionDetailsIfNeeded): ditto
(StatementNode::StatementNode): remove initialization of l0 and sid, rename
l1 to m_lastLine.
(StatementNode::setLoc): Set own m_lastLine and Node's m_line.
(StatementNode::hitStatement): Get sid, first line, last line in the proper new ways.
(StatListNode::StatListNode): updated for setLoc changes
(BlockNode::BlockNode): ditto
(DoWhileNode::execute): excpect iteraton counts on ContextImp, not LabelStack
(WhileNode::execute): ditto
(ForNode::execute): ditto
(ForInNode::execute): ditto
(ContinueNode::execute): excpect inIteration on ContextImp, not LabelStack
(BreakNode::execute): excpect inIteration and inSwitch on ContextImp, not LabelStack
(SwitchNode::execute): expect switch counts on ContextImp, not LabelStack
(FunctionBodyNode::FunctionBodyNode): update for new setLoc
(FunctionBodyNode::processFuncDecl): reindent
(SourceElementsNode::SourceElementsNode): update for new setLoc
* kjs/nodes.h:
(KJS::Node::lineNo): Renamed _line to m_line
(KJS::StatementNode::firstLine): Use lineNo()
(KJS::StatementNode::lastLine): Renamed l1 to m_lastLine
(KJS::FunctionBodyNode::sourceId): added
(KJS::FunctionBodyNode::sourceURL): added
* kjs/testkjs.cpp:
2006-03-14 Geoffrey Garen <ggaren@apple.com>
- Fixed <rdar://problem/4478239> string sort puts "closed" before
"close"
Reviewed by Eric.
* kjs/ustring.cpp:
(KJS::compare): Inverted a < in order to treat the longer string as >
the shorter string.
2006-03-12 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=7708
REGRESSION: Flash callback to JavaScript function not working.
Test: plugins/invoke.html
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertUTF8ToUTF16): Return a correct string length.
2006-03-08 Eric Seidel <eseidel@apple.com>
Reviewed by darin.
Partially fix JS on win32 by fixing hash table generation.
* kjs/create_hash_table: limit << results to 32 bits.
* kjs/testkjs.cpp:
(TestFunctionImp::callAsFunction):
2006-03-07 Darin Adler <darin@apple.com>
* kxmlcore/Vector.h: Quick fix to try to get Windows compiling again.
2006-03-07 Darin Adler <darin@apple.com>
Reviewed by Anders.
- fix http://bugs.webkit.org/show_bug.cgi?id=7655
unwanted output while running layout tests
* kjs/lexer.cpp: (Lexer::lex): Turn off the "yylex: ERROR" message.
* kjs/regexp.cpp: (KJS::RegExp::RegExp): Remove the code to log errors from PCRE
to standard output. I think we should arrange for the error text to be in JavaScript
exceptions instead at some point.
* kxmlcore/Vector.h: Add a check for overflow so that we'll abort if we pass a
too-large size rather than allocating a buffer smaller than requested.
2006-03-06 David Carson <dacarson@gmail.com>
Reviewed by Darin, landed by ap.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=7582
c_utility.cpp contains CFString OS X platform-dependent code; should use ICU
Tested with test case from:
http://bugs.webkit.org/show_bug.cgi?id=5163
* bindings/c_utility.cpp
(convertUTF8ToUTF16): Changed to using Unicode converter from ICU, and manual Latin-1 conversion.
* icu/unicode/ucnv.h: Copied from WebCore.
* icu/unicode/ucnv_err.h: Ditto.
* icu/unicode/uenum.h: Ditto.
2006-03-05 Darin Adler <darin@apple.com>
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Updated.
2006-03-06 Mitz Pettel <opendarwin.org@mitzpettel.com>
Fix suggested by Alexey Proskuryakov <ap@nypop.com>, reviewed by Maciej and Hyatt.
- fix http://bugs.webkit.org/show_bug.cgi?id=7601
REGRESSION (r13089): Reproducible crash dereferencing a deallocated element on google image search
* kxmlcore/Platform.h: Corrected the define to enable USE(MULTIPLE_THREADS) on Mac OS X.
2006-03-05 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- http://bugs.webkit.org/show_bug.cgi?id=7616
get all references to KJS::Node out of internal.h
* JavaScriptCore.xcodeproj/project.pbxproj: Updated for file changes.
* kjs/Parser.cpp: Added.
* kjs/Parser.h: Added.
* kjs/internal.cpp: Removed the Parser class.
* kjs/internal.h: Ditto. Also removed unnecessary declarations of classes
not used in this header.
* kjs/nodes.h: Added an include of "Parser.h".
* kjs/function.h: Added a declaration of FunctionBodyNode.
2006-03-05 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
- JSC support for the fix for <rdar://problem/4467143> JavaScript
enumeration of HTML element properties skips DOM node properties
* kjs/lookup.h:
(1) Added the KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE macro. The
class definiton macro needs to know about the prototype's prototype so
that the class constructor properly sets it.
(2) Removed the KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT macro. The class
implementation macro does not need to know about the prototype's
prototype, since getOwnPropertySlot should only look in the current
object's property map, and not its prototype's.
2006-03-05 Andrew Wellington <proton@wiretapped.net>
Reviewed by Eric, landed by ap.
- Remove unused breakpoint bool from StatementNodes. No test provided as
there is no functionality change.
* kjs/nodes.cpp:
(StatementNode::StatementNode):
* kjs/nodes.h:
2006-03-03 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- Fixed <rdar://problem/4465598> REGRESSION (TOT): Crash occurs at
http://maps.google.com/?output=html ( KJS::Identifier::add(KJS::UString::Rep*)
This regression was caused by my fix for 4448098. I failed to account for the
deleted entry sentinel in the mehtod that saves the contents of a property map to
the back/forward cache.
Manual test in WebCore/manual-tests/property-map-save-crash.html
* kjs/property_map.cpp:
(KJS::deletedSentinel): Use 1 instead of -1 to facilitate an easy bit mask
(KJS::isValid): New function: checks if a key is null or the deleted sentinel
(KJS::PropertyMap::~PropertyMap): Fixed up the branch logic here for readability
and a slight performance win
(KJS::PropertyMap::clear):
(KJS::PropertyMap::rehash):
(KJS::PropertyMap::addSparseArrayPropertiesToReferenceList):
(KJS::PropertyMap::save): Check keys with isValid()
2006-03-02 Maciej Stachowiak <mjs@apple.com>
- now fix mac build again
* kjs/identifier.cpp:
2006-03-02 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Anders and Eric.
- add fpconst.cpp to win32 build, it is now needed
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* kjs/fpconst.cpp:
2006-03-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- fix windows build, broken by my last patch
* kjs/JSImmediate.cpp:
* kjs/identifier.cpp:
* kxmlcore/FastMalloc.cpp:
* kxmlcore/Platform.h:
2006-03-01 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- Set up new prototype macros and avoid using #if without defined() in JSC
Added new PLATFORM macros and related, to make sure #if's all check if relevant macros
are defined, and to separate core OS-level dependencies from operating environment
dependencies so you can, e.g., build KDE on Mac or Windows.
* kxmlcore/Platform.h: Added.
- deploy them everywhere in JavaScriptCore
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::convertValueToJValue):
* bindings/objc/WebScriptObject.mm:
* bindings/objc/objc_instance.mm:
(ObjcInstance::end):
* bindings/softlinking.h:
* bindings/testbindings.mm:
(main):
* kjs/JSLock.cpp:
* kjs/collector.cpp:
(KJS::Collector::markCurrentThreadConservatively):
(KJS::Collector::markOtherThreadConservatively):
(KJS::Collector::markStackObjectsConservatively):
* kjs/config.h:
* kjs/date_object.cpp:
(gmtoffset):
(KJS::formatTime):
(KJS::DateProtoFunc::callAsFunction):
(KJS::DateObjectImp::construct):
(KJS::makeTime):
* kjs/dtoa.cpp:
* kjs/fpconst.cpp:
(KJS::sizeof):
(KJS::):
* kjs/grammar.y:
* kjs/identifier.cpp:
* kjs/internal.cpp:
* kjs/interpreter.cpp:
(KJS::Interpreter::evaluate):
(KJS::Interpreter::createLanguageInstanceForValue):
* kjs/interpreter.h:
* kjs/lookup.cpp:
* kjs/lookup.h:
* kjs/math_object.cpp:
* kjs/object.cpp:
* kjs/object.h:
* kjs/operations.cpp:
(KJS::isNaN):
(KJS::isInf):
(KJS::isPosInf):
(KJS::isNegInf):
* kjs/operations.h:
* kjs/regexp.cpp:
(KJS::RegExp::RegExp):
(KJS::RegExp::~RegExp):
(KJS::RegExp::match):
* kjs/regexp.h:
* kjs/testkjs.cpp:
(StopWatch::start):
(StopWatch::stop):
(StopWatch::getElapsedMS):
* kjs/ustring.cpp:
* kjs/ustring.h:
* kxmlcore/AlwaysInline.h:
* kxmlcore/Assertions.cpp:
* kxmlcore/Assertions.h:
* kxmlcore/FastMalloc.cpp:
(KXMLCore::):
* kxmlcore/FastMalloc.h:
* kxmlcore/FastMallocInternal.h:
* kxmlcore/HashTable.h:
* kxmlcore/TCPageMap.h:
* kxmlcore/TCSpinLock.h:
(TCMalloc_SpinLock::Lock):
(TCMalloc_SpinLock::Unlock):
(TCMalloc_SlowLock):
* kxmlcore/TCSystemAlloc.cpp:
(TCMalloc_SystemAlloc):
* os-win32/stdint.h:
2006-02-28 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- Fixed <rdar://problem/4448098> Switch PropertyMap deleted entry
placeholder to -1 from UString::Rep::null
This turned out to be only a small speedup (.12%). That's within the
margin of error for super accurate JS iBench, but Shark confirms the
same, so I think it's worth landing.
FYI, I also confirmed that the single entry optimization in
PropertyMap is a 3.2% speedup.
* kjs/property_map.cpp:
(KJS::PropertyMap::~PropertyMap):
(KJS::PropertyMap::clear):
(KJS::PropertyMap::put):
(KJS::PropertyMap::insert):
(KJS::PropertyMap::rehash):
(KJS::PropertyMap::remove):
(KJS::PropertyMap::addSparseArrayPropertiesToReferenceList):
(KJS::PropertyMap::checkConsistency):
* kjs/property_map.h:
(KJS::PropertyMap::deletedSentinel):
2006-02-27 Eric Seidel <eseidel@apple.com>
Rubber-stamped by darin.
Remove fpconst.cpp, unused on win32 and the cause of linker warnings.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
2006-02-27 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
Fix Assertions.cpp to compile on win32.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* kxmlcore/Assertions.cpp:
2006-02-27 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
Made Assertions.cpp platform independent.
Moved mac-specific logging logic up into WebCore.
http://bugs.webkit.org/show_bug.cgi?id=7503
* JavaScriptCore.xcodeproj/project.pbxproj:
* kxmlcore/Assertions.cpp: Added.
* kxmlcore/Assertions.h:
* kxmlcore/Assertions.mm: Removed.
2006-02-27 Darin Adler <darin@apple.com>
- fixed Mac Debug build, there was an unused parameter
* kxmlcore/FastMalloc.cpp: (KXMLCore::fastMallocRegisterThread):
Remove parameter name.
* kjs/debugger.h: Fixed comment.
2006-02-27 Eric Seidel <eseidel@apple.com>
Reviewed by darin.
* kxmlcore/Vector.h:
(KXMLCore::deleteAllValues): fix unused variable warning
2006-02-21 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- Turn off -Wno-unused-param for JavaScriptCore and get rid of unused params
http://bugs.webkit.org/show_bug.cgi?id=7384
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/NP_jsobject.cpp:
(jsAllocate):
(_NPN_InvokeDefault):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_RemoveProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
* bindings/c/c_class.h:
(KJS::Bindings::CClass::constructorAt):
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertNPVariantToValue):
* bindings/jni/jni_class.cpp:
(JavaClass::methodsNamed):
(JavaClass::fieldNamed):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeDefaultMethod):
* bindings/jni/jni_jsobject.cpp:
* bindings/jni/jni_objc.mm:
(-[NSObject KJS::Bindings::]):
* bindings/objc/WebScriptObject.mm:
(+[WebUndefined allocWithZone:]):
(-[WebUndefined initWithCoder:]):
(-[WebUndefined encodeWithCoder:]):
(-[WebUndefined copyWithZone:]):
* bindings/objc/objc_class.h:
(KJS::Bindings::ObjcClass::constructorAt):
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::methodsNamed):
(KJS::Bindings::ObjcClass::fallbackObject):
* bindings/objc/objc_instance.mm:
(ObjcInstance::getValueOfUndefinedField):
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::getOwnPropertySlot):
(ObjcFallbackObjectImp::put):
(ObjcFallbackObjectImp::canPut):
(ObjcFallbackObjectImp::deleteProperty):
(ObjcFallbackObjectImp::toBoolean):
* bindings/runtime.cpp:
(KJS::Bindings::Instance::createLanguageInstanceForValue):
* bindings/runtime.h:
(KJS::Bindings::Instance::getValueOfUndefinedField):
(KJS::Bindings::Instance::setValueOfUndefinedField):
* bindings/runtime_array.cpp:
(RuntimeArray::lengthGetter):
(RuntimeArray::indexGetter):
(RuntimeArray::put):
(RuntimeArray::deleteProperty):
* bindings/runtime_method.cpp:
(RuntimeMethod::lengthGetter):
(RuntimeMethod::execute):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::fallbackObjectGetter):
(RuntimeObjectImp::fieldGetter):
(RuntimeObjectImp::methodGetter):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::deleteProperty):
(RuntimeObjectImp::defaultValue):
(RuntimeObjectImp::callAsFunction):
* bindings/runtime_root.cpp:
(performJavaScriptAccess):
* kjs/array_object.cpp:
(ArrayInstance::lengthGetter):
(ArrayInstance::getOwnPropertySlot):
(ArrayPrototype::ArrayPrototype):
(ArrayPrototype::getOwnPropertySlot):
* kjs/bool_object.cpp:
(BooleanObjectImp::BooleanObjectImp):
* kjs/date_object.cpp:
(KJS::DateObjectFuncImp::DateObjectFuncImp):
(KJS::DateObjectFuncImp::callAsFunction):
* kjs/error_object.cpp:
(ErrorObjectImp::ErrorObjectImp):
(NativeErrorPrototype::NativeErrorPrototype):
(NativeErrorImp::NativeErrorImp):
* kjs/function.cpp:
(KJS::FunctionImp::argumentsGetter):
(KJS::FunctionImp::lengthGetter):
(KJS::Arguments::mappedIndexGetter):
(KJS::ActivationImp::argumentsGetter):
(KJS::ActivationImp::put):
* kjs/function_object.cpp:
(FunctionObjectImp::FunctionObjectImp):
* kjs/internal.cpp:
(KJS::GetterSetterImp::toPrimitive):
(KJS::GetterSetterImp::toBoolean):
* kjs/interpreter.cpp:
(KJS::Interpreter::evaluate):
* kjs/interpreter.h:
(KJS::Interpreter::isGlobalObject):
(KJS::Interpreter::interpreterForGlobalObject):
(KJS::Interpreter::isSafeScript):
* kjs/lexer.cpp:
(Lexer::makeIdentifier):
(Lexer::makeUString):
* kjs/lookup.h:
(KJS::staticFunctionGetter):
(KJS::staticValueGetter):
* kjs/nodes.cpp:
(StatementNode::processFuncDecl):
(PropertyNode::evaluate):
(PropertyNameNode::evaluate):
* kjs/number_object.cpp:
(NumberObjectImp::NumberObjectImp):
(NumberObjectImp::getOwnPropertySlot):
* kjs/object.cpp:
(KJS::JSObject::defineGetter):
(KJS::JSObject::defineSetter):
(KJS::JSObject::hasInstance):
(KJS::JSObject::propertyIsEnumerable):
* kjs/object_object.cpp:
(ObjectObjectImp::ObjectObjectImp):
* kjs/property_slot.cpp:
(KJS::PropertySlot::undefinedGetter):
(KJS::PropertySlot::functionGetter):
* kjs/reference.cpp:
(KJS::Reference::getPropertyName):
* kjs/reference_list.cpp:
(ReferenceListIterator::operator++):
* kjs/regexp_object.cpp:
(RegExpObjectImp::RegExpObjectImp):
(RegExpObjectImp::getValueProperty):
(RegExpObjectImp::putValueProperty):
* kjs/string_object.cpp:
(StringInstance::lengthGetter):
(StringInstance::indexGetter):
(StringPrototype::StringPrototype):
* kxmlcore/Assertions.mm:
* kxmlcore/FastMalloc.cpp:
(KXMLCore::TCMalloc_PageHeap::CheckList):
* kxmlcore/HashTable.h:
(KXMLCore::HashTableConstIterator::checkValidity):
(KXMLCore::IdentityHashTranslator::translate):
* pcre/pcre_get.c:
(pcre_get_stringnumber):
2006-02-23 Darin Adler <darin@apple.com>
- try to fix buildbot failure
* bindings/c/c_utility.cpp: Touch this file, which seems to not have been
recompiled after additional inlining was introduced (Xcode bug?).
2006-02-23 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin, Maciej.
- Inline some functions suggested by Shark. 2.9% speedup on super
accurate JS iBench.
http://bugs.webkit.org/show_bug.cgi?id=7411
<rdar://problem/4448116>
* kjs/nodes.h:
(KJS::ArgumentsNode::evaluateList):
* kjs/object.cpp:
* kjs/object.h:
(KJS::ScopeChain::release):
(KJS::JSObject::toPrimitive):
* kjs/scope_chain.cpp:
* kjs/ustring.cpp:
* kjs/ustring.h:
(KJS::UString::toArrayIndex):
* kjs/value.cpp:
* kjs/value.h:
(KJS::JSValue::toObject):
* kxmlcore/FastMalloc.cpp:
(KXMLCore::TCMalloc_ThreadCache_FreeList::Push):
(KXMLCore::TCMalloc_ThreadCache_FreeList::Pop):
2006-02-21 Eric Seidel <eseidel@apple.com>
Added *.user to ignore list.
2006-02-21 Eric Seidel <eseidel@apple.com>
Reviewed by ggaren.
Add grammarWrapper.cpp to work around visual studio bug plaguing buildbot.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp: Added.
2006-02-21 Eric Seidel <eseidel@apple.com>
Reviewed by ggaren.
* kjs/testkjs.cpp: #if out timeval code on win32
2006-02-21 Michael Emmel <mike.emmel@gmail.com>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=7397
TCPageMap.h would not compile for me because string.h was missing
* kxmlcore/TCPageMap.h: Added <string.h> include.
2006-02-21 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
- http://bugs.webkit.org/show_bug.cgi?id=7404
remove a bunch of extra implementsCall overrides
* JavaScriptCore.xcodeproj/project.pbxproj: Sorted files.
* kjs/internal.h: Made InternalFunctionImp::callAsFunction pure virtual so that
we'll get a compile error if some derived class neglects to implement it.
* kjs/function.cpp: (KJS::FunctionImp::FunctionImp): Remove unneeded initialization
of param, which is an OwnPtr so it gets initialized by default.
* bindings/runtime_method.cpp:
* bindings/runtime_method.h:
* kjs/array_object.cpp:
* kjs/array_object.h:
* kjs/bool_object.cpp:
* kjs/bool_object.h:
* kjs/date_object.cpp:
* kjs/date_object.h:
* kjs/error_object.cpp:
* kjs/error_object.h:
* kjs/function.cpp:
* kjs/function.h:
* kjs/function_object.cpp:
* kjs/function_object.h:
* kjs/math_object.cpp:
* kjs/math_object.h:
* kjs/number_object.cpp:
* kjs/number_object.h:
* kjs/object_object.cpp:
* kjs/object_object.h:
* kjs/regexp_object.cpp:
* kjs/regexp_object.h:
* kjs/string_object.cpp:
* kjs/string_object.h:
Removed many rendundant implementations of implementsCall from subclasses of
InternalFunctionImp.
2006-02-21 Darin Adler <darin@apple.com>
- fixed build
* kjs/internal.cpp: (KJS::InternalFunctionImp::implementsCall):
Oops, fixed name.
2006-02-21 Darin Adler <darin@apple.com>
Change suggested by Mitz.
- http://bugs.webkit.org/show_bug.cgi?id=7402
REGRESSION: Methods do not execute
* kjs/internal.h: Add implementsHasCall to InternalFunctionImp.
* kjs/internal.cpp: (KJS::InternalFunctionImp::implementsHasCall):
Return true. All the classes derived from InternalFunctionImp need
to return true from this -- later we can remove all the extra
implementations too.
2006-02-21 Maciej Stachowiak <mjs@apple.com>
- fix build breakage caused by last-minute change to my patch
* kjs/lookup.h:
2006-02-20 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff and Darin.
Patch from Maks Orlovich, based on work by David Faure, hand-applied and
significantly reworked by me.
- Patch: give internal function names (KJS merge)
http://bugs.webkit.org/show_bug.cgi?id=6279
* tests/mozilla/expected.html: Updated for newly fixed test.
* kjs/array_object.cpp:
(ArrayProtoFunc::ArrayProtoFunc):
* kjs/array_object.h:
* kjs/bool_object.cpp:
(BooleanPrototype::BooleanPrototype):
(BooleanProtoFunc::BooleanProtoFunc):
* kjs/bool_object.h:
* kjs/date_object.cpp:
(KJS::DateProtoFunc::DateProtoFunc):
(KJS::DateObjectImp::DateObjectImp):
(KJS::DateObjectFuncImp::DateObjectFuncImp):
* kjs/error_object.cpp:
(ErrorPrototype::ErrorPrototype):
(ErrorProtoFunc::ErrorProtoFunc):
* kjs/error_object.h:
* kjs/function.cpp:
(KJS::FunctionImp::FunctionImp):
(KJS::GlobalFuncImp::GlobalFuncImp):
* kjs/function.h:
* kjs/function_object.cpp:
(FunctionPrototype::FunctionPrototype):
(FunctionProtoFunc::FunctionProtoFunc):
(FunctionProtoFunc::callAsFunction):
* kjs/function_object.h:
* kjs/internal.cpp:
(KJS::InterpreterImp::initGlobalObject):
(KJS::InternalFunctionImp::InternalFunctionImp):
* kjs/internal.h:
(KJS::InternalFunctionImp::functionName):
* kjs/lookup.h:
(KJS::staticFunctionGetter):
(KJS::HashEntryFunction::HashEntryFunction):
(KJS::HashEntryFunction::implementsCall):
(KJS::HashEntryFunction::toBoolean):
(KJS::HashEntryFunction::implementsHasInstance):
(KJS::HashEntryFunction::hasInstance):
* kjs/math_object.cpp:
(MathFuncImp::MathFuncImp):
* kjs/math_object.h:
* kjs/number_object.cpp:
(NumberPrototype::NumberPrototype):
(NumberProtoFunc::NumberProtoFunc):
* kjs/number_object.h:
* kjs/object.cpp:
(KJS::JSObject::putDirectFunction):
(KJS::Error::create):
* kjs/object.h:
* kjs/object_object.cpp:
(ObjectPrototype::ObjectPrototype):
(ObjectProtoFunc::ObjectProtoFunc):
* kjs/object_object.h:
* kjs/regexp_object.cpp:
(RegExpPrototype::RegExpPrototype):
(RegExpProtoFunc::RegExpProtoFunc):
* kjs/regexp_object.h:
* kjs/string_object.cpp:
(StringProtoFunc::StringProtoFunc):
(StringObjectImp::StringObjectImp):
(StringObjectFuncImp::StringObjectFuncImp):
* kjs/string_object.h:
2006-02-20 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin, with help from Eric, Maciej.
- More changes to support super-accurate JS iBench. Doesn't work on
Windows. (Doesn't break Windows, either.) I've filed
[http://bugs.webkit.org/show_bug.cgi?id=7399] about that.
* kjs/interpreter.cpp:
(KJS::Interpreter::evaluate): Print line numbers with exception output
* kjs/testkjs.cpp: Changed " *" to "* " because Eric says that's the
way we roll with .cpp files.
(StopWatch::StopWatch): New class. Provides microsecond-accurate
timings.
(StopWatch::~StopWatch):
(StopWatch::start):
(StopWatch::stop):
(StopWatch::getElapsedMS):
(TestFunctionImp::callAsFunction): Added missing return statement.
Fixed up "run" to use refactored helper functions. Removed bogus
return statement from "quit" case. Made "print" output to stdout
instead of stderr because that makes more sense, and PERL handles
stdout better.
(main): Factored out KXMLCore unit tests. Removed custom exception
printing code because the interpreter prints exceptions for you. Added
a "delete" call for the GlobalImp we allocate.
(testIsInteger): New function, result of refacotring.
(createStringWithContentsOfFile): New function, result of refactoring.
Renamed "code" to "buffer" to match factored-out-ness.
2006-02-20 Eric Seidel <eseidel@apple.com>
Reviewed by hyatt.
Fix "Copy ICU DLLs..." phase.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
2006-02-19 Darin Adler <darin@apple.com>
- renamed ERROR to LOG_ERROR to fix build
presumably Maciej had this change and forgot to land it
* kjs/collector.cpp: Removed now-unneeded #undef ERROR.
* kxmlcore/Assertions.h: Renamed ERROR to LOG_ERROR.
* kxmlcore/FastMalloc.cpp: Changed MESSAGE macro to use LOG_ERROR.
2006-02-18 Mitz Pettel <opendarwin.org@mitzpettel.com>
Test: fast/js/toString-exception.html
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=7343
REGRESSION: fast/js/toString-overrides.html fails when run multiple times
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): Remove the object from the visited elements set before
returning an error.
2006-02-18 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- http://bugs.webkit.org/show_bug.cgi?id=7345
add insert and remove to KXMLCore::Vector
* kxmlcore/Vector.h: Added "moveOverlapping", which is used in both
insert and remove to slide elements within the vector. Also added
"insert" and "remove" functions.
2006-02-16 Geoffrey Garen <ggaren@apple.com>
Reviewed by John.
- Fixed <rdar://problem/4448534> TOT REGRESSION: crash in KJS::
Bindings::Instance::deref when leaving page @ gigaom.com
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::~CInstance): Since we cache the class object
globally, we shouldn't delete it, so don't.
2006-02-16 Timothy Hatcher <timothy@apple.com>
Added -Wno-deprecated-declarations to all the ObjC binding files to prevent deprecation
warnings. Using <rdar://problem/4448350> to track this.
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/objc/objc_jsobject.h: Removed empty file.
* bindings/objc/objc_jsobject.mm: Removed empty file.
2006-02-16 Tim Omernick <timo@apple.com>
Reviewed by Geoff.
<rdar://problem/4428609> Flash Player 8.0.22 can crash Safari (and WebKit apps) with
javascript disabled (7015)
* bindings/NP_jsobject.cpp:
(_NPN_CreateNoScriptObject):
Returns an NPObject which is not bound to a JavaScript object. This kind of NPObject
can be given to a plugin as the "window script object" when JavaScript is disabled.
The object has a custom NPClass, NPNoScriptObjectClass, which has no defined methods.
Because of this, none of the NPN_* functions called by the plugin on this "no script
object" will cause entry into JavaScript code.
(_NPN_InvokeDefault):
Make sure the NPVariant is filled before returning from this function. This never
mattered before because we never reached this case, having only created NPObjects of
the class NPScriptObjectClass.
(_NPN_Invoke):
ditto
(_NPN_Evaluate):
ditto
(_NPN_GetProperty):
ditto
* bindings/NP_jsobject.h:
Declared _NPN_CreateNoScriptObject().
2006-02-16 Darin Adler <darin@apple.com>
Reviewed by me, change by Peter Kuemmel.
* kjs/operations.cpp: (KJS::isNegInf): Fix Windows code, which was
checking for positive infinity (rolling in fix from KDE side).
2006-02-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej, Eric.
- JavaScriptCore half of fix for <rdar://problem/4176077> CrashTracer: 6569
crashes in DashboardClient at com.apple.JavaScriptCore:
KJS::Bindings::ObjcFallbackObjectImp::type()
WebCore and JavaScriptCore weren't sharing Instance objects very
nicely. I made them use RefPtrs, and sent them to bed without dessert.
* bindings/jni/jni_instance.cpp: Made _instance a RefPtr
(JavaInstance::~JavaInstance):
(JObjectWrapper::JObjectWrapper):
* bindings/jni/jni_instance.h:
(KJS::Bindings::JObjectWrapper::ref):
(KJS::Bindings::JObjectWrapper::deref):
* bindings/jni/jni_runtime.cpp: Made _array a RefPtr
(JavaArray::~JavaArray):
(JavaArray::JavaArray):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaArray::operator=):
* bindings/objc/objc_runtime.h:
- Prohibited copying because that would muss the ref count.
- Prohibited construction without instance because an instance wrapper
without an instance is almost certainly a bug.
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::ObjcFallbackObjectImp):
* bindings/runtime.cpp:
(KJS::Bindings::Instance::Instance):
(KJS::Bindings::Instance::createBindingForLanguageInstance):
(KJS::Bindings::Instance::createRuntimeObject):
* bindings/runtime.h:
(KJS::Bindings::Instance::ref):
(KJS::Bindings::Instance::deref):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::fallbackObjectGetter):
(RuntimeObjectImp::fieldGetter):
(RuntimeObjectImp::methodGetter):
(RuntimeObjectImp::getOwnPropertySlot):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
* bindings/runtime_object.h:
- Removed ownsInstance data member because RefPtr takes care of
instance lifetime now.
- Prohibited copying because that would muss the ref count.
- Prohibited construction without instance because an instance wrapper
without an instance is almost certainly a bug.
(KJS::RuntimeObjectImp::getInternalInstance):
2006-02-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by John.
- Applied the 4330457 change to CClass and ObjcClass as well.
Once plugins work in DumpRenderTree, running run-webkit-tests --leaks
will catch this.
This change isn't as critical because CClass and ObjcClass objects get
cached globally and never deleted, but it's good practice, in case we
ever do decide to delete CClass and ObjcClass objects.
This change requires prohibiting copying, because we don't do any
intelligent ref-counting -- when a Class is destroyed, it destroys its
methods and fields unconditionally. (Java classes already prohibited
copying.)
* bindings/c/c_class.cpp:
- Merged _commonInit and _commonDelete into constructor and destructor.
(CClass::CClass):
(CClass::~CClass):
(CClass::methodsNamed): Added delete callbacks
(CClass::fieldNamed): Added delete callbacks
* bindings/c/c_class.h: Prohibited copying
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::getClass): Changed to use the preferred
class factory method, to take advantage of the global cache.
[ Repeated changes applied to CClass for ObjcClass: ]
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::ObjcClass):
(KJS::Bindings::ObjcClass::~ObjcClass):
(KJS::Bindings::ObjcClass::methodsNamed):
(KJS::Bindings::ObjcClass::fieldNamed):
* bindings/objc/objc_runtime.h:
(KJS::Bindings::ObjcMethod::ObjcMethod): Initialized uninitialized
variable to prevent bad CFRelease.
(KJS::Bindings::ObjcMethod::~ObjcMethod): Removed erroneous ';' from
if statement to prevent bad CFRelease.
* bindings/objc/objc_runtime.cpp: Changed to use the preferred
ObjectStructPtr, for clarity.
2006-02-14 Geoffrey Garen <ggaren@apple.com>
Reviewed by John.
- Fixed <rdar://problem/4330457> CrashTracer: [REGRESSION] 3763 crashes
in Safari at com.apple.JavaScriptCore: KJS::Bindings::JavaInstance::
getClass const + 56
Once plugins work in DumpRenderTree, running run-webkit-tests --leaks
will catch this.
This was a memory leak in the bindings code. The leak was so extreme
that it would cause Safari or the JVM to abort from lack of memory.
Upon construction, Class objects create field and method objects,
storing them in CFDictionaries. The bug was that upon destruction, the
class objects released the dictionaries but didn't destroy the stored
objects.
The fix is to supply CFDictionary callbacks for destroying the values
added to the dictionary.
* bindings/jni/jni_class.cpp:
(JavaClass::JavaClass): Added delete callbacks
* bindings/runtime.cpp: Added definitions for delete callbacks
(KJS::Bindings::deleteMethodList):
(KJS::Bindings::deleteMethod):
(KJS::Bindings::deleteField):
* bindings/runtime.h: Added declarations for delete callbacks
2006-02-14 Timothy Hatcher <timothy@apple.com>
Reviewed by Justin.
Fixed <rdar://problem/4415050> STD: WebCore build steps use echo -n, which will change
behavior due to POSIX version of sh
* JavaScriptCore.xcodeproj/project.pbxproj: removed the use of echo -n, replaced with printf ""
2006-02-13 Dave Hyatt <hyatt@apple.com>
Fix Win32 bustage in JavaScriptCore.
Reviewed by darin
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
Add JSImmediate to the Win32 project.
* kjs/JSImmediate.h:
(KJS::JSImmediate::fromDouble):
(KJS::JSImmediate::toDouble):
(KJS::JSImmediate::NanAsBits):
(KJS::JSImmediate::oneAsBits):
Win32 needs explicit returns after abort() for non-void functions.
* kjs/testkjs.cpp:
(run):
Win32 catches a bug in testkjs! The "return 2" should actually
have been a return false.
* kjs/value.h:
The extern decls of NaN and Inf need to be const.
=== JavaScriptCore-521.7 ===
2006-02-13 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
Replaced the old NS_DURING exception blocking with @try/@catch.
* JavaScriptCorePrefix.h: undef try and catch to workaround a C++ conflict
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
(ObjcInstance::setValueOfUndefinedField):
(ObjcInstance::getValueOfUndefinedField):
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(ObjcField::setValueToInstance):
(ObjcArray::setValueAt):
(ObjcArray::valueAt):
2006-02-13 Darin Adler <darin@apple.com>
- fix a couple problems building on Windows, based on requests
from Krzysztof Kowalczyk <kkowalczyk@gmail.com>
* kjs/JSImmediate.h: Change code using non-standard u_int32/64_t types
to the standard uint32/64_t. Also removed curious "isIEEE()" function
that checked the sizes of some types (and type sizes alone don't tell you if
the floating point conforms to the IEEE-standard). Added missing include
of <stdint.h>.
* kjs/property_slot.h: Added missing include of <assert.h>.
2006-02-12 Geoffrey Garen <ggaren@apple.com>
Reviewed by darin.
Cleaned up testkjs, added new "run" functionality to allow scripting
tests from within JS. ("run" is a part of my new super-accurate
JS iBench.)
No regressions in run-javascriptcore-tests.
* kjs/testkjs.cpp:
(GlobalImp::className):
(TestFunctionImp::):
(TestFunctionImp::callAsFunction):
(main):
(run):
2006-02-11 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
- improve fix for http://bugs.webkit.org/show_bug.cgi?id=5163
RealPlayer.GetTitle() Crashes Safari/Dashboard
* bindings/c/c_utility.cpp: (KJS::Bindings::convertUTF8ToUTF16):
Use kCFStringEncodingISOLatin1 rather than kCFStringEncodingWindowsLatin1,
because the latter encoding has holes, and conversion can still fail.
2006-02-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- Inlined RefPtr assignment operators. .7% performance win on
super-accurate JS iBench.
* kxmlcore/RefPtr.h:
(KXMLCore::::operator):
2006-02-10 Geoffrey Garen <ggaren@apple.com>
No review needed, just a build fix. This time for sure.
* kjs/JSType.h:
2006-02-10 Geoffrey Garen <ggaren@apple.com>
Reviewed by eric.
- Fixed build. As it goes without saying, I will not mention that I
blame Kevin.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/JSImmediate.cpp:
(KJS::JSImmediate::toObject):
2006-02-09 Geoffrey Garen <ggaren@apple.com>
Reviewed by mjs.
- Fixed <rdar://problem/4343730> Should switch ConstantValues (null,
undefined, true, false) from JS objects to immediate values similar to
SimpleNumber
2.0% performance gain on my new super-accurate version of JS iBench.
(I promise to land a version of it soon.)
The gist of the change:
(1) The SimpleNumber class (simple_number.h) is now the JSImmediate
class (JSImmediate.h/.cpp), and it handles not only numbers but also
null, undefined, true, and false.
(2) JSImmediate provides convenience methods for the bit masking
necessary to encode and decode immediate values.
(3) ConstantValues, BooleanImp, NullImp, and UndefinedImp are gone.
(4) JSCell no longer implements functions like getBoolean, because
only a JSImmediate can be a boolean.
(5) JSImmediate no longer uses ALWAYS_INLINE because there's no need,
and ALWAYS_INLINE is a non-portable option of last resort.
(6) Type is now JSType, and it resides in its own file, JSType.h.
Since I was there, I did some header include sorting as part of this
change.
The rest pretty much explains itself.
* JavaScriptCore.xcodeproj/project.pbxproj: Removed simple_number.h,
added JSImmediate.h/.cpp.
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::defaultValue):
* bindings/c/c_instance.h:
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertValueToNPVariant):
* bindings/jni/jni_instance.cpp:
(JavaInstance::defaultValue):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::convertValueToJObject):
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
Standardized calls to use getXXX instead of hand-rolling JSValue
functionality.
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::getValueOfUndefinedField):
(ObjcInstance::defaultValue):
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::type):
(ObjcFallbackObjectImp::defaultValue):
* bindings/runtime.h:
(KJS::Bindings::Instance::getValueOfUndefinedField):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::defaultValue):
* bindings/runtime_object.h:
* kjs/JSImmediate.h: Added.
(KJS::JSImmediate::isImmediate):
(KJS::JSImmediate::isNumber):
(KJS::JSImmediate::isBoolean):
(KJS::JSImmediate::isUndefinedOrNull):
(KJS::JSImmediate::fromDouble):
(KJS::JSImmediate::toDouble):
(KJS::JSImmediate::toBoolean):
(KJS::JSImmediate::trueImmediate):
(KJS::JSImmediate::falseImmediate):
(KJS::JSImmediate::NaNImmediate):
(KJS::JSImmediate::undefinedImmediate):
(KJS::JSImmediate::nullImmediate):
(KJS::JSImmediate::tag):
(KJS::JSImmediate::unTag):
(KJS::JSImmediate::getTag):
(KJS::JSImmediate::):
(KJS::JSImmediate::isIEEE):
(KJS::JSImmediate::is32bit):
(KJS::JSImmediate::is64bit):
(KJS::JSImmediate::NanAsBits):
(KJS::JSImmediate::zeroAsBits):
(KJS::JSImmediate::oneAsBits):
* kjs/JSLock.cpp:
(KJS::JSLock::lock): Removed hack-o-rama to initialize ConstantValues.
* kjs/JSType.h: Added.
* kjs/collector.cpp:
(KJS::Collector::protect):
(KJS::Collector::unprotect):
(KJS::Collector::collect):
* kjs/internal.cpp:
(KJS::StringImp::toPrimitive):
(KJS::NumberImp::toPrimitive):
(KJS::NumberImp::toBoolean):
(KJS::GetterSetterImp::toPrimitive):
* kjs/internal.h:
(KJS::StringImp::type):
(KJS::NumberImp::type):
* kjs/object.cpp:
(KJS::JSObject::type):
(KJS::tryGetAndCallProperty): Replaced "Are you one of the six things
I'm looking for?" test with "Are you not the one thing I'm not looking
for" test.
(KJS::JSObject::defaultValue):
(KJS::JSObject::toPrimitive):
* kjs/object.h:
(KJS::GetterSetterImp::type):
(KJS::JSValue::isObject):
* kjs/operations.cpp:
(KJS::equal):
(KJS::strictEqual):
(KJS::add):
* kjs/reference.cpp:
(KJS::Reference::deleteValue):
* kjs/simple_number.h: Removed.
* kjs/string_object.cpp:
(StringInstance::getOwnPropertySlot): fixed indentation
* kjs/value.cpp:
(KJS::JSValue::toObject):
(KJS::jsNumberCell): New function to quarantine a PIC branch -- allows
us to inline jsNumber without adding PIC branches to callers.
* kjs/value.h:
(KJS::jsUndefined):
(KJS::jsNull):
(KJS::jsNaN):
(KJS::jsBoolean):
(KJS::jsNumber):
(KJS::JSValue::downcast):
(KJS::JSValue::isUndefinedOrNull):
(KJS::JSValue::isBoolean):
(KJS::JSValue::isNumber):
(KJS::JSValue::isString):
(KJS::JSValue::isObject):
(KJS::JSValue::getBoolean):
(KJS::JSValue::getNumber):
(KJS::JSValue::getString):
(KJS::JSValue::getObject):
(KJS::JSValue::getUInt32):
(KJS::JSValue::mark): Replaced !JSImmediate::is() test with assertion,
resulting in a slight performance gain. Callers should always check
!marked() before calling mark(), so it's impossible to call mark on
a JSImmediate.
(KJS::JSValue::marked):
(KJS::JSValue::type):
(KJS::JSValue::toPrimitive):
(KJS::JSValue::toBoolean):
(KJS::JSValue::toNumber):
(KJS::JSValue::toString):
2006-02-06 Eric Seidel <eseidel@apple.com>
Add svn:ignore properties for visual studio internals.
2006-02-06 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
- Refactor DateInstance to provide direct access to data. Several WIN32 modifications.
http://bugs.webkit.org/show_bug.cgi?id=7107
- No tests added - only changed functionality on WIN32, which should be covered by
existing tests.
* kjs/date_object.cpp:
(gmtoffset): On WIN32, use the recommended global (_timezone rather than timezone).
Updated comments.
(KJS::timeZoneOffset): Removed, was basically the same as the above.
(KJS::formatTime): Pass an UTC flag - UTC/local cannot be correctly selected on
Windows based on struct tm itself.
(KJS::DateInstance::getTime): Added.
(KJS::DateInstance::getUTCTime): Added.
(KJS::millisecondsToTM): Factored out from DateProtoFunc::callAsFunction().
(KJS::DateObjectImp::callAsFunction): Use the new parameter to formatTime().
(KJS::DateProtoFunc::callAsFunction): Updated for the other changes. The code for
GetTimezoneOffset was incorrect on WIN32 - _daylight global has nothing to do
with daylight savings time being in effect.
* kjs/date_object.h: Added prototypes for new functions.
2006-02-05 Maciej Stachowiak <mjs@apple.com>
Reviewed by Anders.
- fixed ~1100 KJS::Node leaked on layout tests
http://bugs.webkit.org/show_bug.cgi?id=7097
* kjs/internal.cpp:
(KJS::Parser::noteNodeCycle):
(KJS::Parser::removeNodeCycle):
(KJS::clearNewNodes):
* kjs/internal.h:
* kjs/nodes.cpp:
(ElementNode::breakCycle):
(PropertyListNode::breakCycle):
(ArgumentListNode::breakCycle):
(StatListNode::StatListNode):
(StatListNode::breakCycle):
(VarDeclListNode::breakCycle):
(BlockNode::BlockNode):
(ClauseListNode::breakCycle):
(CaseBlockNode::CaseBlockNode):
(ParameterNode::breakCycle):
(SourceElementsNode::SourceElementsNode):
(SourceElementsNode::breakCycle):
* kjs/nodes.h:
(KJS::Node::breakCycle):
(KJS::ElementNode::ElementNode):
(KJS::ArrayNode::ArrayNode):
(KJS::PropertyListNode::PropertyListNode):
(KJS::ObjectLiteralNode::ObjectLiteralNode):
(KJS::ArgumentListNode::ArgumentListNode):
(KJS::ArgumentsNode::ArgumentsNode):
(KJS::VarDeclListNode::VarDeclListNode):
(KJS::VarStatementNode::VarStatementNode):
(KJS::ForNode::ForNode):
(KJS::CaseClauseNode::CaseClauseNode):
(KJS::ClauseListNode::ClauseListNode):
(KJS::ParameterNode::ParameterNode):
(KJS::FuncExprNode::FuncExprNode):
(KJS::FuncDeclNode::FuncDeclNode):
2006-02-05 Maciej Stachowiak <mjs@apple.com>
Reviewed by Hyatt.
- fix default traits for classes to make sure default constructors get called
* kxmlcore/VectorTraits.h:
(KXMLCore::):
2006-02-04 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=5210
REGRESSION: for/in loop with var changes global variable instead of making local
Test: fast/js/for-in-var-scope.html
* kjs/nodes.cpp:
(valueForReadModifyAssignment): Use ALWAYS_INLINE macro.
(ForInNode::execute): Break out of the scope chain loop once we find and set the
loop variable. We don't want to set multiple loop variables.
(ForInNode::processVarDecls): Process the declaration of the loop variable.
- other cleanup
* kjs/object.cpp: (KJS::tryGetAndCallProperty): Use ALWAYS_INLINE macro.
* kxmlcore/FastMalloc.cpp: Change to use ALWAYS_INLINE macro from AlwaysInline.h
instead of defining it here a second time.
2006-02-04 Maciej Stachowiak <mjs@apple.com>
Reviewed by Hyatt.
- change JavaScript collector statistics calls to use HashCountedSet instead
of CFSet; other misc cleanup
http://bugs.webkit.org/show_bug.cgi?id=7072
* kjs/collector.cpp:
(KJS::Collector::numProtectedObjects): renamed from numReferencedObjects
(KJS::typeName):
(KJS::Collector::rootObjectTypeCounts): renamed from rootObjectClasses,
use HashSet
* kjs/collector.h:
(KJS::Collector::isOutOfMemory): Renamed from outOfMemory.
* kjs/nodes.cpp:
2006-02-03 Timothy Hatcher <timothy@apple.com>
Reviewed by Justin.
Renamed configuration names to Debug, Release and Production.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-02-02 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej.
* kjs/lookup.h: Fix compile, merged from KDE.
2006-02-02 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- http://bugs.webkit.org/show_bug.cgi?id=7005
add Noncopyable, OwnPtr, OwnArrayPtr to KXMLCore
* kxmlcore/Noncopyable.h: Added.
* kxmlcore/OwnArrayPtr.h: Added.
* kxmlcore/OwnPtr.h: Added.
* JavaScriptCore.xcodeproj/project.pbxproj: Added new files.
* kjs/function.h:
* kjs/function.cpp: Use OwnPtr for Parameter pointers.
* kjs/internal.h: Use Noncopyable for LabelStack.
* kjs/list.cpp: Use OwnArrayPtr for overflow.
* kjs/property_map.h:
* kjs/property_map.cpp: Use OwnArrayPtr for SavedProperties.
Use Vector for some stack buffers.
* kjs/regexp_object.h:
* kjs/regexp_object.cpp: Use OwnArrayPtr for lastOvector.
2006-01-31 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fixed leak of hundreds of thousands of JS parser nodes on the layout tests, and added an exit counter
that would catch them
* kjs/nodes.cpp:
(NodeCounter::~NodeCounter): Added debug-only node counter.
(Node::Node):
(Node::~Node):
* kxmlcore/VectorTraits.h: Simple classes like RefPtr do in fact need destruction.
2006-01-31 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- added deleteAllValues for HashSet as well as HashMap
- fixed conversion from const_iterator to iterator, which I broke a while back
* kxmlcore/HashMap.h: Updated copyright date.
* kxmlcore/HashSet.h: (KXMLCore::deleteAllValues): Added.
* kxmlcore/HashTable.h: (KXMLCore::HashTableIterator::operator const_iterator): Added.
2006-01-31 Tim Omernick <timo@apple.com>
Reviewed by Geoff Garen.
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertUTF8ToUTF16):
Fixed an invalid assertion that UTF8Chars is not NULL. It is valid for it to be NULL as long as
UTF8Length is 0.
This fixes an assertion failure on TOT at <http://www.musicindiaonline.com/p/x/tJO0OOBME9.As1NMvHdW/>,
where JavaScript is getting a NULL string back from some call on the Real Player plugin.
2006-01-30 Anders Carlsson <andersca@mac.com>
Reviewed by Darin.
Fix http://bugs.webkit.org/show_bug.cgi?id=6907
REGRESSION: United.com menus messed up due to document.all/MSIE sniff
* kjs/nodes.cpp:
(typeStringForValue):
Return "undefined" if the given object should masquerade as undefined.
* kjs/object.h:
(KJS::JSObject::masqueradeAsUndefined):
Rename from isEqualToNull.
* kjs/operations.cpp:
(KJS::equal):
Update for name change.
2006-01-29 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- properly define Vector assignment operator; the private version was accidentally left
in, and the template version is not enough to replace the default
* kxmlcore/Vector.h:
(KXMLCore::Vector::operator=):
2006-01-29 Eric Seidel <eseidel@apple.com>
Reviewed by darin.
Fix the build by applying a GCC-specific namespace hack.
* kjs/lookup.h:
2006-01-29 Eric Seidel <eseidel@apple.com>
Reviewed by hyatt.
Fix build on Win32.
* kjs/lookup.h: fixed ::cacheGlobalObject
* kxmlcore/Vector.h:
(KXMLCore::Vector::operator[]): use unsigned long
2006-01-29 Maciej Stachowiak <mjs@apple.com>
Reviewed by Dave Hyatt.
* kxmlcore/Vector.h:
(KXMLCore::Vector::operator[]): Add unsigned overload
2006-01-28 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
- http://bugs.webkit.org/show_bug.cgi?id=6895
include exception names in JavaScript form of DOM exception
* khtml/ecma/kjs_binding.cpp: (KJS::setDOMException): Include the name of the
exception in the error message.
2006-01-28 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- miscellaneous Vector improvements
* kxmlcore/Vector.h:
(KXMLCore::Vector::at): Add range-checking asserts.
(KXMLCore::Vector::first): Added as a convenience.
(KXMLCore::Vector::last): Convenience for stack-style use.
(KXMLCore::Vector::removeLast): ditto
2006-01-28 Darin Adler <darin@apple.com>
Reviewed by John Sullivan
- fix http://bugs.webkit.org/show_bug.cgi?id=6870
REGRESSION: JavaScript Date constructor won't accept another Date object
Test: fast/js/date-constructor.html
* kjs/date_object.cpp: (KJS::DateObjectImp::construct):
Added a special case for constructing one date from another (to avoid losing
milliseconds, which are not in the text form, to match Firefox), and changed
the base code to convert to primitive before checking for string to match
the standard. Also corrected a couple silly things in the "construct from
current time" code path (removed a floor that does no good, and changed
the constant used to convert microseconds to milliseconds to be a 1000
rather than "msPerSecond").
2006-01-28 Darin Adler <darin@apple.com>
* kjs/create_hash_table: Added missing license.
2006-01-28 Maciej Stachowiak <mjs@apple.com>
Reviewed by Dave Hyatt.
- added a Vector class
http://bugs.webkit.org/show_bug.cgi?id=6894
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/internal.cpp:
(KJS::Parser::saveNewNode): Apply Vector.
(KJS::clearNewNodes): ditto
* kjs/number_object.cpp:
(integer_part_noexp): ditto
(char_sequence): ditto
* kjs/ustring.cpp:
(KJS::UString::UTF8String): ditto
* kxmlcore/HashMap.h:
(KXMLCore::deleteAllValues): Tweaked this to only apply to HashMap,
other versions are useful for other containers.
* kxmlcore/Vector.h: Added. Implemented a Vector class, which should
be usable for all Array/QVector style purposes, and also as a stack buffer
with oversize handling. Also some helper classes to make vector operations
as efficient as possible for POD types and for simple non-PODs like RefPtr.
(KXMLCore::):
(KXMLCore::VectorTypeOperations::destruct):
(KXMLCore::VectorTypeOperations::initialize):
(KXMLCore::VectorTypeOperations::move):
(KXMLCore::VectorTypeOperations::uninitializedCopy):
(KXMLCore::VectorTypeOperations::uninitializedFill):
(KXMLCore::VectorBuffer::VectorBuffer):
(KXMLCore::VectorBuffer::~VectorBuffer):
(KXMLCore::VectorBuffer::deallocateBuffer):
(KXMLCore::VectorBuffer::inlineBuffer):
(KXMLCore::Vector::Vector):
(KXMLCore::Vector::~Vector):
(KXMLCore::Vector::size):
(KXMLCore::Vector::capacity):
(KXMLCore::Vector::isEmpty):
(KXMLCore::Vector::at):
(KXMLCore::Vector::operator[]):
(KXMLCore::Vector::data):
(KXMLCore::Vector::operator T*):
(KXMLCore::Vector::operator const T*):
(KXMLCore::Vector::begin):
(KXMLCore::Vector::end):
(KXMLCore::Vector::clear):
(KXMLCore::Vector::fill):
(KXMLCore::Vector::operator=):
(KXMLCore::::Vector):
(KXMLCore::::operator):
(KXMLCore::::fill):
(KXMLCore::::expandCapacity):
(KXMLCore::::resize):
(KXMLCore::::reserveCapacity):
(KXMLCore::::append):
(KXMLCore::deleteAllValues):
* kxmlcore/VectorTraits.h: Added.
(KXMLCore::VectorTraits): Traits to enable making Vector efficient for
simple types.
2006-01-28 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=5163
RealPlayer.GetTitle() Crashes Safari/Dashboard
* bindings/c/c_utility.cpp: (KJS::Bindings::convertUTF8ToUTF16):
Fallback to kCFStringEncodingWindowsLatin1 if the passed buffer is not valid UTF-8, preventing crashes.
2006-01-25 George Staikos <staikos@opensource.apple.com>
Reviewed by Darin.
* kxmlcore/HashFunctions.h: Merge build fix from KDE.
2006-01-25 Darin Adler <darin@apple.com>
- removed an unused source file
* kjs/pointer_hash.h: Removed.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Removed reference to pointer_hash.h.
2006-01-23 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=6737
KJS_DEFINE_PROTOTYPE should work outside of the KJS namespace
* kjs/lookup.h:
Prefix all KJS types with KJS:: in KJS_DEFINE_PROTOTYPE.
(cacheGlobalObject):
Move this out of the KJS namespace.
2006-01-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- renamed PointerHash to PtrHash
- made PtrHash the default hash function for int and pointer types that aren't further specialized
- added an AtomicStringImpl class to make it easier and more typesafe to identity hash atomic strings
- did appropriate consequent cleanup (very few places now need to declare a hash function)
http://bugs.webkit.org/show_bug.cgi?id=6752
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): no need to mention PointerHash
* kjs/collector.cpp: ditto
* kjs/identifier.cpp:
(KXMLCore::): declare DefaultHash the new way
* kjs/internal.cpp: no need to mention PointerHash
* kjs/ustring.h:
* kxmlcore/HashCountedSet.h: change how we get the default hash to make it
easier to specialize on PtrHash
* kxmlcore/HashFunctions.h:
(KXMLCore::): renamed PointerHash to PtrHash; changed DefaultHash so that it has
a Hash typedef rather than being a hash function class itself; declared DefaultHash
for int and partializy specialized for pointer types
* kxmlcore/HashMapPtrSpec.h:
(KXMLCore::PtrHashIteratorAdapter::PtrHashIteratorAdapter): Slight tweaks for new
way of handling pointer hash
(KXMLCore::PtrHashConstIteratorAdapter::PtrHashConstIteratorAdapter): ditto
(KXMLCore::): ditto
* kxmlcore/HashMap.h: ditto
* kxmlcore/HashSet.h: ditto
2006-01-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Tim Omernick.
- use classes instead of free functions for extractors, this better matches how other
things work and should avoid the need for hacky workarounds on other compilers
http://bugs.webkit.org/show_bug.cgi?id=6748
* kjs/array_object.cpp:
* kjs/identifier.cpp:
* kjs/internal.cpp:
* kxmlcore/HashMap.h:
(KXMLCore::PairFirstExtractor::extract):
* kxmlcore/HashMapPtrSpec.h:
(KXMLCore::):
* kxmlcore/HashSet.h:
(KXMLCore::IdentityExtractor::extract):
* kxmlcore/HashTable.h:
(KXMLCore::addIterator):
(KXMLCore::removeIterator):
(KXMLCore::HashTable::add):
(KXMLCore::HashTable::isEmptyBucket):
(KXMLCore::HashTable::isDeletedBucket):
(KXMLCore::HashTable::HashTable):
(KXMLCore::HashTable::lookup):
(KXMLCore::HashTable::add):
(KXMLCore::HashTable::reinsert):
(KXMLCore::HashTable::find):
(KXMLCore::HashTable::contains):
(KXMLCore::HashTable::remove):
(KXMLCore::HashTable::allocateTable):
(KXMLCore::HashTable::deallocateTable):
(KXMLCore::HashTable::expand):
(KXMLCore::HashTable::rehash):
(KXMLCore::HashTable::clear):
(KXMLCore::HashTable::swap):
(KXMLCore::HashTable::operator):
(KXMLCore::HashTable::checkTableConsistency):
(KXMLCore::HashTable::checkTableConsistencyExceptSize):
(KXMLCore::HashTable::invalidateIterators):
2006-01-23 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Tim Hatcher.
- renamed inert() operation on HashSet, HashCountedSet and HashTable to add()
for consistency with HashMap
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction):
* kjs/collector.cpp:
(KJS::Collector::protect):
* kjs/identifier.cpp:
(KJS::Identifier::add):
* kxmlcore/HashCountedSet.h:
(KXMLCore::::add):
* kxmlcore/HashMap.h:
(KXMLCore::::inlineAdd):
* kxmlcore/HashSet.h:
(KXMLCore::::add):
* kxmlcore/HashTable.h:
(KXMLCore::HashTable::add):
(KXMLCore::::add):
(KXMLCore::::HashTable):
2006-01-23 Justin Garcia <justin.garcia@apple.com>
Reviewed by thatcher
Turned on -O2 for B&I build.
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-01-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Tim Hatcher.
- it's "Franklin Street", not "Franklin Steet"
* kjs/array_instance.h:
* kjs/array_object.cpp:
* kjs/array_object.h:
* kjs/bool_object.cpp:
* kjs/bool_object.h:
* kjs/collector.cpp:
* kjs/collector.h:
* kjs/completion.h:
* kjs/context.h:
* kjs/date_object.cpp:
* kjs/date_object.h:
* kjs/debugger.cpp:
* kjs/debugger.h:
* kjs/dtoa.h:
* kjs/error_object.cpp:
* kjs/error_object.h:
* kjs/function.cpp:
* kjs/function.h:
* kjs/function_object.cpp:
* kjs/function_object.h:
* kjs/grammar.y:
* kjs/identifier.cpp:
* kjs/identifier.h:
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/interpreter.cpp:
* kjs/interpreter.h:
* kjs/lexer.cpp:
* kjs/lexer.h:
* kjs/list.cpp:
* kjs/list.h:
* kjs/lookup.cpp:
* kjs/lookup.h:
* kjs/math_object.cpp:
* kjs/math_object.h:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/nodes2string.cpp:
* kjs/number_object.cpp:
* kjs/number_object.h:
* kjs/object.cpp:
* kjs/object.h:
* kjs/object_object.cpp:
* kjs/object_object.h:
* kjs/operations.cpp:
* kjs/operations.h:
* kjs/property_map.cpp:
* kjs/property_map.h:
* kjs/property_slot.cpp:
* kjs/property_slot.h:
* kjs/reference.cpp:
* kjs/reference.h:
* kjs/reference_list.cpp:
* kjs/reference_list.h:
* kjs/regexp.cpp:
* kjs/regexp.h:
* kjs/regexp_object.cpp:
* kjs/regexp_object.h:
* kjs/scope_chain.cpp:
* kjs/scope_chain.h:
* kjs/simple_number.h:
* kjs/string_object.cpp:
* kjs/string_object.h:
* kjs/testkjs.cpp:
* kjs/types.h:
* kjs/ustring.cpp:
* kjs/ustring.h:
* kjs/value.cpp:
* kjs/value.h:
* kxmlcore/AlwaysInline.h:
* kxmlcore/ListRefPtr.h:
* kxmlcore/PassRefPtr.h:
* kxmlcore/RefPtr.h:
2006-01-23 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
- change needed for fix to http://bugs.webkit.org/show_bug.cgi?id=6617
REGRESSION: Crash in cloneChildNodes when clicking element
* kxmlcore/PassRefPtr.h: Fix assignment operator from RefPtr of a different
type by calling get() instead of going directly at m_ptr.
* kxmlcore/RefPtr.h: Ditto.
- other changes
* JavaScriptCore.xcodeproj/project.pbxproj: Xcode decided to change this file.
It's just a resorted list of keys in a dictionary.
* kjs/fpconst.cpp: Wrap this file in #if __APPLE__ since the alternate version
in internal.cpp is in #if !__APPLE__. This file is to give us the "no init
routine" property we want to have on OS X.
2006-01-22 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- Set up Page class and invert Frame / WebCoreFrameBridge ownership
http://bugs.webkit.org/show_bug.cgi?id=6577
* kjs/interpreter.h: make globalExec virtual so ScriptInterpreter can
override it
2006-01-23 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej and Darin.
* kxmlcore/Assertions.h: This file only works with __APPLE__ right now
* kjs/interpreter.cpp: ditto
* kjs/simple_number.h: Add assert.h and remove from config.h
* kjs/array_object.cpp: Use relative paths for kxmlcore includes
* kjs/testkjs.cpp: Use relative paths for kxmlcore includes
2006-01-23 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej.
* kjs/config.h: unbreak preprocessor change
2006-01-23 George Staikos <staikos@opensource.apple.com>
Approved by Maciej and Darin.
* kjs/:
* kxmlcore/:
Update FSF address in license to make merging easier
2006-01-22 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej.
* kjs/collector.cpp: merge major speedup from KDE on Linux
patch by Maks Orlovich, bug #6145
Also unify cpu detection
* kjs/config.h: define simpler CPU macros
2006-01-22 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej.
* kjs/collector.cpp: merge FreeBSD compile fix from KDE
-> requires build magic for use
2006-01-21 George Staikos <staikos@opensource.apple.com>
Reviewed by Maciej.
* kjs/nodes2string.cpp
* kjs/operations.h
* kjs/debugger.h
Fix pedantic compile with some gcc versions (Merge from KDE)
* kjs/create_hash_table:
Fix build with Perl 5.8.0 (Merge from KDE)
2006-01-18 Darin Adler <darin@apple.com>
Reviewed by Hyatt.
- hash table fixes needed for my WebCore changes
* kxmlcore/HashTable.h: (KXMLCore::HashTableConstIterator::operator=):
Added a missing return statement.
* kxmlcore/HashTraits.h: Fix traits so they work properly for classes where you
can't instantiate with a 0 by using traits rather than ? : to select the default
emtpy value of hash table keys.
- small cleanup of "runtime" code left over from recent JavaScript crash fix
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::RootObject): No explicit initialization of _imp needed
since it's now a ProtectedPtr.
(KJS::Bindings::RootObject::setRootObjectImp): Remove old code that relied on the
fact that _imp was 0 and replaced with use of ProtectedPtr.
(KJS::Bindings::RootObject::rootObjectImp): Updated since _imp is a ProtectedPtr.
2006-01-17 Darin Adler <darin@apple.com>
Reviewed by Anders.
- http://bugs.webkit.org/show_bug.cgi?id=6611
add assertions to check correct use of hash table iterators
* kxmlcore/HashTable.h:
(KXMLCore::addIterator): Added. Helper function that adds an iterator to the list
maintained by the specified hash table.
(KXMLCore::removeIterator): Added. Helper function that removes an iterator from
the list maintained by the hash table it's in.
(KXMLCore::HashTableConstIterator::HashTableConstIterator): Added a HashTable
parameter, ignored when not debugging. Call addIterator.
(KXMLCore::HashTableConstIterator::~HashTableConstIterator):
(KXMLCore::HashTableConstIterator::operator=): Call removeIterator.
(KXMLCore::HashTableConstIterator::operator*): Call checkValidity.
(KXMLCore::HashTableConstIterator::operator->): Ditto.
(KXMLCore::HashTableConstIterator::operator++): Ditto.
(KXMLCore::HashTableConstIterator::operator==): Ditto.
(KXMLCore::HashTableConstIterator::operator!=): Ditto.
(KXMLCore::HashTableConstIterator::checkValidity): Checks that the hash table
pointer is not 0 and if there are two iterators that both point at the same table.
(KXMLCore::HashTableIterator::HashTableIterator): Changed to use the const iterator
as an implementation detail, to avoid having two separate iterator implementations.
(KXMLCore::HashTableIterator::operator*): Ditto.
(KXMLCore::HashTableIterator::operator->): Ditto.
(KXMLCore::HashTableIterator::operator++): Ditto.
(KXMLCore::HashTableIterator::operator==): Ditto.
(KXMLCore::HashTableIterator::operator!=): Ditto.
(KXMLCore::HashTable::HashTable): Initialize pointer to head of iterators list.
(KXMLCore::HashTable::~HashTable): Added call to invalidateIterators.
(KXMLCore::HashTable::makeIterator): Pass this pointer.
(KXMLCore::HashTable::makeConstIterator): Ditto.
(KXMLCore::HashTable::insert): Call invalidateIterators, since this is a public
entry point that modifies the hash table.
(KXMLCore::HashTable::remove): Ditto.
(KXMLCore::HashTable::clear): Ditto.
(KXMLCore::HashTable::swap): Ditto.
(KXMLCore::HashTable::invalidateIterators): Added. Walks the iterators list and
clears out the table, next, and previous pointers in all of them, and then clears
the head so we have an empty list.
(KXMLCore::addIterator): Added. Adds the iterator the the linked list in the
passed-in table, and points the iterator at the table.
(KXMLCore::removeIterator): Added. Removes the iterator from the linked list in
the passed-in table.
* kxmlcore/HashTraits.h: A bit of tweaking and formatting.
2006-01-17 Justin Garcia <justin.garcia@apple.com>
Reviewed by eric
Deployment builds now use -O2
* JavaScriptCore.xcodeproj/project.pbxproj:
2006-01-17 Darin Adler <darin@apple.com>
Reviewed by Anders.
- fix http://bugs.webkit.org/show_bug.cgi?id=6610
change RefPtr so that it works when deref ends up deleting the RefPtr
* kxmlcore/PassRefPtr.h: Always set m_ptr before calling deref.
* kxmlcore/RefPtr.h: Ditto.
2006-01-16 Geoffrey Garen <ggaren@apple.com>
Reviewed by darin.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=6322
DateProtoFuncImp::callAsFunction can crash due to lack of type checking
* kjs/date_object.cpp:
(KJS::DateProtoFunc::callAsFunction): Type check calls to all methods.
This matches section 15.9.5 in the spec.
2006-01-16 Tim Omernick <timo@apple.com>
Reviewed by John Sullivan.
JavaScriptCore part of <rdar://problem/4211707> NPAPI ref count behavior differs with Mozilla
* bindings/npruntime.cpp:
(_NPN_ReleaseObject):
Refactored part of this function out into _NPN_DeallocateObject.
(_NPN_DeallocateObject):
Forcibly deallocates the passed object, even if its refcount is
greater than zero.
* bindings/npruntime_impl.h:
Declared _NPN_DeallocateObject().
2006-01-16 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix problem with ++, ==, and != on const iterators in
HashMaps that are using the pointer specialization
* kxmlcore/HashMapPtrSpec.h:
(KXMLCore::PointerHashConstIteratorAdapter::operator++): Change type to const_iterator.
(KXMLCore::PointerHashConstIteratorAdapter::operator==): Ditto.
(KXMLCore::PointerHashConstIteratorAdapter::operator!=): Ditto.
2006-01-15 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Anders.
- fix http://bugs.webkit.org/show_bug.cgi?id=6561
run-javascriptcore-tests doesn't work
* JavaScriptCore/tests/mozilla/Getopt/Mixed.pm:
Changed revision number to 1.8 (broken by svn migration).
2006-01-14 David Kilzer <ddkilzer@kilzer.net>
Reviewed and landed by Anders.
* kjs/create_hash_table: Fixed comment typo.
2006-01-13 Maks Orlovich <maksim@kde.org>
Mostly merging work by Peter Kelly. Reviewed by Maciej, landed by ap.
- fix http://bugs.webkit.org/show_bug.cgi?id=6261
Misc. array object fixes from KJS
* kjs/array_object.cpp: Don't treat 2^32-1 as a real array index property.
(ArrayInstance::getOwnPropertySlot): Ditto.
(ArrayInstance::deleteProperty): Ditto.
(ArrayInstance::put): Ditto.
(ArrayInstance::propList): Added a FIXME comment.
(ArrayInstance::put): Throw exception on trying to set invalid array length.
(ArrayProtoFunc::callAsFunction): Do not use a separator argument when doing toString/toLocalString.
* kjs/array_object.h: Added MAX_ARRAY_INDEX.
2006-01-13 Darin Adler <darin@apple.com>
- Replaced tabs with spaces in source files that had less than 10 lines with tabs.
- Set allow-tabs Subversion property in source files that have more than 10 lines with tabs.
2006-01-13 Anders Carlsson <andersca@mac.com>
Reviewed by Eric.
* kjs/create_hash_table:
Use correct size variables.
2006-01-13 Anders Carlsson <andersca@mac.com>
Reviewed by Darin.
* kjs/create_hash_table:
Don't create an empty entry array, instead add a entry with all fields
set to null and set the hash table size to 1.
* kjs/lookup.cpp:
(findEntry):
Remove the hash table size check
2006-01-12 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=6494
Crash when assigning a new function to a DOMParser object
* JavaScriptCore.xcodeproj/project.pbxproj:
Move lookup.cpp before lookup.h
* kjs/lookup.cpp:
(findEntry):
If the hash table is empty, return 0 early.
2006-01-12 George Staikos <staikos@kde.org>
Reviewed by Darin.
* kjs/interpreter.cpp:
* kjs/testkjs.cpp:
* kjs/interpreter.h:
Add helper to interpreter to call the collector in order to facilitate
visibility rules in KDE.
2006-01-12 George Staikos <staikos@kde.org>
Reviewed by Maciej.
* kjs/kjs.pro: Updates to build the whole thing on Linux at least.
* kxmlcore/HashTable.h: Add missing assert.h
2006-01-12 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- fix http://bugs.webkit.org/show_bug.cgi?id=6505
retire APPLE_CHANGES from JavaScriptCore
* 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.
2006-01-12 Justin Haygood <justin@xiondigital.net>
Reviewed, tweaked, and landed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=6416
lexer.cpp, grammar.y protect include of config.h with "HAVE_CONFIG_H"
* kjs/dtoa.cpp: Removed HAVE_CONFIG_H, changed config.h to use
quotes instead of angle brackets. Moved dtoa.h include to the top.
Changed system header includes to use angle brackets instead of quotes.
* kjs/grammar.y: Removed HAVE_CONFIG_H, changed config.h to use
quotes instead of angle brackets.
* kjs/lexer.cpp: Removed HAVE_CONFIG_H, changed config.h to use
quotes instead of angle brackets. Moved lexer.h include to the top.
* kjs/ustring.cpp: Removed HAVE_CONFIG_H, changed config.h to use
quotes instead of angle brackets. Moved ustring.h include to the top.
2006-01-12 George Staikos <staikos@kde.org>
Reviewed by Maciej
- Import initial QMake file. Doesn't fully work yet.
2006-01-11 Ricci Adams <ricciadams@apple.com>
Reviewed by Maciej and Darin, landed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=5939
final comma in javascript object prevents parsing
* kjs/grammar.y: Added rule to allow trailing comma in
object construction.
2006-01-11 Ricci Adams <ricciadams@apple.com>
Reviewed by Geoff, landed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=5308
Number.toFixed doesn't include leading 0
* kjs/number_object.cpp: (NumberProtoFunc::callAsFunction):
Fixed a "<" that should have been a "<=".
2006-01-11 Ricci Adams <ricciadams@apple.com>
Reviewed by Geoff, landed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=5307
Number.toFixed doesn't round 0.5 up
* kjs/number_object.cpp: (NumberProtoFunc::callAsFunction):
Fixed a ">" that should have been a ">=".
2006-01-11 Justin Haygood <justin@xiondigital.net>
Reviewed and landed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=6486
JavaScriptCore should use system malloc on Windows
* kjs/config.h: Add USE_SYSTEM_MALLOC to the Win32 section.
2006-01-10 Darin Adler <darin@apple.com>
* Makefile: Took out unneeded "export" line.
* <many-files>: Changed a lot of flags (cleared bogus executable bits, set
MIME types, other small corrections).
2006-01-09 Darin Adler <darin@apple.com>
* Makefile.am: Removed.
2006-01-07 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=6373
REGRESSION: JavaScript hang when comparing large array to null
* kjs/object.h:
(KJS::JSObject::isEqualToNull):
Add new function which returns true if an object should be treated as null when
doing comparisons.
* kjs/operations.cpp:
(KJS::equal):
Use isEqualToNull.
2006-01-07 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Maciej.
- Fix WebCore development build
http://bugs.webkit.org/show_bug.cgi?id=6408
* kxmlcore/Assertions.h: Use __VA_ARGS__ in variadic macros.
2006-01-06 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- miscellaneous changes for 4% speedup on the JavaScript iBench
http://bugs.webkit.org/show_bug.cgi?id=6396
Changes mostly thanks to Maks Orlovich, tweaked a little by me.
* kjs/create_hash_table: Use the same hash as the one used by Identifier.
* kjs/function.cpp:
(KJS::FunctionImp::processParameters): Use the new List::copyFrom
(KJS::ActivationImp::ActivationImp): track variable while iterating
* kjs/internal.cpp:
(KJS::StringImp::toObject): create StringInstance directly
* kjs/list.cpp:
(KJS::List::copy): implement in terms of copyFrom
(KJS::List::copyFrom): more efficient way to copy in another list
* kjs/list.h:
* kjs/lookup.cpp:
(keysMatch): updated to work with identifier hash
(findEntry): ditto
(Lookup::findEntry): ditto
(Lookup::find): ditto
* kjs/lookup.h:
2006-01-06 Maciej Stachowiak <mjs@apple.com>
- fix development build failure from the previous checkin
* kjs/function.cpp:
(KJS::ActivationImp::put): Use prototype() accessor in assert.
2006-01-05 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- fix remaining performance regression from Getter/Setter change
http://bugs.webkit.org/show_bug.cgi?id=6249
- Activation objects should not have __proto__ property
http://bugs.webkit.org/show_bug.cgi?id=6395
* kjs/function.cpp:
(KJS::ActivationImp::getOwnPropertySlot): Implement directly, thus
skipping getter/setter handling and __proto__ handling, as well
as inlining needed superclass stuff.
(KJS::ActivationImp::put): Implement directly, skipping getter/setter,
__proto__, and do canPut directly in PropertyMap::put since there's no
static property table either.
* kjs/function.h:
* kjs/property_map.cpp:
(KJS::PropertyMap::put): Allow optionally inlining canPut check.
* kjs/property_map.h:
2006-01-04 Geoffrey Garen <ggaren@apple.com>
Patch by kimmo.t.kinnunen@nokia.com, reviewed by darin, tweaked by me.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=4921
\u escape sequences in JavaScript identifiers
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/lexer.cpp:
(Lexer::shift):
(Lexer::lex):
(Lexer::isWhiteSpace):
(Lexer::isLineTerminator):
(Lexer::isIdentStart):
(Lexer::isIdentPart):
(isDecimalDigit):
(Lexer::scanRegExp):
* kjs/lexer.h:
(KJS::Lexer::):
* tests/mozilla/expected.html: Updated test results.
2005-12-30 Maciej Stachowiak <mjs@apple.com>
No review, just test result update.
* tests/mozilla/expected.html: Updated for newly passing test from recent fixes.
2005-12-30 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
- Fix http://bugs.webkit.org/show_bug.cgi?id=6298
Getter setter test is failing
* kjs/object.cpp:
(KJS::JSObject::put):
Rework the getter setter part. We now walk the prototype chain, checking for
getter/setter properties and only take the slow path if any are found.
2005-12-30 Maks Orlovich <maksim@kde.org>
Reviewed and committed by Maciej.
- Handle negative, FP numbers with non-10 radix in toString
http://bugs.webkit.org/show_bug.cgi?id=6259
(Merged from KJS, original work by Harri Porten)
* kjs/number_object.cpp:
(NumberProtoFunc::callAsFunction): rewrote Number.toString(radix) to work with
negative numbers, floating point and very large numbers.
2005-12-29 Geoffrey Garen <ggaren@apple.com>
Patch by Maks Orlovich, reviewed and landed by me.
- http://bugs.webkit.org/show_bug.cgi?id=6267
Fix Number.prototype.toFixed/toExponential(undefined)
* kjs/number_object.cpp:
(NumberProtoFunc::callAsFunction):
2005-12-29 Geoffrey Garen <ggaren@apple.com>
Patch by Maks Orlovich, Reviewed and landed by me.
- http://bugs.webkit.org/show_bug.cgi?id=6266
Minor object naming updates (to match Mozilla, KJS)
* kjs/number_object.cpp:
* kjs/regexp_object.cpp:
2005-12-29 Geoffrey Garen <ggaren@apple.com>
Patch by Maks Orlovich, reviewed by mjs.
This has 2 very minor fixes, covered by KJS testsuite:
1. Enumerates string indices in property list (with the same bug as array
object has in corresponding code). This is a mozilla emulation thing.
2. Permits properties with integer names in prototypes to be found
* kjs/string_object.cpp:
(StringInstance::getOwnPropertySlot):
(StringInstanceImp::propList):
* kjs/string_object.h:
2005-12-26 Geoffrey Garen <ggaren@apple.com>
Reviewed by mjs.
- Fixed <rdar://problem/4364705> run-javascriptcore-tests crashes in
KJS::BlockNode::deref
AKA
http://bugs.webkit.org/show_bug.cgi?id=6233
Reproducible stack-overflow crash in ~RefPtr<T> due to RefPtr<T> use in
linked lists
This patch does four things:
(1) Standardizes all our linked list nodes to use "next" as their next
pointers.
(2) Creates the ListRefPtr<T> class, a subclass of RefPtr<T> specialized
to iteratively deref "next" pointers.
(3) Standardizes our linked list nodes to use ListRefPtr<T> and
implement the releaseNext() function used by ~ListRefPtr<T>().
(4) Adds to RefPtr<T> the release() method used by releaseNext().
- Modified existing mozilla test to ensure it would make deployment
builds crash as well.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/nodes.cpp:
(ElementNode::evaluate):
(PropertyListNode::evaluate):
(ArgumentListNode::evaluateList):
(StatListNode::StatListNode):
(StatListNode::execute):
(StatListNode::processVarDecls):
(VarDeclListNode::evaluate):
(VarDeclListNode::processVarDecls):
(VarStatementNode::execute):
(VarStatementNode::processVarDecls):
(BlockNode::BlockNode):
(CaseClauseNode::evalStatements):
(CaseClauseNode::processVarDecls):
(ClauseListNode::processVarDecls):
(CaseBlockNode::CaseBlockNode):
(CaseBlockNode::evalBlock):
(SourceElementsNode::SourceElementsNode):
(SourceElementsNode::execute):
(SourceElementsNode::processFuncDecl):
(SourceElementsNode::processVarDecls):
* kjs/nodes.h:
(KJS::ElementNode::ElementNode):
(KJS::ElementNode::releaseNext):
(KJS::ArrayNode::ArrayNode):
(KJS::PropertyListNode::PropertyListNode):
(KJS::PropertyListNode::releaseNext):
(KJS::ObjectLiteralNode::ObjectLiteralNode):
(KJS::ArgumentListNode::ArgumentListNode):
(KJS::ArgumentListNode::releaseNext):
(KJS::ArgumentsNode::ArgumentsNode):
(KJS::StatListNode::releaseNext):
(KJS::VarDeclListNode::VarDeclListNode):
(KJS::VarDeclListNode::releaseNext):
(KJS::VarStatementNode::VarStatementNode):
(KJS::ForNode::ForNode):
(KJS::CaseClauseNode::CaseClauseNode):
(KJS::ClauseListNode::ClauseListNode):
(KJS::ClauseListNode::getClause):
(KJS::ClauseListNode::getNext):
(KJS::ClauseListNode::releaseNext):
(KJS::ParameterNode::ParameterNode):
(KJS::ParameterNode::releaseNext):
(KJS::SourceElementsNode::releaseNext):
* kjs/nodes2string.cpp:
(ElementNode::streamTo):
(PropertyListNode::streamTo):
(ArgumentListNode::streamTo):
(StatListNode::streamTo):
(VarDeclListNode::streamTo):
(VarStatementNode::streamTo):
(CaseClauseNode::streamTo):
(ClauseListNode::streamTo):
(CaseBlockNode::streamTo):
(SourceElementsNode::streamTo):
* kxmlcore/ListRefPtr.h: Added.
(KXMLCore::ListRefPtr::ListRefPtr):
(KXMLCore::ListRefPtr::~ListRefPtr):
(KXMLCore::ListRefPtr::operator=):
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::release):
2005-12-29 Geoffrey Garen <ggaren@apple.com>
Reviewed by mjs.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=4026
Math.random() not seeded.
Added call to sranddev() -- it executes the first time a process
calls Math.random().
* kjs/math_object.cpp:
(MathFuncImp::callAsFunction):
2005-12-29 Geoffrey Garen <ggaren@apple.com>
Reviewed by darin.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=6265
Name change regression: Java doesn't know what JavaJSObject is
Changed strings passed to Java back to original "JSObject".
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::convertValueToJObject):
(JavaJSObject::convertJObjectToValue):
2005-12-28 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
- The JSC part of http://bugs.webkit.org/show_bug.cgi?id=6268
Add undetectable document.all
* kjs/operations.cpp:
(KJS::equal):
When comparing an object with null or undefined, call toPrimitive with
NullType as the preferred type.
2005-12-27 Anders Carlsson <andersca@mac.com>
Reviewed by Darin.
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction):
Implement filter and map. Also, make the existing
array iteration functions not invoke the callback for
non-existing properties, just as Mozilla does now.
* kjs/array_object.h:
(KJS::ArrayProtoFunc::):
Add filter and map.
* tests/mozilla/expected.html:
Update, two 1.6 tests now pass.
2005-12-27 Maciej Stachowiak <mjs@apple.com>
- updated test results for new JS 1.6 tests
* tests/mozilla/expected.html:
2005-12-27 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
Add Mozilla JS 1.6 tests.
* tests/mozilla/js1_6/Array/browser.js: Added.
* tests/mozilla/js1_6/Array/regress-290592.js: Added.
* tests/mozilla/js1_6/Array/regress-304828.js: Added.
* tests/mozilla/js1_6/Array/regress-305002.js: Added.
* tests/mozilla/js1_6/Array/regress-310425-01.js: Added.
* tests/mozilla/js1_6/Array/regress-310425-02.js: Added.
* tests/mozilla/js1_6/Array/regress-320887.js: Added.
* tests/mozilla/js1_6/Array/shell.js: Added.
* tests/mozilla/js1_6/README: Added.
* tests/mozilla/js1_6/Regress/browser.js: Added.
* tests/mozilla/js1_6/Regress/regress-301574.js: Added.
* tests/mozilla/js1_6/Regress/regress-309242.js: Added.
* tests/mozilla/js1_6/Regress/regress-311157-01.js: Added.
* tests/mozilla/js1_6/Regress/regress-311157-02.js: Added.
* tests/mozilla/js1_6/Regress/regress-314887.js: Added.
* tests/mozilla/js1_6/Regress/regress-320172.js: Added.
* tests/mozilla/js1_6/Regress/shell.js: Added.
* tests/mozilla/js1_6/String/browser.js: Added.
* tests/mozilla/js1_6/String/regress-306591.js: Added.
* tests/mozilla/js1_6/String/shell.js: Added.
* tests/mozilla/js1_6/browser.js: Added.
* tests/mozilla/js1_6/shell.js: Added.
* tests/mozilla/js1_6/template.js: Added.
2005-12-27 Maks Orlovich <maksim@kde.org>
Reviewed and landed by Maciej.
- fixed 6234: Can delete array index property incorrectly.
http://bugs.webkit.org/show_bug.cgi?id=6234
* kjs/array_object.cpp:
(ArrayInstance::deleteProperty): use toArrayIndex instead of toUInt32 when
looking for array properties.
2005-12-27 Anders Carlsson <andersca@mac.com>
Reviewed by Maciej.
* kjs/object.cpp:
(KJS::JSObject::defineSetter):
Remove duplicate call to putDirect.
2005-12-26 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin and Geoff.
Changes by me and Anders.
- mostly fixed REGRESSION: 5-10% performance regression on JS iBench from getter/setter change
http://bugs.webkit.org/show_bug.cgi?id=6083
- also fixed some warnings reported by -Winline
* JavaScriptCorePrefix.h: Move new and delete definitions higher so there
aren't conflicts with use in standard C++ headers
* kjs/object.cpp:
(KJS::throwSetterError): Moved this piece of put into a seprate function
to avoid the PIC branch.
(KJS::JSObject::put): Use hasGetterSetterProperties to avoid expensive stuff
when not needed. Also use GetterSetter properties attribute.
(KJS::JSObject::deleteProperty): Recompute whether any properties are getter/setter
properties any more, if this one was one.
(KJS::JSObject::defineGetter): Let the PropertyMap know that it has getter/setter
properties now (and use the new attribute).
(KJS::JSObject::defineSetter): Ditto.
(KJS::JSObject::fillGetterPropertySlot): Out-of-line helper for getOwnPropertySlot,
to avoid global variable access in the hot code path.
* kjs/object.h:
(KJS::): Added GetterSetter attribute.
(KJS::JSCell::isObject): Moved lower to be after inline methods it uses.
(KJS::JSValue::isObject): ditto
(KJS::JSObject::getOwnPropertySlot): try to avoid impact of getters and setters
as much as possible in the case where they are not being used
* kjs/property_map.cpp:
(KJS::PropertyMap::containsGettersOrSetters): New method to help with this
* kjs/property_map.h:
(KJS::PropertyMap::hasGetterSetterProperties): Ditto
(KJS::PropertyMap::setHasGetterSetterProperties): Ditto
(KJS::PropertyMap::PropertyMap): Added a crazy hack to store the
global "has getter/setter properties" flag in the property map
single entry, to avoid making objects any bigger.
* kjs/value.h: Moved some things to object.h to make -Winline happier
2005-12-24 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric and Dave Hyatt.
- make even const PassRefPtrs give transfer of ownership semantics
http://bugs.webkit.org/show_bug.cgi?id=6238
This is a somewhat cheesy change. Having to use PassRefPtr_Ref creates ambiguities
in assignment and copy construction. And this makes life way easier and removes
the need for pass(). It is not really correct, but we pretty much never need a real
const PassRefPtr, and this takes care of things for PassRefPtr temporaries.
* kjs/identifier.cpp:
(KJS::Identifier::add): No more need for pass()
* kjs/property_map.cpp:
(KJS::PropertyMap::addSparseArrayPropertiesToReferenceList): No more need for pass()
* kjs/ustring.cpp:
(KJS::UString::Rep::create): Use adoptRef
(KJS::UString::UString): No more need for pass
(KJS::UString::append): No more need for pass
(KJS::UString::substr): No more need for pass
* kxmlcore/PassRefPtr.h: made m_ptr mutable (ugh)
(KXMLCore::PassRefPtr::PassRefPtr): Take a const PassRefPtr reference
(KXMLCore::PassRefPtr::release): Made this a const method (ugh)
(KXMLCore::PassRefPtr::operator=): clean up appropriately
(KXMLCore::adoptRef): Added this to use instead of PassRefPtr<T>::adopt, I think
it makes the behavior more clear and it is less verbose.
(KXMLCore::static_pointer_cast): use adoptRef
(KXMLCore::const_pointer_cast): use adoptRef
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::RefPtr): take const PassRefPtr&
(KXMLCore::PassRefPtr::operator=): take const PassRefPtr&
2005-12-25 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
Unbreak HashTableConstIterator++ by returning const_iterator
* kxmlcore/HashTable.h:
(KXMLCore::HashTableConstIterator::operator++): use const_iterator
2005-12-25 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
Un-break HashTable copy constructor.
* kxmlcore/HashTable.h:
(KXMLCore::::HashTable): use const_iterator instead
2005-12-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- fixed "HashMap does not work with const pointer keys or values"
http://bugs.webkit.org/show_bug.cgi?id=6222
* kxmlcore/HashMapPtrSpec.h:
(KXMLCore::HashMap): In all methods, explicitly cast all pointers
to void * before passing to internal implementation. Use C-style
casts instead of new-style casts, because the real solution would
require a combo of reinterpret_cast anc const_cast.
2005-12-23 Maciej Stachowiak <mjs@apple.com>
- this time for sure
* kxmlcore/RefPtr.h:
(KXMLCore::::swap):
2005-12-22 Maciej Stachowiak <mjs@apple.com>
- fix build problem from last commit.
* kxmlcore/RefPtr.h:
(KXMLCore::::swap):
2005-12-21 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- Make HashMap/HashSet support non-POD types
http://bugs.webkit.org/show_bug.cgi?id=5332
The changes for support are relatively simple, but I also made extensive changes to
avoid copying, so that there isn't refcount thrash when you put RefPtrs into a HashMap.
* kxmlcore/HashTable.h:
(KXMLCore::swap): specialize swap for pairs, to swap elements individually,
so that excess copies can be avoided.
(KXMLCore::Mover::move): Template function to either copy or swap, used
when transferring elements from old table to new.
(KXMLCore::IdentityHashTranslator::hash): The old "converting lookup" templates
that took two or three function parameters now take a class parameter, this is
the class used to do a normal lookup.
(KXMLCore::IdentityHashTranslator::equal): Ditto.
(KXMLCore::IdentityHashTranslator::translate): Ditto. Translate now takes a reference
to write into instead of returning a value to avoid redundant copies.
(KXMLCore::HashTable::~HashTable): Use deallocateTable instead of freeing directly.
(KXMLCore::HashTable::insert): Based on HashTranslator now instead of separate
functions. Added a FIXME about a remaining rare excess copy.
(KXMLCore::HashTable::isEmptyBucket): Use KeyTraits directly instead of unwrapping
the key from Traits, to avoid creating and destroying pair, which copies.
(KXMLCore::HashTable::isDeletedBucket): ditto
(KXMLCore::HashTable::lookup): Use HashTranslator now instead of separate functions.
(KXMLCore::HashTable::initializeBucket): Renamed from emptyBucket. Use placement new to
work right for non-POD types.
(KXMLCore::HashTable::deleteBucket): Use assignDeleted to avoid excess copies.
(KXMLCore::HashTable::reinsert): use Mover template to copy or swap as appropriate
(KXMLCore::HashTable::allocateTable): Initialize every bucket if calloc won't do.
(KXMLCore::HashTable::deallocateTable): Destruct every bucket if needed.
(KXMLCore::HashTable::rehash): Avoid copy before reinserting, so that swap can do its magic.
(KXMLCore::HashTable::clear): use deallocateTable instead of freeing directly.
(KXMLCore::HashTable::HashTable): be more dumb when copying to ensure that non-POD types
work right
* kxmlcore/HashFunctions.h:
(KXMLCore::PointerHash): Specialize PointerHash for RefPtr
* kxmlcore/HashMap.h:
(KXMLCore::extractFirst): Return a reference not a full object to avoid
copies.
(KXMLCore::HashMapTranslator::hash): Use a special translator for insertion
to defer making the pair as long as possible, thus avoiding needless copies.
(KXMLCore::HashMapTranslator::equal): ditto
(KXMLCore::HashMapTranslator::translate): ditto
(KXMLCore::::inlineAdd): Shared by set and add to insert using HashMapTranslator
(KXMLCore::::set): Use inlineAdd
(KXMLCore::::add): Use inlineAdd
* kxmlcore/HashMapPtrSpec.h:
(KXMLCore::): Pass KeyTraits along
* kxmlcore/HashSet.h:
(KXMLCore::identityExtract): Return a reference not a full object to avoid copies.
(KXMLCore::HashSetTranslatorAdapter::hash): Redo adapter stuff to work with
the new HashTranslator approach.
(KXMLCore::HashSetTranslatorAdapter::equal): ditto
(KXMLCore::HashSetTranslatorAdapter::translate): ditto
(KXMLCore::::insert): ditto
* kxmlcore/HashTraits.h:
(KXMLCore::GenericHashTraits): This is intended be used as a base class for
customized traits: sensible defaults.
(KXMLCore::): Use it a bunch
(KXMLCore::assignDeleted): template function to allow pairs to be assigned the
deleted value w/o excess copies.
(KXMLCore::PairHashTraits::emptyValue): Updated
(KXMLCore::PairHashTraits::deletedValue): Updated
(KXMLCore::PairHashTraits::assignDeletedValue): part of assignDeleted hack
(KXMLCore::DeletedValueAssigner::assignDeletedValue): Use template magic
to either use use deletedValue or assignDeletedValue for the cases where we care.
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::swap): Added swap method.
(KXMLCore::swap): Added swap free function.
* kjs/identifier.cpp:
(KJS::CStringTranslator::hash): Use new HashTranslator class approach to
alternate type based insertion.
(KJS::CStringTranslator::equal): ditto
(KJS::CStringTranslator::translate): ditto
(KJS::Identifier::add): ditto
(KJS::UCharBufferTranslator::hash): ditto
(KJS::UCharBufferTranslator::equal): ditto
(KJS::UCharBufferTranslator::translate): ditto
- irrelevant change:
* kjs/array_object.cpp:
(ArrayProtoFunc::callAsFunction): Removed a stray space.
2005-12-22 Anders Carlsson <andersca@mac.com>
Reviewed by Eric and Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=6196
Would like to be able to define prototypes in headers
* kjs/lookup.h:
Move ClassName from KJS_DECLARE_PROTOTYPE to KJS_IMPLEMENT_PROTOTYPE.
Also, namespace all macros by prefixing them with KJS_.
2005-12-22 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=6191
RefPtr/PassRefPtr have a leak issue, operator== issues
* kxmlcore/PassRefPtr.h:
(KXMLCore::PassRefPtr::PassRefPtr): Remove non-template constructor that takes RefPtr
since the constructor template that takes RefPtr should be sufficient. Add a constructor
template that takes PassRefPtr&.
(KXMLCore::PassRefPtr::adopt): Use PassRefPtr_Ref to avoid setting pointer first to
0 and then to the pointer.
(KXMLCore::PassRefPtr::operator=): Added template versions that take PassRefPtr& and
RefPtr parameters.
(KXMLCore::PassRefPtr::operator PassRefPtr<U>): Changed to fix leak -- old version
would release and then ref.
(KXMLCore::operator==): Make templates have two parameters so you can mix types.
Also remove unneeded const in raw pointer versions.
(KXMLCore::operator!=): Ditto.
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::RefPtr): Add constructor template that takes PassRefPtr.
(KXMLCore::RefPtr::operator=): Add assignment operator templates that take
RefPtr and PassRefPtr.
(KXMLCore::operator==): Make templates have two parameters so you can mix types.
Also remove unneeded const in raw pointer versions.
(KXMLCore::operator!=): Ditto.
2005-12-21 Timothy Hatcher <timothy@apple.com>
* JavaScriptCore.xcodeproj/project.pbxproj:
Set tab width to 8, indent width to 4 and uses tabs to false per file.
2005-12-21 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
Removed evil hack for determining if a type is an integer, replaced
with template metaprogramming.
* JavaScriptCore.xcodeproj/project.pbxproj: Set tab size to 2 for
testkjs.cpp
* kjs/testkjs.cpp:
(main): Inserted asserts to test IsInteger. FIXME: Move these to
KXMLCore unit tests directory when we create one.
* kxmlcore/HashTraits.h:
(KXMLCore::): Added IsInteger class for querying types.
2005-12-20 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- made ALWAYS_INLINE declare things inline as well as __attribute__((always_inline))
http://bugs.webkit.org/show_bug.cgi?id=6159
* kxmlcore/AlwaysInline.h:
2005-12-19 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fixed a leak in the assignment operator from PassRefPtr to RefPtr
http://bugs.webkit.org/show_bug.cgi?id=6158
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::operator=):
- fix problem with PassRefPtr that darin spotted - it lacked a copy constructor
and therefore was using the default one, which can lead to excess derefs
I fixed this by adding a copy constructor from non-const
reference, and by adding a template pass() function that you have
to use when raw pointer or RefPtr are passed where PassRefPtr is
expected.
* kjs/identifier.cpp:
(KJS::Identifier::add): Changed to have PassRefPtr return type and
pass() the results.
* kjs/identifier.h:
* kjs/property_map.cpp:
(KJS::PropertyMap::addSparseArrayPropertiesToReferenceList): Use pass()
where required.
* kjs/ustring.cpp:
(KJS::UString::UString): Use pass() as needed.
(KJS::UString::append): ditto
(KJS::UString::substr): ditto
* kjs/ustring.h:
(KJS::UString::UString): Use initializer instead of assignment
* kxmlcore/PassRefPtr.h:
(KXMLCore::PassRefPtr::PassRefPtr): Added copy constructor
(KXMLCore::pass): new template function to make it convenient to pass
a PassRefPtr
2005-12-19 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej.
Fixed <rdar://problem/4370397> Missing return statement in
JSMethodNameToObjcMethodName.
JSMethodNameToObjcMethodName had a check for a name being too long, but
the check was missing a return statement.
A lot of this code was confusing and some of it was wrong, so I fixed
it up, added some asserts to catch this type of bug in the future,
changed some comments, and renamed some variables.
The two advantages of the new algorithm are (1) It makes writing past
the end of the buffer virtually impossible because the test on the main
loop is "while (not past end of buffer)" and (2) It's twice as fast
because it doesn't call strlen. (There's no need to call strlen when
we're walking the string ourselves.)
methodsNamed also supports arbitrary-length method names now. Just in
case the AppKit folks start getting REALLY verbose...
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::methodsNamed):
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(KJS::Bindings::JSMethodNameToObjcMethodName):
2005-12-19 Darin Adler <darin@apple.com>
Originally done by both George Staikos and Alexey Proskuryakov.
- fix http://bugs.webkit.org/show_bug.cgi?id=5706
Sharedptr dependency can be removed
Our coding guidelines say "use 0 instead of NULL" and both RefPtr and
PassRefPtr were using NULL, which required including a header that
defines NULL.
* kxmlcore/PassRefPtr.h:
(KXMLCore::PassRefPtr::PassRefPtr): Use 0 instead of NULL.
(KXMLCore::PassRefPtr::operator!): Use ! instead of == NULL.
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::RefPtr): Use 0 instead of NULL.
(KXMLCore::RefPtr::operator!): Use ! instead of == NULL.
Also did some reformatting.
2005-12-19 Darin Adler <darin@apple.com>
Reviewed by Geoff Garen and Eric Seidel.
- fix http://bugs.webkit.org/show_bug.cgi?id=4923
stop using <ostream> in WebCore, eliminating the <cmath> troubles it causes
* kjs/simple_number.h: Removed many unnecessary includes, including
the <cmath> one to work around GCC library header bugs. We may have to
add some includes elsewhere for platforms other than OS X, since our
prefix header takes care of some things.
* kxmlcore/AlwaysInline.h: Added. Now clients that don't include
simple_number.h can still get the ALWAYS_INLINE macro.
* JavaScriptCore.xcodeproj/project.pbxproj: Added AlwaysInline.h.
* bindings/NP_jsobject.h: Removed a lot of unnecessary includes
and removed C-specific stuff from this C++-only header.
* bindings/jni/jni_jsobject.h: Removed a lot of unnecessary includes
and did some reformatting.
* bindings/objc/objc_runtime.h: Removed an unnecessary include.
* bindings/runtime.h: Removed some unneeded includes. Reformatted.
* bindings/runtime.cpp: Updated to compile with header changes,
including a lot of reformatting.
* bindings/runtime_object.h: Removed an unnecessary include.
2005-12-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff and Adele
- replaced custom Identifier hashtable with HashSet
* kjs/identifier.cpp:
(KXMLCore::):
(KJS::identifierTable):
(KJS::Identifier::equal):
(KJS::hash):
(KJS::equal):
(KJS::convert):
(KJS::Identifier::add):
(KJS::Identifier::remove):
* kjs/identifier.h:
* kjs/internal.cpp:
(KJS::InterpreterImp::initGlobalObject):
2005-12-18 Justin Haygood <justin@xiondigital.net>
Reviewed, tweaked, and landed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=5227
Array indexOf() extension for JavaScript 1.5 Core
* kjs/array_object.h:
* kjs/array_object.cpp: (ArrayProtoFunc::callAsFunction): Added implementation of indexOf.
2005-12-18 Anders Carlsson <andersca@mac.com>
Reviewed by Darin and Geoffrey.
- fix for <http://bugs.webkit.org/show_bug.cgi?id=4000>
Object.prototype is missing isPrototypeOf
* kjs/object_object.cpp:
(ObjectPrototype::ObjectPrototype):
Add isPrototypeOf to object prototype.
(ObjectProtoFunc::callAsFunction):
Implement isPrototypeOf
* kjs/object_object.h:
(KJS::ObjectProtoFunc::):
Add id for isPrototypeOf.
2005-12-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
Fixed http://bugs.webkit.org/show_bug.cgi?id=6119
split() function ignores case insensitive modifier.
Glossary:
RegExpImp: The C++ object you get when JavaScript executes
"new RegExp()".
RegExp: A C++ wrapper object that performs regular expression
matching on behalf of a RegExpImp.
Instead of unnecessarily constructing a RegExp which (wrongly) lacks
any modifiers, String.split() now uses the RegExp built in to the
RegExpImp passed to it, which has the right modifiers already.
I also cleaned up other bits of the string code to standardized how
we handle RegExpImp arguments.
* ChangeLog:
* kjs/string_object.cpp:
(replace):
(StringProtoFunc::callAsFunction):
2005-12-16 David Hyatt <hyatt@apple.com>
Remove unused RefPtr constructors that can create an ambiguity in ustring on some platforms.
Reviewed by mjs
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::RefPtr):
2005-12-15 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=5688
speed up JavaScript parsing by not creating a UString just to parse
* kjs/internal.h:
* kjs/internal.cpp: (KJS::InterpreterImp::evaluate): Change to take a character pointer
and length rather than a UString.
* kjs/interpreter.h:
* kjs/interpreter.cpp: (Interpreter::evaluate): Ditto.
* kjs/protect.h: Remove uneeded "convert to bool" operator since we already have a
"convert to raw pointer" operator in this class.
=== Safari-521~5 ===
2005-12-13 Geoffrey Garen <ggaren@apple.com>
Updated test results to match Anders's last fix.
* tests/mozilla/expected.html:
2005-12-13 Anders Carlsson <andersca@mac.com>
* ChangeLog: Add titles for my bugzilla bugs.
2005-12-13 Anders Carlsson <andersca@mac.com>
Reviewed by Darin.
- Fixes <http://bugs.webkit.org/show_bug.cgi?id=6041>
Support property getters and setters.
* bindings/runtime_array.cpp:
(RuntimeArray::lengthGetter):
(RuntimeArray::indexGetter):
* bindings/runtime_array.h:
* bindings/runtime_method.cpp:
(RuntimeMethod::lengthGetter):
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::fallbackObjectGetter):
(RuntimeObjectImp::fieldGetter):
(RuntimeObjectImp::methodGetter):
* bindings/runtime_object.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstance::lengthGetter):
(getProperty):
Update for changes to PropertySlot::getValue and
PropertySlot::GetValueFunc.
* kjs/collector.cpp:
(KJS::className):
Handle GetterSetterType.
* kjs/function.cpp:
(KJS::FunctionImp::argumentsGetter):
(KJS::FunctionImp::lengthGetter):
(KJS::Arguments::mappedIndexGetter):
(KJS::ActivationImp::argumentsGetter):
* kjs/function.h:
Update for changes to PropertySlot::getValue and
PropertySlot::GetValueFunc.
* kjs/grammar.y:
Rework grammar parts for get set declarations directly
in the object literal.
* kjs/internal.cpp:
(KJS::GetterSetterImp::mark):
(KJS::GetterSetterImp::toPrimitive):
(KJS::GetterSetterImp::toBoolean):
(KJS::GetterSetterImp::toNumber):
(KJS::GetterSetterImp::toString):
(KJS::GetterSetterImp::toObject):
Add type conversion functions. These aren't meant to be called.
(KJS::printInfo):
Handle GetterSetterType.
* kjs/lookup.h:
(KJS::staticFunctionGetter):
(KJS::staticValueGetter):
Update for changes to PropertySlot::GetValueFunc.
* kjs/nodes.cpp:
Refactor they way properties nodes are implemented.
We now have a PropertyListNode which is a list of PropertyNodes.
Each PropertyNode has a name (which is a PropertyNameNode) and an associated
value node. PropertyNodes can be of different types. The Constant type is the
old constant declaration and the Getter and Setter types are for property getters
and setters.
(ResolveNode::evaluate):
Update for changes to PropertySlot::getValue.
(PropertyListNode::evaluate):
Go through all property nodes and set them on the newly created object. If the
property nodes are of type Getter or Setter, define getters and setters. Otherwise,
just add the properties like before.
(PropertyNode::evaluate):
This should never be called directly.
(PropertyNameNode::evaluate):
Rename from PropertyNode::evaluate.
(FunctionCallResolveNode::evaluate):
(FunctionCallBracketNode::evaluate):
(FunctionCallDotNode::evaluate):
(PostfixResolveNode::evaluate):
(PostfixBracketNode::evaluate):
(PostfixDotNode::evaluate):
(TypeOfResolveNode::evaluate):
(PrefixResolveNode::evaluate):
(PrefixBracketNode::evaluate):
(PrefixDotNode::evaluate):
(AssignResolveNode::evaluate):
(AssignDotNode::evaluate):
(AssignBracketNode::evaluate):
Update for changes to PropertySlot::getValue.
* kjs/nodes.h:
(KJS::PropertyNameNode::PropertyNameNode):
Rename from PropertyNode.
(KJS::PropertyNode::):
(KJS::PropertyNode::PropertyNode):
New class, representing a single property.
(KJS::PropertyListNode::PropertyListNode):
Rename from PropertyValueNode.
(KJS::FuncExprNode::FuncExprNode):
Put ParameterNode parameter last, and make it optional.
(KJS::ObjectLiteralNode::ObjectLiteralNode):
Use a PropertyListNode here now.
* kjs/nodes2string.cpp:
(PropertyListNode::streamTo):
Iterate through all property nodes.
(PropertyNode::streamTo):
Print out the name and value. Doesn't handle getters and setters currently.
(PropertyNameNode::streamTo):
Rename from PropertyNode::streamTo.
* kjs/object.cpp:
(KJS::JSObject::get):
Update for changes to PropertySlot::getValue.
(KJS::JSObject::put):
If the property already exists and has a Setter, invoke
the setter function instead of setting the property directly.
(KJS::JSObject::defineGetter):
(KJS::JSObject::defineSetter):
New functions for defining property getters and setters on the object.
* kjs/object.h:
(KJS::GetterSetterImp::type):
(KJS::GetterSetterImp::GetterSetterImp):
(KJS::GetterSetterImp::getGetter):
(KJS::GetterSetterImp::setGetter):
(KJS::GetterSetterImp::getSetter):
(KJS::GetterSetterImp::setSetter):
New class for properties which have getters and setters defined.
This class is only used internally and should never be seen from the outside.
(KJS::JSObject::getOwnPropertySlot):
If the property is a getter, call setGetterSlot on the property slot.
* kjs/object_object.cpp:
(ObjectPrototype::ObjectPrototype):
Add __defineGetter__, __defineSetter, __lookupGetter__, __lookupSetter__
to prototype.
(ObjectProtoFunc::callAsFunction):
Implement handlers for new functions.
* kjs/object_object.h:
(KJS::ObjectProtoFunc::):
Add ids for new functions.
* kjs/property_slot.cpp:
(KJS::PropertySlot::undefinedGetter):
Update for changes to PropertySlot::GetValueFunc.
(KJS::PropertySlot::functionGetter):
Call the function getter object and return its value.
* kjs/property_slot.h:
(KJS::PropertySlot::getValue):
Add a new argument which is the original object that
getPropertySlot was called on.
(KJS::PropertySlot::setGetterSlot):
(KJS::PropertySlot::):
New function which sets a getter slot. When getValue is called on a
getter slot, the getter function object is invoked.
* kjs/string_object.cpp:
(StringInstance::lengthGetter):
(StringInstance::indexGetter):
* kjs/string_object.h:
Update for changes to PropertySlot::GetValueFunc.
* kjs/value.h:
(KJS::):
Add GetterSetterType and make GetterSetterImp a friend class of JSCell.
2005-12-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- added a new HashCountedSet class for the common pattern of mapping items to counts that can change
* kxmlcore/HashCountedSet.h: Added.
(KXMLCore::HashCountedSet::*): Implemented, on top of HashMap.
* kxmlcore/HashMap.h:
(KXMLCore::HashMap::add): New method - does not replace existing value if key already present
but otherwise like set().
(KXMLCore::HashMap::set): Improved comments.
* kxmlcore/HashMapPtrSpec.h:
(KXMLCore::HashMap::add): Added to specializations too.
* JavaScriptCore.xcodeproj/project.pbxproj: Add new file.
* kxmlcore/HashFunctions.h: Added include of stdint.h
- replaced the custom hashtable for values protected from GC with HashCountedSet
* kjs/collector.cpp:
(KJS::Collector::protect): Moved code here from ProtectedValues::increaseProtectCount
since the code is so simple now.
(KJS::Collector::unprotect): Ditto for ProtectedValues::decreaseProtectCount.
(KJS::Collector::markProtectedObjects): Updated for new way of doing things, now
simpler and safer.
(KJS::Collector::numReferencedObjects): ditto
(KJS::Collector::rootObjectClasses): ditto
* kjs/collector.h: Added protect and unprotect static methods
* kjs/protect.h:
(KJS::gcProtect): Updated for removal of ProtectedValues class
(KJS::gcUnprotect): likewise
* kjs/protected_values.cpp: Removed.
* kjs/protected_values.h: Removed.
2005-12-10 Darin Adler <darin@apple.com>
Rubber stamped by Maciej.
- did long-promised KJS renaming:
ValueImp -> JSValue
ObjectImp -> JSObject
AllocatedValueImp -> JSCell
A renaming to get a class out of the way
KJS::Bindings::JSObject -> JavaJSObject
and some other "imp-reduction" renaming
*InstanceImp -> *Instance
*ProtoFuncImp -> *ProtoFunc
*PrototypeImp -> *Prototype
ArgumentsImp -> Arguments
RuntimeArrayImp -> RuntimeArray
RuntimeMethodImp -> RuntimeMethod
* most files and functions
2005-12-10 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- eliminated the old Undefined(), Null(), Boolean(), Number(), and String()
Code now uses jsUndefined(), jsNull(), jsBoolean(), jsNumber(), and jsString().
* bindings/NP_jsobject.cpp:
(_NPN_Evaluate):
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::invokeMethod):
(KJS::Bindings::CInstance::invokeDefaultMethod):
* bindings/c/c_runtime.cpp:
(CField::valueFromInstance):
* bindings/c/c_utility.cpp:
(KJS::Bindings::convertNPVariantToValue):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
(JavaInstance::invokeDefaultMethod):
* bindings/jni/jni_jsobject.cpp:
(JSObject::eval):
(JSObject::convertJObjectToValue):
* bindings/jni/jni_runtime.cpp:
(JavaArray::convertJObjectToArray):
(JavaField::valueFromInstance):
(JavaArray::valueAt):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject webScriptValueAtIndex:]):
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
(ObjcInstance::getValueOfUndefinedField):
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(ObjcFallbackObjectImp::callAsFunction):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertNSStringToString):
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime.h:
(KJS::Bindings::Class::fallbackObject):
(KJS::Bindings::Instance::getValueOfUndefinedField):
(KJS::Bindings::Instance::valueOf):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::lengthGetter):
* bindings/runtime_method.cpp:
(RuntimeMethodImp::lengthGetter):
(RuntimeMethodImp::callAsFunction):
(RuntimeMethodImp::execute):
* kjs/array_object.cpp:
(ArrayInstanceImp::lengthGetter):
(CompareWithCompareFunctionArguments::CompareWithCompareFunctionArguments):
(ArrayPrototypeImp::ArrayPrototypeImp):
(ArrayProtoFuncImp::ArrayProtoFuncImp):
(ArrayProtoFuncImp::callAsFunction):
(ArrayObjectImp::ArrayObjectImp):
* kjs/bool_object.cpp:
(BooleanPrototypeImp::BooleanPrototypeImp):
(BooleanProtoFuncImp::callAsFunction):
(BooleanObjectImp::BooleanObjectImp):
(BooleanObjectImp::callAsFunction):
* kjs/error_object.cpp:
(ErrorPrototypeImp::ErrorPrototypeImp):
(ErrorProtoFuncImp::ErrorProtoFuncImp):
(ErrorProtoFuncImp::callAsFunction):
(ErrorObjectImp::ErrorObjectImp):
(NativeErrorImp::NativeErrorImp):
* kjs/function.cpp:
(KJS::FunctionImp::callAsFunction):
(KJS::FunctionImp::processParameters):
(KJS::FunctionImp::argumentsGetter):
(KJS::FunctionImp::lengthGetter):
(KJS::DeclaredFunctionImp::execute):
(KJS::encode):
(KJS::decode):
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function_object.cpp:
(FunctionPrototypeImp::FunctionPrototypeImp):
(FunctionPrototypeImp::callAsFunction):
(FunctionProtoFuncImp::callAsFunction):
(FunctionObjectImp::FunctionObjectImp):
* kjs/internal.cpp:
(KJS::InterpreterImp::initGlobalObject):
* kjs/interpreter.h:
* kjs/lookup.h:
* kjs/math_object.cpp:
(MathObjectImp::getValueProperty):
(MathFuncImp::callAsFunction):
* kjs/nodes.cpp:
(Node::setExceptionDetailsIfNeeded):
(NullNode::evaluate):
(PropertyNode::evaluate):
(FunctionCallBracketNode::evaluate):
(FunctionCallDotNode::evaluate):
(PostfixBracketNode::evaluate):
(PostfixDotNode::evaluate):
(VoidNode::evaluate):
(PrefixBracketNode::evaluate):
(PrefixDotNode::evaluate):
(ShiftNode::evaluate):
(valueForReadModifyAssignment):
(AssignDotNode::evaluate):
(AssignBracketNode::evaluate):
(VarDeclNode::evaluate):
(VarDeclNode::processVarDecls):
(VarDeclListNode::evaluate):
(ReturnNode::execute):
(CaseClauseNode::evalStatements):
(ParameterNode::evaluate):
(FuncDeclNode::processFuncDecl):
* kjs/nodes.h:
(KJS::StatementNode::evaluate):
* kjs/number_object.cpp:
(NumberPrototypeImp::NumberPrototypeImp):
(NumberProtoFuncImp::callAsFunction):
(NumberObjectImp::NumberObjectImp):
(NumberObjectImp::getValueProperty):
(NumberObjectImp::callAsFunction):
* kjs/object.cpp:
(KJS::ObjectImp::get):
(KJS::Error::create):
* kjs/object_object.cpp:
(ObjectPrototypeImp::ObjectPrototypeImp):
(ObjectProtoFuncImp::callAsFunction):
(ObjectObjectImp::ObjectObjectImp):
* kjs/property_slot.cpp:
(KJS::PropertySlot::undefinedGetter):
* kjs/regexp_object.cpp:
(RegExpPrototypeImp::RegExpPrototypeImp):
(RegExpProtoFuncImp::callAsFunction):
(RegExpObjectImp::RegExpObjectImp):
(RegExpObjectImp::arrayOfMatches):
(RegExpObjectImp::getBackref):
(RegExpObjectImp::getLastMatch):
(RegExpObjectImp::getLastParen):
(RegExpObjectImp::getLeftContext):
(RegExpObjectImp::getRightContext):
(RegExpObjectImp::getValueProperty):
(RegExpObjectImp::construct):
* kjs/string_object.cpp:
(StringInstanceImp::StringInstanceImp):
(StringPrototypeImp::StringPrototypeImp):
(replace):
(StringProtoFuncImp::callAsFunction):
(StringObjectImp::StringObjectImp):
(StringObjectImp::callAsFunction):
(StringObjectFuncImp::StringObjectFuncImp):
(StringObjectFuncImp::callAsFunction):
* kjs/testkjs.cpp:
(TestFunctionImp::callAsFunction):
(VersionFunctionImp::callAsFunction):
* kjs/value.h:
2005-12-10 Oliver Hunt <ojh16@student.canterbury.ac.nz>
Reviewed by Maciej, landed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=3539
Array join and toString methods do not support circular references
* kjs/array_object.cpp: (ArrayProtoFuncImp::callAsFunction):
Added set of visited objects -- don't recurse if item is already in the set.
2005-12-08 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
- fix major memory leak and resultant slowdown on JavaScript iBench from
my PassRefPtr changes
* kjs/ustring.cpp:
(KJS::UString::Rep::create): I forgot to change one of the two overloads to create
with a refcount of 0 instead of 1 (the smart pointer then bumps it. But instead of
changing it, I changed both to start with a refcounter of 1 and use PassRefPtr::adopt
to adopt the initial refcount, this may be a hair more efficient.
- made the assignment operators for smart pointers inline because Shark said so
* kxmlcore/PassRefPtr.h:
(KXMLCore::::operator=):
* kxmlcore/RefPtr.h:
(KXMLCore::::operator=):
2005-12-06 Anders Carlsson <andersca@mac.com>
Reviewed by Darin.
- fix build when using gcc 4
* kjs/ustring.h:
Make Rep public.
* kxmlcore/PassRefPtr.h:
(KXMLCore::::operator):
Fix a typo.
2005-12-05 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- add PassRefPtr, a smart pointer class that works in conjunction
with RefPtr but has transfer-of-ownership semantics
- apply RefPtr and PassRefPtr to UString
- cleaned up UString a little so that it doesn't need to have so many friend classes
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/identifier.cpp:
(KJS::Identifier::add):
* kjs/identifier.h:
(KJS::Identifier::Identifier):
(KJS::Identifier::equal):
* kjs/property_map.cpp:
(KJS::PropertyMap::get):
(KJS::PropertyMap::getLocation):
(KJS::PropertyMap::put):
(KJS::PropertyMap::remove):
* kjs/ustring.cpp:
(KJS::UCharReference::operator=):
(KJS::UCharReference::ref):
(KJS::UString::Rep::createCopying):
(KJS::UString::Rep::create):
(KJS::UString::usedCapacity):
(KJS::UString::usedPreCapacity):
(KJS::UString::expandCapacity):
(KJS::UString::expandPreCapacity):
(KJS::UString::UString):
(KJS::UString::spliceSubstringsWithSeparators):
(KJS::UString::append):
(KJS::UString::operator=):
(KJS::UString::toStrictUInt32):
(KJS::UString::substr):
(KJS::UString::copyForWriting):
(KJS::operator==):
* kjs/ustring.h:
(KJS::UString::UString):
(KJS::UString::~UString):
(KJS::UString::data):
(KJS::UString::isNull):
(KJS::UString::isEmpty):
(KJS::UString::size):
(KJS::UString::rep):
* kxmlcore/RefPtr.h:
(KXMLCore::RefPtr::RefPtr):
(KXMLCore::RefPtr::operator*):
(KXMLCore::::operator):
(KXMLCore::operator==):
(KXMLCore::operator!=):
(KXMLCore::static_pointer_cast):
(KXMLCore::const_pointer_cast):
2005-12-04 Geoffrey Garen <ggaren@apple.com>
Update test results to match Anders's last checkin.
* tests/mozilla/expected.html:
2005-12-04 Anders Carlsson <andersca@mac.com>
Reviewed by Geoffrey.
- Fixes <http://bugs.webkit.org/show_bug.cgi?id=3999>
Object.prototype is missing propertyIsEnumerable
* kjs/object.cpp:
(KJS::ObjectImp::canPut):
Refactor to use getPropertyAttributes.
(KJS::ObjectImp::propertyIsEnumerable):
New function which checks if a property is enumerable.
(KJS::ObjectImp::getPropertyAttributes):
* kjs/object.h:
Add getPropertyAttributes and propertyIsEnumerable.
* kjs/object_object.cpp:
(ObjectPrototypeImp::ObjectPrototypeImp):
(ObjectProtoFuncImp::callAsFunction):
* kjs/object_object.h:
(KJS::ObjectProtoFuncImp::):
Add propertyIsEnumerable to the Object prototype.
2005-12-01 Maciej Stachowiak <mjs@apple.com>
Reviewed by Tim Hatcher.
- removed deprecated reset, isNull and nonNull methods
* kxmlcore/RefPtr.h:
2005-12-01 Anders Carlsson <andersca@mac.com>
Reviewed by Darin.
- Fixes <http://bugs.webkit.org/show_bug.cgi?id=3382>
nodes2strings.cpp fails to print left expression of ForInNode when 'var' is not used
Patch by Mark Rowe.
* kjs/nodes2string.cpp:
(ForInNode::streamTo):
Add lexpr if there's no varDecl.
2005-12-01 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Eric.
- renamed SharedPtr to RefPtr via script
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/function.cpp:
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function.h:
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/internal.cpp:
(KJS::Parser::parse):
(KJS::InterpreterImp::checkSyntax):
(KJS::InterpreterImp::evaluate):
* kjs/internal.h:
* kjs/nodes.h:
* kjs/nodes2string.cpp:
(KJS::SourceStream::operator<<):
* kjs/protect.h:
* kxmlcore/RefPtr.h: Added.
(KXMLCore::RefPtr::RefPtr):
(KXMLCore::RefPtr::~RefPtr):
(KXMLCore::RefPtr::isNull):
(KXMLCore::RefPtr::notNull):
(KXMLCore::RefPtr::reset):
(KXMLCore::RefPtr::get):
(KXMLCore::RefPtr::operator*):
(KXMLCore::RefPtr::operator->):
(KXMLCore::RefPtr::operator!):
(KXMLCore::RefPtr::operator UnspecifiedBoolType):
(KXMLCore::::operator):
(KXMLCore::operator==):
(KXMLCore::operator!=):
(KXMLCore::static_pointer_cast):
(KXMLCore::const_pointer_cast):
* kxmlcore/SharedPtr.h: Removed.
2005-11-30 Maciej Stachowiak <mjs@apple.com>
Reviewed by Dave Hyatt.
- change idiom used for implicit bool conversion of smart pointers, because the old one gives weird error messages sometimes
* kjs/protect.h:
(KJS::ProtectedPtr::operator UnspecifiedBoolType):
* kxmlcore/SharedPtr.h:
(KXMLCore::SharedPtr::operator UnspecifiedBoolType):
2005-11-29 Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by ggaren. Committed by eseidel.
Date conversion to local time gets the DST flag wrong sometimes
http://bugs.webkit.org/show_bug.cgi?id=5514
* kjs/date_object.cpp:
(KJS::isTime_tSigned):
(KJS::DateProtoFuncImp::callAsFunction):
2005-11-26 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Eric.
- renamed InterpreterLock to JSLock
* bindings/NP_jsobject.cpp:
(_NPN_Invoke):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_RemoveProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
(_NPN_SetException):
* bindings/jni/jni_jsobject.cpp:
(JSObject::call):
(JSObject::eval):
(JSObject::getMember):
(JSObject::setMember):
(JSObject::removeMember):
(JSObject::getSlot):
(JSObject::setSlot):
(JSObject::toString):
(JSObject::convertJObjectToValue):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject stringRepresentation]):
(-[WebScriptObject webScriptValueAtIndex:]):
(-[WebScriptObject setWebScriptValueAtIndex:value:]):
(+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
* bindings/runtime.cpp:
(Instance::createRuntimeObject):
* bindings/runtime_root.cpp:
(KJS::Bindings::addNativeReference):
(KJS::Bindings::removeNativeReference):
(RootObject::removeAllNativeReferences):
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::~RootObject):
(KJS::Bindings::RootObject::setRootObjectImp):
* bindings/testbindings.cpp:
(main):
* bindings/testbindings.mm:
(main):
* kjs/JSLock.cpp:
(KJS::initializeJSLock):
(KJS::JSLock::lock):
(KJS::JSLock::unlock):
(KJS::JSLock::lockCount):
(KJS::JSLock::DropAllLocks::DropAllLocks):
(KJS::JSLock::DropAllLocks::~DropAllLocks):
* kjs/JSLock.h:
(KJS::JSLock::JSLock):
(KJS::JSLock::~JSLock):
* kjs/collector.cpp:
(KJS::Collector::allocate):
(KJS::Collector::collect):
* kjs/internal.cpp:
(KJS::InterpreterImp::InterpreterImp):
(KJS::InterpreterImp::clear):
(KJS::InterpreterImp::checkSyntax):
(KJS::InterpreterImp::evaluate):
* kjs/interpreter.cpp:
(Interpreter::evaluate):
* kjs/protect.h:
(KJS::::ProtectedPtr):
(KJS::::~ProtectedPtr):
(KJS::::operator):
* kjs/protected_reference.h:
(KJS::ProtectedReference::ProtectedReference):
(KJS::ProtectedReference::~ProtectedReference):
(KJS::ProtectedReference::operator=):
* kjs/protected_values.cpp:
(KJS::ProtectedValues::getProtectCount):
(KJS::ProtectedValues::increaseProtectCount):
(KJS::ProtectedValues::decreaseProtectCount):
* kjs/testkjs.cpp:
(TestFunctionImp::callAsFunction):
(main):
2005-11-26 Darin Adler <darin@apple.com>
Reviewed by eseidel. Committed by eseidel.
Inline ScopeChain functions for speed.
http://bugs.webkit.org/show_bug.cgi?id=5687
* kjs/object.h:
(KJS::ScopeChain::mark):
* kjs/scope_chain.cpp:
* kjs/scope_chain.h:
(KJS::ScopeChain::ref):
(KJS::ScopeChain::operator=):
(KJS::ScopeChain::bottom):
(KJS::ScopeChain::push):
(KJS::ScopeChain::pop):
2005-11-21 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
<rdar://problem/4139620> Seed: WebKit: hang when sending XMLHttpRequest if automatic proxy config is used
Also factored locking code completely into a separate class, and
added a convenient packaged way to temporarily drop locks.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/JSLock.cpp: Added.
(KJS::initializeInterpreterLock):
(KJS::InterpreterLock::lock):
(KJS::InterpreterLock::unlock):
(KJS::InterpreterLock::lockCount):
(KJS::InterpreterLock::DropAllLocks::DropAllLocks):
(KJS::InterpreterLock::DropAllLocks::~DropAllLocks):
* kjs/JSLock.h: Added.
(KJS::InterpreterLock::InterpreterLock):
(KJS::InterpreterLock::~InterpreterLock):
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/interpreter.cpp:
* kjs/interpreter.h:
* kjs/protect.h:
* kjs/testkjs.cpp:
(TestFunctionImp::callAsFunction):
2005-11-21 Eric Seidel <eseidel@apple.com>
Rubber-stamped by hyatt.
Removed JavaScriptCore+SVG target.
* JavaScriptCore.xcodeproj/project.pbxproj:
2005-11-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by mjs.
- Fixed <rdar://problem/4342216> Installer crash in
KJS::ValueImp::marked() when garbage collector runs inside call to
ConstantValues::init()
I took responsibility for initializing and marking ConstantValues away
from InterpreterImp, since it's possible to reference such a value
before any interpreter has been created and after the last interpreter
has been destroyed.
InterpreterImp::lock now initializes ConstantValues. It's a good
place for the initialization because you have to call it before
creating any objects. Since ::lock can be called more than once,
I added a check in ConstantValues::init to ensure that it executes
only once.
Collector:collect is now responsible for marking ConstantValues.
We no longer clear the ConstantValues since we can't guarantee that no
one has a reference to them.
FIXME: This is hackery. The long-term plan is to make ConstantValues
use immediate values that require no initialization.
* ChangeLog:
* kjs/collector.cpp:
(KJS::Collector::collect):
* kjs/internal.cpp:
(KJS::InterpreterImp::InterpreterImp):
(KJS::InterpreterImp::lock):
(KJS::InterpreterImp::clear):
(KJS::InterpreterImp::mark):
* kjs/internal.h:
* kjs/value.cpp:
(KJS::ConstantValues::initIfNeeded):
* kjs/value.h:
2005-11-08 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
This patch fixes some naughty naughty code -- 5 crashes and 2
may-go-haywire-in-the-futures.
One such crash is <rdar://problem/4247330> 8C46 Crash with with
incomplete parameter list to webScript object function.
I replaced early returns from within NS_DURINGs with calls to
NS_VALUERETURN because the doc says, "You cannot use goto or
return to exit an exception handling domain -- errors will result."
I replaced hard-coded analyses of -[NSMethodSignature
methodReturnType] with more abstracted alternatives, since
the documentation says "This encoding is implementation-specific,
so applications should use it with caution," and then emits an
evil cackle.
I removed the early return in the case where a JavaScript caller
supplies an insufficient number of arguments, because the right
thing to do in such a case is to use JavaScript's defined behavior
of supplying "undefined" for any missing arguments.
I also changed ObjcInstance::invokeMethod so that it no longer
deletes the method passed to it. It doesn't create the method,
so it shouldn't delete it. A friend of mine named
KERNEL_PROTECTION_FAILURE agrees with me on this point.
Finally, I changed an assert(true) to assert(false) because
all the other asserts were making fun of it.
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
2005-11-06 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=5571
REGRESSION (412.5-TOT): duplicated words/sentences at
shakespeer.sourceforge.net
Our UTF16-modified PCRE didn't work with extended character classes
(classes involving characters > 255) because it used the GETCHARINC
macro to read through them. In UTF16 mode, GETCHARINC expects UTF16
input, but PCRE encodes character classes in UTF8 regardless of the
input mode of the subject string.
The fix is to explicitly define GETUTF8CHARINC, and to use it,
rather than GETCHARINC, when reading extended character classes.
In UTF8 mode, we simply define GETCHARINC to be GETUTF8CHARINC.
* pcre/pcre_internal.h:
* pcre/pcre_xclass.c:
(_pcre_xclass):
2005-11-05 Geoffrey Garen <ggaren@apple.com>
Patch by Mitz Pettel, reviewed by Maciej.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=5357
REGRESSION: Scriptable plugin hides properties of OBJECT element
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::fallbackObject):
2005-11-05 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=5409
slice() testcase doesn't pass
Modified String.slice to deal with funky values.
Updated test results. We now pass <js1_2/String/slice.js>.
* kjs/string_object.cpp:
(StringProtoFuncImp::callAsFunction):
* tests/mozilla/expected.html:
2005-11-04 Darin Adler <darin@apple.com>
Reviewed by Tim Hatcher.
* kxmlcore/HashSet.h: Fixed case of "hashfunctions.h" -- needs to be "HashFunctions.h".
2005-11-03 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin and Vicki.
* JavaScriptCore.xcodeproj/project.pbxproj:
Change to use $(SYSTEM_LIBRARY_DIR) consistently and place
$(NEXT_ROOT) in a few spots to make build-root work.
2005-11-03 Geoffrey Garen <ggaren@apple.com>
- Updated JavaScriptCore test results to reflect recent fixes.
* tests/mozilla/expected.html:
2005-11-03 Geoffrey Garen <ggaren@apple.com>
Reviewed by darin.
- Fixed http://bugs.webkit.org/show_bug.cgi?id=5602
REGRESSION: RegExp("[^\\s$]+", "g") returns extra matches
We now update lastIndex relative to the start of the last match,
rather than the start of the last search. We used to assume that
the two were equal, but that is not the case when a pattern
matches at a character after the first in the string.
* kjs/regexp_object.cpp:
(RegExpProtoFuncImp::callAsFunction):
2005-10-24 John Sullivan <sullivan@apple.com>
Reviewed by Darin Adler. Code changes by Alexey Proskuryakov.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4931
Unicode format characters (Cf) should be removed from JavaScript source
* kjs/lexer.cpp:
include <unicode/uchar.h>
(Lexer::Lexer):
use KJS::UChar instead of UChar to avoid ambiguity caused by new include
(Lexer::setCode):
ditto; also, use shift(4) to skip first 4 chars to take advantage of new
logic there.
(Lexer::shift):
skip chars of type U_FORMAT_CHAR
(Lexer::convertUnicode):
use KJS::UChar instead of UChar to avoid ambiguity caused by new include
(Lexer::record16):
ditto
(Lexer::makeIdentifier):
ditto
(Lexer::makeUString):
ditto
* tests/mozilla/ecma/Array/15.4.5.1-1.js:
updated to skip soft hyphens
2005-10-24 John Sullivan <sullivan@apple.com>
Reviewed by Darin Adler. Code changes by George Staikos/Geoff Garen.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4142
Date object does not always adjust daylight savings correctly
* kjs/date_object.cpp:
(KJS::makeTime):
Fix the case where a time change crosses the daylight savings start/end dates.
2005-10-17 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff. Code changes by Darin.
- some micro-optimizations to FastMalloc to reduce math and branches.
* kxmlcore/FastMalloc.cpp:
(KXMLCore::TCMalloc_Central_FreeList::Populate):
(KXMLCore::fastMallocRegisterThread):
(KXMLCore::TCMalloc_ThreadCache::GetCache):
(KXMLCore::TCMalloc_ThreadCache::GetCacheIfPresent):
2005-10-15 Maciej Stachowiak <mjs@apple.com>
Reverted fix for this bug, because it was part of a time range that caused a performance
regression:
<rdar://problem/4260481> Remove Reference type from JavaScriptCore
2005-10-15 Darin Adler <darin@apple.com>
* kxmlcore/HashTable.cpp: Fixed build failure (said hashtable.h instead of HashTable.h).
2005-10-14 Geoffrey Garen <ggaren@apple.com>
Style changes recommended by Darin.
Changed to camelCase, changed ValueImp* to ValueImp *.
* kjs/simple_number.h:
(KJS::SimpleNumber::make):
(KJS::SimpleNumber::value):
2005-10-11 Geoffrey Garen <ggaren@apple.com>
Added regexp_object.lut.h build phase from JavaScriptCore
to JavaScriptCore+SVG.
Reviewed by mitz.
* JavaScriptCore.xcodeproj/project.pbxproj:
2005-10-11 Geoffrey Garen <ggaren@apple.com>
Fixed build bustage from last checkin (stray characters
in the project file).
Reviewed by mitz.
* JavaScriptCore.xcodeproj/project.pbxproj:
2005-10-11 Geoffrey Garen <ggaren@apple.com>
New JavaScriptCore test results to reflect the last change.
* tests/mozilla/expected.html:
2005-10-10 Geoffrey Garen <ggaren@apple.com>
- Implemented caching of match state inside the global RegExp object
(lastParen, leftContext, rightContext, lastMatch, input).
exec(), test(), match(), search(), and replace() now dipatch regular
expression matching through the RegExp object's performMatch function,
to facilitate caching. This replaces registerRegexp and
setSubPatterns.
- Implemented the special '$' aliases (e.g. RegExp.input aliases to
RegExp.$_).
- Moved support for backreferences into the new static hash table
used for other special RegExp properties. Truncated backreferences
at $9 to match IE, FF, and the "What's New in Netscape 1.2?" doc.
(String.replace still supports double-digit backreferences.)
- Tweaked RegExp.prototype.exec to handle ginormous values in lastIndex.
Fixes 11 -- count em, 11 -- JavaScriptCore tests.
* fast/js/regexp-caching-expected.txt: Added.
* fast/js/regexp-caching.html: Added.
Reviewed by mjs.
* JavaScriptCore.xcodeproj/project.pbxproj: Added regexp_object.lut.h
* kjs/create_hash_table: Tweaked to allow for more exotic characters.
We now rely on the compiler to catch illegal
identifiers.
* kjs/regexp.cpp:
(KJS::RegExp::RegExp):
* kjs/regexp_object.cpp:
(RegExpProtoFuncImp::callAsFunction):
(RegExpObjectImp::RegExpObjectImp):
(RegExpObjectImp::performMatch):
(RegExpObjectImp::arrayOfMatches):
(RegExpObjectImp::backrefGetter):
(RegExpObjectImp::getLastMatch):
(RegExpObjectImp::getLastParen):
(RegExpObjectImp::getLeftContext):
(RegExpObjectImp::getRightContext):
(RegExpObjectImp::getOwnPropertySlot):
(RegExpObjectImp::getValueProperty):
(RegExpObjectImp::put):
(RegExpObjectImp::putValueProperty):
* kjs/regexp_object.h:
(KJS::RegExpObjectImp::):
* kjs/string_object.cpp:
(substituteBackreferences):
(replace):
(StringProtoFuncImp::callAsFunction):
2005-10-09 Darin Adler <darin@apple.com>
Reviewed by Maciej; some changes done after review.
- fixed <rdar://problem/4092064> hanging loading page; rte.ie (works in IE and Firefox)
- fixed http://bugs.webkit.org/show_bug.cgi?id=5280
Date.setMonth fails with negative values
- fixed http://bugs.webkit.org/show_bug.cgi?id=5154
JSC should switch to _r variants of unix time/date functions
- fixed a few possible overflow cases
Retested all tests to be sure nothing broke; added layout test for bug 5280.
* kjs/config.h: Removed TIME_WITH_SYS_TIME define. Also set HAVE_SYS_TIMEB_H
for the __APPLE__ case (the latter is accurate but irrelevant).
* kjs/date_object.h: Reformatted. Removed unnecessary include of "function_object.h".
Moved declarations of helper classes and functions into the cpp file.
* kjs/date_object.cpp: Removed code at top to define macros to use CoreFoundation instead of
POSIX date functions.
(KJS::styleFromArgString): Tweaked to return early instead of using a variable.
(KJS::formatLocaleDate): Tweaked to check for undefined rather than checking argument count.
(KJS::formatDate): Made parameter const.
(KJS::formatDateUTCVariant): Ditto.
(KJS::formatTime): Ditto.
(KJS::DateProtoFuncImp::callAsFunction): Use gmtime_r and localtime_r instead of gmtime and
localtime.
(KJS::DateObjectImp::callAsFunction): Use localtime_r instead of localtime.
(KJS::ymdhmsToSeconds): Renamed from ymdhms_to_seconds. Changed computation to avoid possible
overflow if year is an extremely large or small number.
(KJS::makeTime): Removed code to move large month numbers from tm_mon to tm_year; this was
to accomodate CFGregorianDate, which is no longer used (and didn't handle negative values).
(KJS::parseDate): Renamed from KRFCDate_parseDate; changed to return a value in milliseconds
rather than in seconds. Reformatted the code. Changed to use UTF8String() instead of ascii(),
since ascii() is not thread safe. Changed some variables back from int to long to avoid
trouble if the result of strtol does not fit in an int (64-bit issue only).
2005-10-08 Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by Geoff.
Tweaked and landed by Darin.
- fixed http://bugs.webkit.org/show_bug.cgi?id=5266
Support parenthesized comments in Date.parse()
* kjs/date_object.cpp:
(KJS::skipSpacesAndComments): Take a pointer, and advance it past spaces,
and also past anything enclosed in parentheses.
(KJS::KRFCDate_parseDate): Use skipSpacesAndComments wherever we formerly had
code to skip spaces.
2005-10-08 Justin Haygood <justin@xiondigital.net>
Reviewed, tweaked, and landed by Darin.
- fixed http://bugs.webkit.org/show_bug.cgi?id=5189
pcre_exec.c fails to compile using MSVC
- fixed http://bugs.webkit.org/show_bug.cgi?id=5190
KJS config.h adjustment for Win32
* kjs/config.h: Make sure HAVE_MMAP and HAVE_SBRK are off for Win32.
Turn HAVE_ERRNO_H on for Mac OS X. Sort defines so they are easy to compare
with each other. Remove #undef of DEBUG_COLLECTOR.
* pcre/pcre_exec.c: (match): Work around strange MSVC complaint by splitting
the definition of a local variable into a separate declaration and
initialization.
2005-10-05 Geoffrey Garen <ggaren@apple.com>
- Darin and I rewrote our implementation of the SimpleNumber class
to store number bit patterns in their floating point formats.
My tweaks reviewed by Darin.
~1% speedup on JS iBench.
* kjs/internal.h: removed obsolete jsNumber declarations.
* kjs/math_object.cpp:
(MathFuncImp::callAsFunction): changed KJS::isNaN to isNaN
* kjs/nodes.cpp:
(PostfixResolveNode::evaluate): removed obsolete knownToBeInteger
(PostfixBracketNode::evaluate): ditto
(PostfixDotNode::evaluate): ditto
(PrefixResolveNode::evaluate): ditto
(PrefixBracketNode::evaluate): ditto
(PrefixDotNode::evaluate): ditto
(NegateNode::evaluate): ditto
(valueForReadModifyAssignment): ditto
* kjs/number_object.cpp: removed obsolete comment
* kjs/operations.cpp:
(KJS::equal): removed unnecessary isNaN checks
(KJS::strictEqual): ditto
(KJS::add): removed obsolete knownToBeInteger
(KJS::mult): ditto
* kjs/operations.h: removed include of "value.h" to prevent circular reference
* kjs/simple_number.h: removed unnecessary #includes
(KJS::SimpleNumber::make): see above
(KJS::SimpleNumber::is): ditto
(KJS::SimpleNumber::value): ditto
* kjs/string_object.cpp:
(StringProtoFuncImp::callAsFunction): changed KJS::isNaN to isNaN
* kjs/ustring.cpp: removed unnecessary isNaN check
(KJS::UString::toUInt32): ditto
* kjs/value.cpp:
(KJS::jsNumber): removed obsolete jsNumber definitions
(KJS::ConstantValues::init): NaN is no longer a ConstantValue
(KJS::ConstantValues::clear): ditto
(KJS::ConstantValues::mark): ditto
* kjs/value.h: removed obsolete knownToBeInteger
(KJS::jsNaN): now returns a SimpleNumber
(KJS::ValueImp::getUInt32): changed to account for NaN being a SimpleNumber
(KJS::ValueImp::toBoolean): ditto
(KJS::ValueImp::toString): changed to account for +/- 0.0
(KJS::jsZero): changed to reflect that SimpleNumber::make takes a double
(KJS::jsOne): ditto
(KJS::jsTwo): ditto
(KJS::Number): removed obsolete non-double constructor declarations
2005-10-05 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- fixed <rdar://problem/4260481> Remove Reference type from JavaScriptCore
Also fixed some bugs with for..in enumeration while I was at it. object
properties now come before prototype properties and duplicates
between object and prototype are listed only once.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/IdentifierSequencedSet.cpp: Added.
(KJS::IdentifierSequencedSet::IdentifierSequencedSet):
(KJS::IdentifierSequencedSet::deallocateVector):
(KJS::IdentifierSequencedSet::~IdentifierSequencedSet):
(KJS::IdentifierSequencedSet::insert):
* kjs/IdentifierSequencedSet.h: Added.
(KJS::IdentifierSequencedSetIterator::IdentifierSequencedSetIterator):
(KJS::IdentifierSequencedSetIterator::operator*):
(KJS::IdentifierSequencedSetIterator::operator->):
(KJS::IdentifierSequencedSetIterator::operator++):
(KJS::IdentifierSequencedSetIterator::operator==):
(KJS::IdentifierSequencedSetIterator::operator!=):
(KJS::IdentifierSequencedSet::begin):
(KJS::IdentifierSequencedSet::end):
(KJS::IdentifierSequencedSet::size):
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::getPropertyNames):
(ArrayInstanceImp::setLength):
(ArrayInstanceImp::pushUndefinedObjectsToEnd):
* kjs/nodes.cpp:
(ForInNode::execute):
* kjs/nodes.h:
* kjs/object.cpp:
(KJS::ObjectImp::getPropertyNames):
* kjs/object.h:
* kjs/property_map.cpp:
(KJS::PropertyMap::getEnumerablePropertyNames):
(KJS::PropertyMap::getSparseArrayPropertyNames):
* kjs/property_map.h:
* kjs/protect.h:
* kjs/protected_reference.h: Removed.
* kjs/reference.cpp: Removed.
* kjs/reference.h: Removed.
* kjs/reference_list.cpp: Removed.
* kjs/reference_list.h: Removed.
* kjs/ustring.h:
(KJS::UString::impl):
* kxmlcore/HashSet.h:
2005-10-04 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
Code cleanup, which resulted in a small win on iBench.
* kjs/object.cpp:
(KJS::tryGetAndCallProperty): new static inline
(KJS::ObjectImp::defaultValue): code cleanup
2005-10-03 Maciej Stachowiak <mjs@apple.com>
Patch from George Staikos <staikos@kde.org>, reviewed and tweaked a bit by me.
- more Linux build fixes
* kjs/operations.cpp:
* kxmlcore/FastMalloc.h:
* kxmlcore/TCSystemAlloc.cpp:
(TCMalloc_SystemAlloc):
2005-10-03 Maciej Stachowiak <mjs@apple.com>
Patch from George Staikos <staikos@kde.org>, reviewed and tweaked a bit by me.
http://bugs.webkit.org/show_bug.cgi?id=5174
Add support for compiling on Linux (likely to help for other POSIX systems too)
* kjs/collector.cpp:
(KJS::Collector::markCurrentThreadConservatively):
(KJS::Collector::markOtherThreadConservatively):
* kjs/config.h:
* kjs/date_object.cpp:
(KJS::formatDate):
(KJS::formatDateUTCVariant):
(KJS::formatTime):
(KJS::timeZoneOffset):
(KJS::DateProtoFuncImp::callAsFunction):
(KJS::DateObjectImp::construct):
(KJS::DateObjectImp::callAsFunction):
(KJS::makeTime):
* kjs/identifier.cpp:
* kjs/internal.cpp:
(KJS::initializeInterpreterLock):
(KJS::lockInterpreter):
(KJS::unlockInterpreter):
(KJS::UndefinedImp::toPrimitive):
(KJS::UndefinedImp::toBoolean):
(KJS::UndefinedImp::toNumber):
(KJS::UndefinedImp::toString):
(KJS::NullImp::toPrimitive):
(KJS::NullImp::toBoolean):
(KJS::NullImp::toNumber):
(KJS::NullImp::toString):
(KJS::BooleanImp::toPrimitive):
(KJS::BooleanImp::toBoolean):
(KJS::BooleanImp::toNumber):
(KJS::BooleanImp::toString):
(KJS::StringImp::toPrimitive):
(KJS::StringImp::toBoolean):
(KJS::StringImp::toNumber):
(KJS::StringImp::toString):
* kjs/internal.h:
* kjs/protected_values.cpp:
2005-10-03 Maciej Stachowiak <mjs@apple.com>
- fix Development build after last checkin
* kxmlcore/FastMalloc.cpp:
(KXMLCore::fastMallocRegisterThread):
2005-10-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
<rdar://problem/4283967> REGRESSION: 3% regression on PLT from new FastMalloc
http://bugs.webkit.org/show_bug.cgi?id=5243
A number of optimizations to the new threadsafe malloc that make it actually as fast
as dlmalloc (I measured wrong before) and as memory-efficient as the system malloc.
- use fastMalloc for everything - it now gets applied to all new/delete allocations
via a private inline operator new that is now included into every file via config.h.
- tweaked some of the numeric parameters for size classes and amount of wasted memory
allowed per allocation - this saves on memory use and consequently improves speed.
- so long as the allocator is not being used on background threads, get the per-thread
cache from a global variable instead of from pthread_getspecific, since the latter is slow.
- inline more functions, and force the ones GCC refuses to inline with
attribute(always_inline), nearly all of these have one call site so inlining them has
to be a win.
- use some tricks to calculate allocation size more efficiently and fewer times for small
allocations, to avoid hitting the huge size table array.
- avoid hitting the per-thread cache on code paths that don't need it.
- implement inline assembly version of spinlock for PowerPC (was already done for x86)
* bindings/NP_jsobject.cpp:
* bindings/c/c_class.cpp:
* bindings/c/c_instance.cpp:
* bindings/c/c_runtime.cpp:
* bindings/c/c_utility.cpp:
* bindings/jni/jni_class.cpp:
* bindings/jni/jni_instance.cpp:
* bindings/jni/jni_jsobject.cpp:
* bindings/jni/jni_objc.mm:
* bindings/jni/jni_runtime.cpp:
* bindings/jni/jni_utility.cpp:
* bindings/npruntime.cpp:
* bindings/objc/WebScriptObject.mm:
* bindings/objc/objc_class.mm:
* bindings/objc/objc_instance.mm:
* bindings/objc/objc_runtime.mm:
* bindings/objc/objc_utility.mm:
* bindings/runtime.cpp:
* bindings/runtime_array.cpp:
* bindings/runtime_method.cpp:
* bindings/runtime_object.cpp:
* bindings/runtime_root.cpp:
* bindings/testbindings.cpp:
* bindings/testbindings.mm:
* kjs/array_object.cpp:
(ArrayInstanceImp::ArrayInstanceImp):
(ArrayInstanceImp::~ArrayInstanceImp):
(ArrayInstanceImp::resizeStorage):
* kjs/bool_object.cpp:
* kjs/collector.cpp:
(KJS::Collector::registerThread):
* kjs/config.h:
* kjs/debugger.cpp:
* kjs/error_object.cpp:
* kjs/function.cpp:
* kjs/function_object.cpp:
* kjs/identifier.cpp:
(KJS::Identifier::rehash):
* kjs/internal.cpp:
(KJS::Parser::saveNewNode):
(KJS::clearNewNodes):
* kjs/interpreter.cpp:
* kjs/lexer.cpp:
(Lexer::doneParsing):
(Lexer::makeIdentifier):
(Lexer::makeUString):
* kjs/list.cpp:
* kjs/math_object.cpp:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/nodes2string.cpp:
* kjs/number_object.cpp:
(integer_part_noexp):
(char_sequence):
* kjs/object.cpp:
* kjs/object_object.cpp:
* kjs/property_map.cpp:
* kjs/property_slot.cpp:
* kjs/protected_values.cpp:
(KJS::ProtectedValues::rehash):
* kjs/reference.cpp:
* kjs/reference_list.cpp:
* kjs/regexp.cpp:
* kjs/regexp_object.cpp:
* kjs/scope_chain.cpp:
* kjs/scope_chain.h:
* kjs/string_object.cpp:
* kjs/testkjs.cpp:
* kjs/ustring.h:
* kjs/value.cpp:
* kxmlcore/Assertions.mm:
* kxmlcore/FastMalloc.cpp:
(KXMLCore::InitSizeClasses):
(KXMLCore::DLL_IsEmpty):
(KXMLCore::DLL_Prepend):
(KXMLCore::TCMalloc_Central_FreeList::Insert):
(KXMLCore::TCMalloc_Central_FreeList::Remove):
(KXMLCore::TCMalloc_Central_FreeList::Populate):
(KXMLCore::TCMalloc_ThreadCache::Allocate):
(KXMLCore::TCMalloc_ThreadCache::FetchFromCentralCache):
(KXMLCore::fastMallocRegisterThread):
(KXMLCore::TCMalloc_ThreadCache::GetCache):
(KXMLCore::TCMalloc_ThreadCache::GetCacheIfPresent):
(KXMLCore::TCMalloc_ThreadCache::CreateCacheIfNecessary):
(KXMLCore::do_malloc):
(KXMLCore::do_free):
(KXMLCore::realloc):
* kxmlcore/FastMalloc.h:
(operator new):
(operator delete):
(operator new[]):
(operator delete[]):
* kxmlcore/HashTable.cpp:
* kxmlcore/TCSpinLock.h:
(TCMalloc_SpinLock::Lock):
(TCMalloc_SpinLock::Unlock):
(TCMalloc_SlowLock):
* kxmlcore/TCSystemAlloc.cpp:
2005-09-30 Geoffrey Garen <ggaren@apple.com>
- Second cut at fixing <rdar://problem/4275206> Denver Regression: Seed:
Past Editions of Opinions display "NAN/Undefined" for www.washingtonpost.com
Reviewed by john.
* kjs/date_object.cpp:
(KJS::KRFCDate_parseDate): Intead of creating a timezone when one isn't specified,
just rely on the fallback logic, which will do it for you. Also, return invalidDate
if the date includes trailing garbage. (Somewhat accidentally, the timezone logic
used to catch trailing garbage.)
Added test case to fast/js/date-parse-test.html.
2005-09-29 Eric Seidel <eseidel@apple.com>
Fix from Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by darin.
Fix JSC memory smasher in TOT.
http://bugs.webkit.org/show_bug.cgi?id=5176
* pcre/pcre_exec.c:
(match):
2005-09-29 Eric Seidel <eseidel@apple.com>
Fix from Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by mjs.
* JavaScriptCore.xcodeproj/project.pbxproj:
Build fix for JSC+SVG after 5161.
http://bugs.webkit.org/show_bug.cgi?id=5179
2005-09-28 Geoffrey Garen <ggaren@apple.com>
- Fixed <rdar://problem/4275206> Denver Regression: Seed: Past Editions of Opinions display
"NAN/Undefined" for www.washingtonpost.com
Reviewed by darin.
* kjs/date_object.cpp:
(KJS::KRFCDate_parseDate): If the timezone isn't specified, rather than returning
invalidDate, substitute the local timezone. This matches the behavior of FF/IE.
2005-09-28 Maciej Stachowiak <mjs@apple.com>
Patch from George Staikos, reviewed by me.
- fixed some compile issues on Linux
* kjs/property_slot.h:
* kjs/simple_number.h:
2005-09-27 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- move HashMap/HashSet code down to JavaScriptCore
http://bugs.webkit.org/show_bug.cgi?id=5161
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/internal.cpp:
(KJS::interpreterMap): Function that fetches the interpreter map on demand.
(KJS::InterpreterImp::InterpreterImp): Replace use of InterpreterMap
class with an appropriate HashMap.
(KJS::InterpreterImp::clear): ditto
(KJS::InterpreterImp::interpreterWithGlobalObject): ditto
* kjs/interpreter_map.cpp: Removed.
* kjs/interpreter_map.h: Removed.
The HashMap/HashSet code (copied and slightly tweaked from WebCore)
* kxmlcore/HashFunctions.h: Added.
(KXMLCore::4):
(KXMLCore::8):
(KXMLCore::):
(KXMLCore::PointerHash::hash):
(KXMLCore::PointerHash::equal):
* kxmlcore/HashMap.h: Added.
(KXMLCore::extractFirst):
(KXMLCore::HashMap::HashMap):
(KXMLCore::::size):
(KXMLCore::::capacity):
(KXMLCore::::isEmpty):
(KXMLCore::::begin):
(KXMLCore::::end):
(KXMLCore::::find):
(KXMLCore::::contains):
(KXMLCore::::set):
(KXMLCore::::get):
(KXMLCore::::remove):
(KXMLCore::::clear):
(KXMLCore::deleteAllValues):
* kxmlcore/HashMapPtrSpec.h: Added.
(KXMLCore::PointerHashIteratorAdapter::PointerHashIteratorAdapter):
(KXMLCore::PointerHashIteratorAdapter::operator*):
(KXMLCore::PointerHashIteratorAdapter::operator->):
(KXMLCore::PointerHashIteratorAdapter::operator++):
(KXMLCore::PointerHashIteratorAdapter::operator==):
(KXMLCore::PointerHashIteratorAdapter::operator!=):
(KXMLCore::PointerHashConstIteratorAdapter::PointerHashConstIteratorAdapter):
(KXMLCore::PointerHashConstIteratorAdapter::operator*):
(KXMLCore::PointerHashConstIteratorAdapter::operator->):
(KXMLCore::PointerHashConstIteratorAdapter::operator++):
(KXMLCore::PointerHashConstIteratorAdapter::operator==):
(KXMLCore::PointerHashConstIteratorAdapter::operator!=):
(KXMLCore::):
* kxmlcore/HashSet.h: Added.
(KXMLCore::identityExtract):
(KXMLCore::convertAdapter):
(KXMLCore::HashSet::HashSet):
(KXMLCore::::size):
(KXMLCore::::capacity):
(KXMLCore::::isEmpty):
(KXMLCore::::begin):
(KXMLCore::::end):
(KXMLCore::::find):
(KXMLCore::::contains):
(KXMLCore::::insert):
(KXMLCore::::remove):
(KXMLCore::::clear):
* kxmlcore/HashTable.cpp: Added.
(KXMLCore::HashTableStats::~HashTableStats):
(KXMLCore::HashTableStats::recordCollisionAtCount):
* kxmlcore/HashTable.h: Added.
(KXMLCore::HashTableIterator::skipEmptyBuckets):
(KXMLCore::HashTableIterator::HashTableIterator):
(KXMLCore::HashTableIterator::operator*):
(KXMLCore::HashTableIterator::operator->):
(KXMLCore::HashTableIterator::operator++):
(KXMLCore::HashTableIterator::operator==):
(KXMLCore::HashTableIterator::operator!=):
(KXMLCore::HashTableConstIterator::HashTableConstIterator):
(KXMLCore::HashTableConstIterator::operator*):
(KXMLCore::HashTableConstIterator::operator->):
(KXMLCore::HashTableConstIterator::skipEmptyBuckets):
(KXMLCore::HashTableConstIterator::operator++):
(KXMLCore::HashTableConstIterator::operator==):
(KXMLCore::HashTableConstIterator::operator!=):
(KXMLCore::HashTable::HashTable):
(KXMLCore::HashTable::~HashTable):
(KXMLCore::HashTable::begin):
(KXMLCore::HashTable::end):
(KXMLCore::HashTable::size):
(KXMLCore::HashTable::capacity):
(KXMLCore::HashTable::insert):
(KXMLCore::HashTable::isEmptyBucket):
(KXMLCore::HashTable::isDeletedBucket):
(KXMLCore::HashTable::isEmptyOrDeletedBucket):
(KXMLCore::HashTable::hash):
(KXMLCore::HashTable::equal):
(KXMLCore::HashTable::identityConvert):
(KXMLCore::HashTable::extractKey):
(KXMLCore::HashTable::lookup):
(KXMLCore::HashTable::shouldExpand):
(KXMLCore::HashTable::mustRehashInPlace):
(KXMLCore::HashTable::shouldShrink):
(KXMLCore::HashTable::shrink):
(KXMLCore::HashTable::clearBucket):
(KXMLCore::HashTable::deleteBucket):
(KXMLCore::HashTable::makeLookupResult):
(KXMLCore::HashTable::makeIterator):
(KXMLCore::HashTable::makeConstIterator):
(KXMLCore::::lookup):
(KXMLCore::::insert):
(KXMLCore::::reinsert):
(KXMLCore::::find):
(KXMLCore::::contains):
(KXMLCore::::remove):
(KXMLCore::::allocateTable):
(KXMLCore::::expand):
(KXMLCore::::rehash):
(KXMLCore::::clear):
(KXMLCore::::HashTable):
(KXMLCore::::swap):
(KXMLCore::::operator):
(KXMLCore::::checkTableConsistency):
(KXMLCore::::checkTableConsistencyExceptSize):
* kxmlcore/HashTraits.h: Added.
(KXMLCore::HashTraits::emptyValue):
(KXMLCore::):
(KXMLCore::PairHashTraits::emptyValue):
(KXMLCore::PairHashTraits::deletedValue):
2005-09-27 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- update grammar to fix conflicts; fixes one of our test cases
because it resolves the relationship between function expressions
and declarations in the way required by the ECMA specification
* kjs/grammar.y: Added lots of new grammar rules so we have no conflicts.
A new set of rules for "no bracket or function at start of expression" and
another set of rules for "no in anywhere in expression". Also simplified the
handling of try to use only a single node and used operator precedence to
get rid of the conflict in handling of if and else. Also used a macro to
streamline the handling of automatic semicolons and changed parenthesis
handling to use a virtual function.
* kjs/nodes.h: Added nodeInsideAllParens, removed unused abortStatement.
(KJS::TryNode::TryNode): Updated to hold catch and finally blocks directly instead
of using a special node for each.
* kjs/nodes.cpp:
(Node::createErrorCompletion): Added. Used instead of throwError when creating errors
that should not be in a completion rather than an ExecState.
(Node::throwUndefinedVariableError): Added. Sets source location unlike the call it
replaces.
(Node::nodeInsideAllParens): Added.
(GroupNode::nodeInsideAllParens): Added.
(StatListNode::execute): Removed code to move exceptions into completion objects;
that's now done solely by the KJS_CHECKEXCEPTION macro.
(TryNode::execute): Include execution of catch and finally here rather than using
separate nodes.
(FuncDeclNode::execute): Moved here, no longer inline.
* kjs/nodes2string.cpp:
(TryNode::streamTo): Updated for change.
(FuncDeclNode::streamTo): Ditto.
(FuncExprNode::streamTo): Ditto.
* kjs/kjs-test: Removed. Was part of "make check".
* kjs/kjs-test.chk: Ditto.
* kjs/test.js: Ditto.
* tests/mozilla/expected.html: Updated because one more test succeeds.
2005-09-27 Adele Peterson <adele@apple.com>
Reviewed by Maciej.
Changed ints to size_t where appropriate.
* kjs/collector.cpp:
(KJS::Collector::allocate):
(KJS::Collector::markStackObjectsConservatively):
(KJS::Collector::collect):
(KJS::Collector::size):
(KJS::Collector::numInterpreters):
(KJS::Collector::numGCNotAllowedObjects):
(KJS::Collector::numReferencedObjects):
* kjs/collector.h:
2005-09-27 Eric Seidel <eseidel@apple.com>
Reviewed by kevin.
* JavaScriptCore.xcodeproj/project.pbxproj: fix after malloc changes.
2005-09-27 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
* kjs/nodes.cpp:
(FuncExprNode::evaluate): Now sets .constructor properly.
Test cases added to WebCore/layout-tests.
http://bugs.webkit.org/show_bug.cgi?id=3537
2005-09-26 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
- replace dlmalloc with tcmalloc
http://bugs.webkit.org/show_bug.cgi?id=5145
I also moved SharedPtr and the assertion code from WebCore into a
new kxmlcore directory.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/collector.cpp:
(KJS::Collector::allocate):
(KJS::Collector::collect):
* kjs/config.h:
* kjs/fast_malloc.cpp: Removed.
* kjs/fast_malloc.h: Removed.
* kjs/function.cpp:
* kjs/function.h:
* kjs/function_object.cpp:
* kjs/identifier.cpp:
(KJS::Identifier::add):
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/nodes.h:
* kjs/nodes2string.cpp:
* kjs/property_map.cpp:
(KJS::PropertyMap::~PropertyMap):
(KJS::PropertyMap::rehash):
* kjs/scope_chain.h:
* kjs/shared_ptr.h: Removed.
* kjs/string_object.cpp:
(StringObjectFuncImp::callAsFunction):
* kjs/ustring.cpp:
(KJS::UString::Rep::createCopying):
(KJS::UString::Rep::destroy):
(KJS::UString::expandCapacity):
(KJS::UString::expandPreCapacity):
(KJS::UString::UString):
(KJS::UString::spliceSubstringsWithSeparators):
(KJS::UString::append):
(KJS::UString::operator=):
(KJS::UString::detach):
* kjs/ustring.h:
* kxmlcore/Assertions.h: Added.
* kxmlcore/Assertions.mm: Added.
* kxmlcore/FastMalloc.cpp: Added.
(KXMLCore::LgFloor):
(KXMLCore::SizeClass):
(KXMLCore::ByteSizeForClass):
(KXMLCore::InitSizeClasses):
(KXMLCore::MetaDataAlloc):
(KXMLCore::PageHeapAllocator::Init):
(KXMLCore::PageHeapAllocator::New):
(KXMLCore::PageHeapAllocator::Delete):
(KXMLCore::PageHeapAllocator::inuse):
(KXMLCore::pages):
(KXMLCore::AllocationSize):
(KXMLCore::Event):
(KXMLCore::NewSpan):
(KXMLCore::DeleteSpan):
(KXMLCore::DLL_Init):
(KXMLCore::DLL_Remove):
(KXMLCore::DLL_IsEmpty):
(KXMLCore::DLL_Length):
(KXMLCore::DLL_Print):
(KXMLCore::DLL_Prepend):
(KXMLCore::DLL_InsertOrdered):
(KXMLCore::):
(KXMLCore::TCMalloc_PageHeap::GetDescriptor):
(KXMLCore::TCMalloc_PageHeap::SystemBytes):
(KXMLCore::TCMalloc_PageHeap::FreeBytes):
(KXMLCore::TCMalloc_PageHeap::RecordSpan):
(KXMLCore::TCMalloc_PageHeap::TCMalloc_PageHeap):
(KXMLCore::TCMalloc_PageHeap::New):
(KXMLCore::TCMalloc_PageHeap::Split):
(KXMLCore::TCMalloc_PageHeap::Carve):
(KXMLCore::TCMalloc_PageHeap::Delete):
(KXMLCore::TCMalloc_PageHeap::RegisterSizeClass):
(KXMLCore::TCMalloc_PageHeap::Dump):
(KXMLCore::TCMalloc_PageHeap::GrowHeap):
(KXMLCore::TCMalloc_PageHeap::Check):
(KXMLCore::TCMalloc_PageHeap::CheckList):
(KXMLCore::TCMalloc_ThreadCache_FreeList::Init):
(KXMLCore::TCMalloc_ThreadCache_FreeList::length):
(KXMLCore::TCMalloc_ThreadCache_FreeList::empty):
(KXMLCore::TCMalloc_ThreadCache_FreeList::lowwatermark):
(KXMLCore::TCMalloc_ThreadCache_FreeList::clear_lowwatermark):
(KXMLCore::TCMalloc_ThreadCache_FreeList::Push):
(KXMLCore::TCMalloc_ThreadCache_FreeList::Pop):
(KXMLCore::TCMalloc_ThreadCache::freelist_length):
(KXMLCore::TCMalloc_ThreadCache::Size):
(KXMLCore::TCMalloc_Central_FreeList::length):
(KXMLCore::TCMalloc_Central_FreeList::Init):
(KXMLCore::TCMalloc_Central_FreeList::Insert):
(KXMLCore::TCMalloc_Central_FreeList::Remove):
(KXMLCore::TCMalloc_Central_FreeList::Populate):
(KXMLCore::TCMalloc_ThreadCache::SampleAllocation):
(KXMLCore::TCMalloc_ThreadCache::Init):
(KXMLCore::TCMalloc_ThreadCache::Cleanup):
(KXMLCore::TCMalloc_ThreadCache::Allocate):
(KXMLCore::TCMalloc_ThreadCache::Deallocate):
(KXMLCore::TCMalloc_ThreadCache::FetchFromCentralCache):
(KXMLCore::TCMalloc_ThreadCache::ReleaseToCentralCache):
(KXMLCore::TCMalloc_ThreadCache::Scavenge):
(KXMLCore::TCMalloc_ThreadCache::GetCache):
(KXMLCore::TCMalloc_ThreadCache::GetCacheIfPresent):
(KXMLCore::TCMalloc_ThreadCache::PickNextSample):
(KXMLCore::TCMalloc_ThreadCache::InitModule):
(KXMLCore::TCMalloc_ThreadCache::InitTSD):
(KXMLCore::TCMalloc_ThreadCache::CreateCacheIfNecessary):
(KXMLCore::TCMalloc_ThreadCache::DeleteCache):
(KXMLCore::TCMalloc_ThreadCache::RecomputeThreadCacheSize):
(KXMLCore::TCMalloc_ThreadCache::Print):
(KXMLCore::ExtractStats):
(KXMLCore::DumpStats):
(KXMLCore::PrintStats):
(KXMLCore::DumpStackTraces):
(KXMLCore::TCMallocImplementation::GetStats):
(KXMLCore::TCMallocImplementation::ReadStackTraces):
(KXMLCore::TCMallocImplementation::GetNumericProperty):
(KXMLCore::TCMallocImplementation::SetNumericProperty):
(KXMLCore::DoSampledAllocation):
(KXMLCore::do_malloc):
(KXMLCore::do_free):
(KXMLCore::do_memalign):
(KXMLCore::TCMallocGuard::TCMallocGuard):
(KXMLCore::TCMallocGuard::~TCMallocGuard):
(KXMLCore::malloc):
(KXMLCore::free):
(KXMLCore::calloc):
(KXMLCore::cfree):
(KXMLCore::realloc):
(KXMLCore::memalign):
(KXMLCore::posix_memalign):
(KXMLCore::valloc):
(KXMLCore::pvalloc):
(KXMLCore::malloc_stats):
(KXMLCore::mallopt):
(KXMLCore::mallinfo):
* kxmlcore/FastMalloc.h: Added.
(KXMLCore::FastAllocated::operator new):
(KXMLCore::FastAllocated::operator delete):
(KXMLCore::FastAllocated::operator new[]):
(KXMLCore::FastAllocated::operator delete[]):
* kxmlcore/SharedPtr.h: Added.
(KXMLCore::SharedPtr::SharedPtr):
(KXMLCore::SharedPtr::~SharedPtr):
(KXMLCore::SharedPtr::isNull):
(KXMLCore::SharedPtr::notNull):
(KXMLCore::SharedPtr::reset):
(KXMLCore::SharedPtr::get):
(KXMLCore::SharedPtr::operator*):
(KXMLCore::SharedPtr::operator->):
(KXMLCore::SharedPtr::operator!):
(KXMLCore::SharedPtr::operator bool):
(KXMLCore::::operator):
(KXMLCore::operator==):
(KXMLCore::operator!=):
(KXMLCore::static_pointer_cast):
(KXMLCore::const_pointer_cast):
* kxmlcore/TCPageMap.h: Added.
(TCMalloc_PageMap1::TCMalloc_PageMap1):
(TCMalloc_PageMap1::Ensure):
(TCMalloc_PageMap1::get):
(TCMalloc_PageMap1::set):
(TCMalloc_PageMap2::TCMalloc_PageMap2):
(TCMalloc_PageMap2::get):
(TCMalloc_PageMap2::set):
(TCMalloc_PageMap2::Ensure):
(TCMalloc_PageMap3::NewNode):
(TCMalloc_PageMap3::TCMalloc_PageMap3):
(TCMalloc_PageMap3::get):
(TCMalloc_PageMap3::set):
(TCMalloc_PageMap3::Ensure):
* kxmlcore/TCSpinLock.h: Added.
(TCMalloc_SpinLock::Init):
(TCMalloc_SpinLock::Finalize):
(TCMalloc_SpinLock::Lock):
(TCMalloc_SpinLock::Unlock):
(TCMalloc_SlowLock):
(TCMalloc_SpinLockHolder::TCMalloc_SpinLockHolder):
(TCMalloc_SpinLockHolder::~TCMalloc_SpinLockHolder):
* kxmlcore/TCSystemAlloc.cpp: Added.
(TrySbrk):
(TryMmap):
(TryDevMem):
(TCMalloc_SystemAlloc):
* kxmlcore/TCSystemAlloc.h: Added.
2005-09-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
<rdar://problem/4260479> Finish deploying PropertySlot in the interpreter
http://bugs.webkit.org/show_bug.cgi?id=5112
Convert postfix, prefix, delete, prefix, and for..in expressions to use
PropertySlot-based lookup instead of evaluateReference.
3% speedup on JS iBench.
Fixed two of the JS tests:
* tests/mozilla/expected.html:
* kjs/grammar.y:
* kjs/nodes.cpp:
(PostfixResolveNode::evaluate):
(PostfixBracketNode::evaluate):
(PostfixDotNode::evaluate):
(DeleteResolveNode::evaluate):
(DeleteBracketNode::evaluate):
(DeleteDotNode::evaluate):
(DeleteValueNode::evaluate):
(typeStringForValue):
(TypeOfResolveNode::evaluate):
(TypeOfValueNode::evaluate):
(PrefixResolveNode::evaluate):
(PrefixBracketNode::evaluate):
(PrefixDotNode::evaluate):
(ForInNode::execute):
* kjs/nodes.h:
(KJS::PostfixResolveNode::PostfixResolveNode):
(KJS::PostfixBracketNode::PostfixBracketNode):
(KJS::PostfixDotNode::PostfixDotNode):
(KJS::DeleteResolveNode::DeleteResolveNode):
(KJS::DeleteBracketNode::DeleteBracketNode):
(KJS::DeleteDotNode::DeleteDotNode):
(KJS::DeleteValueNode::DeleteValueNode):
(KJS::TypeOfResolveNode::TypeOfResolveNode):
(KJS::TypeOfValueNode::TypeOfValueNode):
(KJS::PrefixResolveNode::PrefixResolveNode):
(KJS::PrefixBracketNode::PrefixBracketNode):
(KJS::PrefixDotNode::PrefixDotNode):
* kjs/nodes2string.cpp:
(PostfixResolveNode::streamTo):
(PostfixBracketNode::streamTo):
(PostfixDotNode::streamTo):
(DeleteResolveNode::streamTo):
(DeleteBracketNode::streamTo):
(DeleteDotNode::streamTo):
(DeleteValueNode::streamTo):
(TypeOfValueNode::streamTo):
(TypeOfResolveNode::streamTo):
(PrefixResolveNode::streamTo):
(PrefixBracketNode::streamTo):
(PrefixDotNode::streamTo):
* kjs/reference.cpp:
(KJS::Reference::Reference):
(KJS::Reference::getPropertyName):
(KJS::Reference::getValue):
(KJS::Reference::deleteValue):
* kjs/reference.h:
2005-09-23 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed and landed by Darin.
- a Windows-specific file
* os-win32/stdint.h: Added. We plan to remove dependency on the <stdint.h> types,
and if we do so, we will remove this file.
2005-09-22 Geoffrey Garen <ggaren@apple.com>
- Fixed http://bugs.webkit.org/show_bug.cgi?id=5053
Need to restore int/long changes to simple_number.h
Reviewed by darin and mjs.
* kjs/simple_number.h: changed enums to indenpendent constants to clarify types
(KJS::isNegativeZero): changed to static function - no reason to export
(KJS::SimpleNumber::rightShiftSignExtended): new function for clarity
(KJS::SimpleNumber::make): specified cast as reinterpret_cast
(KJS::SimpleNumber::is): changed to use uintptr_t for portability
(KJS::SimpleNumber::value): changed to use uintptr_t and rightShiftSignExtended
(KJS::SimpleNumber::fits): inverted tests - probably only a performance win for double
(KJS::SimpleNumber::integerFits): ditto
2005-09-20 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff and partly by Darin.
- fixed http://bugs.webkit.org/post_bug.cgi
(Reduce conflicts in JavaScriptCore grammar)
This change gets us down from over 200 shift/reduce and 45 reduce/reduce to
9 shift/reduce and 45 reduce/reduce.
* kjs/grammar.y:
* kjs/grammar_types.h: Removed.
* kjs/lexer.cpp:
* kjs/nodes.h:
(KJS::Node::isGroupNode):
(KJS::Node::isLocation):
(KJS::Node::isResolveNode):
(KJS::Node::isBracketAccessorNode):
(KJS::Node::isDotAccessorNode):
(KJS::ResolveNode::isLocation):
(KJS::ResolveNode::isResolveNode):
(KJS::ResolveNode::identifier):
(KJS::GroupNode::isGroupNode):
(KJS::GroupNode::leafNode):
(KJS::BracketAccessorNode::isLocation):
(KJS::BracketAccessorNode::isBracketAccessorNode):
(KJS::BracketAccessorNode::base):
(KJS::BracketAccessorNode::subscript):
(KJS::DotAccessorNode::isLocation):
(KJS::DotAccessorNode::isDotAccessorNode):
(KJS::DotAccessorNode::base):
(KJS::DotAccessorNode::identifier):
(KJS::FuncExprNode::FuncExprNode):
(KJS::FuncExprNode::identifier):
(KJS::FuncDeclNode::FuncDeclNode):
(KJS::FuncDeclNode::execute):
2005-09-20 Geoffrey Garen <ggaren@apple.com>
- Oops. The 4263434 change was only appropriate on the branch. Rolling out.
Reviewed by eric.
* kjs/internal.cpp:
(KJS::InterpreterImp::mark):
2005-09-20 Geoffrey Garen <ggaren@apple.com>
- More changes needed to fix <rdar://problem/4214783> 8F29 REGRESSION(Denver/Chardonnay):
kjs_fast_malloc crash due to lack of locking on multiple threads (seen selecting volumes in
the installer)
Added InterpreterLocks in some places in the bindings we missed before.
Reviewed by john.
* bindings/runtime_root.cpp:
(KJS::Bindings::addNativeReference):
(KJS::Bindings::removeNativeReference):
(RootObject::removeAllNativeReferences):
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::~RootObject):
(KJS::Bindings::RootObject::setRootObjectImp):
2005-09-20 Geoffrey Garen <ggaren@apple.com>
- Fixed <rdar://problem/4263434> <rdar://problem/4263434> Denver 8F29 Regression:
KJS::InterpreterImp::mark() crash
Fix by mjs, review by me.
* kjs/internal.cpp:
(KJS::InterpreterImp::mark): Added a null check on globExec in case a
garbage collection occurs inside InterpreterImp::globalInit (called
from InterpreterImp::InterpreterImp), at which point globExec has not yet been initialized.
2005-09-20 Geoffrey Garen <ggaren@apple.com>
- Rolled in fix for http://bugs.webkit.org/show_bug.cgi?id=4892
Date constructor has problems with months larger than 11
Test cases added:
* layout-tests/fast/js/date-big-constructor-expected.txt: Added.
* layout-tests/fast/js/date-big-constructor.html: Added.
Reviewed by darin.
* kjs/date_object.cpp:
(KJS::fillStructuresUsingDateArgs):
(KJS::makeTime):
2005-09-19 Geoffrey Garen <ggaren@apple.com>
- Fixed http://bugs.webkit.org/show_bug.cgi?id=5028
9 layout tests fail following the change from long to int
- Rolled out changes to simple_number.h, and added fits(long long)
and SimpleNumber::fits(unsigned long long) to the old system.
Reviewed by mjs.
* kjs/simple_number.h:
(KJS::SimpleNumber::):
(KJS::SimpleNumber::value):
(KJS::SimpleNumber::fits):
(KJS::SimpleNumber::integerFits):
(KJS::SimpleNumber::make):
2005-09-14 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
- fixed <rdar://problem/4214783> REGRESSION: kjs_fast_malloc crash due to lack of locking on multiple threads (seen selecting volumes in the installer)
Make sure to lock using the InterpreterLock class in all places that need it
(including anything that uses the collector, the parser, the protect count hash table,
and anything that allocates via fast_malloc).
Also added assertions to ensure that the locking rules are followed for the relevant
resources.
* Makefile.am:
* bindings/NP_jsobject.cpp:
(identifierFromNPIdentifier):
(_NPN_Invoke):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_RemoveProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
(_NPN_SetException):
* bindings/jni/jni_jsobject.cpp:
(JSObject::call):
(JSObject::eval):
(JSObject::getMember):
(JSObject::setMember):
(JSObject::removeMember):
(JSObject::getSlot):
(JSObject::setSlot):
(JSObject::toString):
(JSObject::convertJObjectToValue):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject stringRepresentation]):
(-[WebScriptObject webScriptValueAtIndex:]):
(-[WebScriptObject setWebScriptValueAtIndex:value:]):
(+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
* bindings/runtime.cpp:
(Instance::createRuntimeObject):
* bindings/runtime_root.h:
* bindings/testbindings.cpp:
(main):
* bindings/testbindings.mm:
(main):
* kjs/fast_malloc.cpp:
(KJS::kjs_fast_malloc):
(KJS::kjs_fast_calloc):
(KJS::kjs_fast_free):
(KJS::kjs_fast_realloc):
* kjs/fast_malloc.h:
* kjs/identifier.h:
* kjs/internal.cpp:
(InterpreterImp::InterpreterImp):
(InterpreterImp::clear):
(InterpreterImp::mark):
(InterpreterImp::checkSyntax):
(InterpreterImp::evaluate):
* kjs/internal.h:
(KJS::InterpreterImp::globalObject):
* kjs/interpreter.cpp:
(Interpreter::evaluate):
* kjs/interpreter.h:
(KJS::InterpreterLock::InterpreterLock):
(KJS::InterpreterLock::~InterpreterLock):
* kjs/nodes.h:
* kjs/protect.h:
(KJS::ProtectedValue::ProtectedValue):
(KJS::ProtectedValue::~ProtectedValue):
(KJS::ProtectedValue::operator=):
(KJS::ProtectedObject::ProtectedObject):
(KJS::ProtectedObject::~ProtectedObject):
(KJS::ProtectedObject::operator=):
(KJS::ProtectedReference::ProtectedReference):
(KJS::ProtectedReference::~ProtectedReference):
(KJS::ProtectedReference::operator=):
* kjs/protected_object.h:
* kjs/protected_values.cpp:
(KJS::ProtectedValues::getProtectCount):
(KJS::ProtectedValues::increaseProtectCount):
(KJS::ProtectedValues::decreaseProtectCount):
* kjs/string_object.cpp:
(StringObjectImp::StringObjectImp):
* kjs/testkjs.cpp:
(main):
2005-09-16 Adele Peterson <adele@apple.com>
Change by Darin, reviewed by me and Maciej.
Fixes http://bugs.webkit.org/show_bug.cgi?id=4547
use int instead of long for 32-bit (to prepare for LP64 compiling)
* bindings/c/c_class.h:
(KJS::Bindings::CClass::constructorAt):
(KJS::Bindings::CClass::numConstructors):
* bindings/c/c_runtime.h:
(KJS::Bindings::CMethod::numParameters):
* bindings/jni/jni_class.cpp:
(JavaClass::JavaClass):
* bindings/jni/jni_class.h:
(KJS::Bindings::JavaClass::constructorAt):
(KJS::Bindings::JavaClass::numConstructors):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_jsobject.cpp:
(JSObject::convertJObjectToValue):
(JSObject::listFromJArray):
* bindings/jni/jni_runtime.cpp:
(JavaMethod::JavaMethod):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaConstructor::_commonCopy):
(KJS::Bindings::JavaConstructor::parameterAt):
(KJS::Bindings::JavaConstructor::numParameters):
(KJS::Bindings::JavaMethod::_commonCopy):
(KJS::Bindings::JavaMethod::parameterAt):
(KJS::Bindings::JavaMethod::numParameters):
* bindings/npapi.h:
* bindings/objc/WebScriptObject.mm:
(listFromNSArray):
* bindings/objc/objc_class.h:
(KJS::Bindings::ObjcClass::constructorAt):
(KJS::Bindings::ObjcClass::numConstructors):
* bindings/objc/objc_instance.h:
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcMethod::numParameters):
* bindings/runtime.h:
* kjs/identifier.h:
* kjs/internal.h:
* kjs/property_slot.h:
(KJS::PropertySlot::setCustomIndex):
(KJS::PropertySlot::index):
(KJS::PropertySlot::):
* kjs/regexp_object.cpp:
(RegExpObjectImp::backrefGetter):
(RegExpObjectImp::getOwnPropertySlot):
* kjs/simple_number.h:
(KJS::SimpleNumber::):
(KJS::SimpleNumber::value):
(KJS::SimpleNumber::fits):
(KJS::SimpleNumber::integerFits):
(KJS::SimpleNumber::make):
* kjs/string_object.cpp:
(substituteBackreferences):
* kjs/ustring.cpp:
(KJS::UString::from):
(KJS::UString::toUInt32):
(KJS::UString::find):
(KJS::UString::rfind):
* kjs/ustring.h:
* kjs/value.cpp:
(KJS::jsNumber):
* kjs/value.h:
2005-09-11 Eric Seidel <eseidel@apple.com>
No review requested, build fix affects only SVG.
* JavaScriptCore.xcodeproj/project.pbxproj: Fixed JSC+SVG
Fixed JavaScriptCore+SVG after PCRE 6.1 merger.
http://bugs.webkit.org/show_bug.cgi?id=4932
2005-09-10 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed and landed by Darin.
* Makefile.vc: Added.
* README-Win32.txt: Added.
2005-09-10 Darin Adler <darin@apple.com>
- fixed compilation for WebCore (another try)
* kjs/simple_number.h: Added more "using" lines.
2005-09-10 Darin Adler <darin@apple.com>
- fixed compilation for WebCore
* kjs/simple_number.h: Have to include <cmath> here to work around a bug in the GCC
standard C++ library headers.
2005-09-10 Darin Adler <darin@apple.com>
Windows changes by Krzysztof Kowalczyk <kkowalczyk@gmail.com>.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4870
win portability: fix IS_NEGATIVE_ZERO macro in simple_number.h
* kjs/simple_number.h:
(KJS::isNegativeZero): Added. Inline function. Has a case for Windows that
uses _fpclass and a case for other platforms that uses signbit.
(KJS::SimpleNumber::fits): Use inline isNegativeZero instead of macro IS_NEGATIVE_ZERO.
* kjs/internal.cpp: Remove definition of now-unneeded negZero global.
* kjs/value.cpp: Touched the file because Xcode didn't know it needed to
recompile it.
- improved test engine
* tests/mozilla/jsDriver.pl: Sort tests in numeric order instead of using
a plain-ASCII sort; now test 33 will be after test 5 in any given set of
numbered tests.
2005-09-08 Darin Adler <darin@apple.com>
- fixed overloaded versions of throwError so that they substitute *all*
expected parameters into the message string -- some versions used to
skip parameters, resulting in "%s" being printed in the error message.
Reviewed by Geoff.
* kjs/nodes.h: Updated declarations to use "const &" and not to name parameters
* kjs/nodes.cpp: (Node::throwError): Updated to match above and add one missing
call to substitute.
2005-09-08 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- updated to PCRE 6.1
The original PCRE 6.1 sources are checked into the tree with the tag
"pcre-6-1" for reference. What we're checking in right now is the original
plus our changes to make it support UTF-16 and at least one other tweak
(vertical tab considered whitespace). Our work to get our changes was
done on "pcre-6-1-branch", with an anchor at "pcre-6-1-anchor" so you can
see the evolution of the UTF-16 changes.
Note also that there was one small change made here that's not on the branch
in pcre_compile.c.
* Info.plist: Updated the part of the copyright message that's about PCRE.
* JavaScriptCore.xcodeproj/project.pbxproj: Added new PCRE source files,
removed obsolete ones.
* pcre/AUTHORS: Updated to PCRE 6.1. Includes credits for Apple's UTF-16
changes, but not the credits for Google's C++ wrapper, since we don't include that.
* pcre/COPYING: Updated to PCRE 6.1.
* pcre/LICENCE: Ditto.
* pcre/dftables.c: Ditto.
* pcre/pcre-config.h: Ditto.
* pcre/pcre.h: Ditto.
* pcre/pcre_compile.c: Added for PCRE 6.1.
* pcre/pcre_config.c: Ditto.
* pcre/pcre_exec.c: Ditto.
* pcre/pcre_fullinfo.c: Ditto.
* pcre/pcre_get.c: Ditto.
* pcre/pcre_globals.c: Ditto.
* pcre/pcre_info.c: Ditto.
* pcre/pcre_internal.h: Ditto.
* pcre/pcre_maketables.c: Ditto.
* pcre/pcre_ord2utf8.c: Ditto.
* pcre/pcre_printint.c: Ditto.
* pcre/pcre_refcount.c: Ditto.
* pcre/pcre_study.c: Ditto.
* pcre/pcre_tables.c: Ditto.
* pcre/pcre_try_flipped.c: Ditto.
* pcre/pcre_ucp_findchar.c: Ditto.
* pcre/pcre_version.c: Ditto.
* pcre/pcre_xclass.c: Ditto.
* pcre/ucp.h: Ditto.
* pcre/ucp_findchar.c: Ditto.
* pcre/ucpinternal.h: Ditto.
* pcre/ucptable.c: Ditto.
* pcre/get.c: Removed.
* pcre/internal.h: Removed.
* pcre/maketables.c: Removed.
* pcre/pcre.c: Removed.
* pcre/study.c: Removed.
2005-09-07 Geoffrey Garen <ggaren@apple.com>
-fixed http://bugs.webkit.org/show_bug.cgi?id=4781
Date.setMonth fails with big values due to overflow
Reviewed by darin.
* kjs/date_object.cpp:
(timetUsingCF): for consistency, changed return statement to invalidDate instead of LONG_MAX
(KJS::fillStructuresUsingTimeArgs): modified for readability
(KJS::fillStructuresUsingDateArgs): new function analogous to fillStructuresUsingTimeArgs
(KJS::DateProtoFuncImp::callAsFunction): modified to use fillStructuresUsingDateArgs
(KJS::DateObjectImp::construct): moved variable declaration to proper scope
(KJS::DateObjectFuncImp::callAsFunction): moved variable declaration to proper scope
2005-09-07 Geoffrey Garen <ggaren@apple.com>
-updated expected test results to reflect fix for
http://bugs.webkit.org/show_bug.cgi?id=4698
kjs does not allow named functions in function expressions
* tests/mozilla/expected.html:
2005-09-04 Darin Adler <darin@apple.com>
* kjs/identifier.cpp: Fix comment, add missing include.
(Follow-on to changes from yesterday.)
2005-09-03 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed, tweaked and landed by Darin.
- another try at some of the Windows compilation fixes
should fix these bugs: 4546, 4831, 4834, 4643, 4830, 4832, 4833, 4835
* kjs/collector.cpp: Add missing <setjmp.h> include.
* kjs/date_object.cpp: Fix broken copysign macro.
* kjs/dtoa.cpp: Move macro definitions down after all header includes.
* kjs/fast_malloc.cpp: Add missing <assert.h> and <stddef.h> includes.
* kjs/function.cpp: Remove broken isxdigit definition.
* kjs/grammar.y: Add a missing semicolon (and remove an excess one).
* kjs/identifier.cpp: Turn off AVOID_STATIC_CONSTRUCTORS because the placement new syntax
doesn't seem to work in Visual C++ (I'm surprised to hear that, by the way).
* kjs/value.h: Made ValueImp's destructor virtual because otherwise pointers to ValueImp
on the stack aren't right for garbage collection on Windows (don't think it works that
way with gcc's virtual table scheme, but it's a harmless change).
2005-09-03 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed, tweaked and landed by Darin.
- some Windows compilation fixes, hoping to fix the problems reported in these bugs:
4627, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, 4639, 4640, 4641, 4644, 4645
* kjs/collector.cpp: Include <windows.h> on WIN32. Put thread-related code inside
KJS_MULTIPLE_THREADS #if directives.
(KJS::Collector::markCurrentThreadConservatively): Use NT_TIB to find the stack base on Win32.
* kjs/config.h: Define HAVE_SYS_TIMEB_H for Win32.
* kjs/date_object.cpp: Add include of <limits.h>. Add definitions of strncasecmp, isfinite, and
copysign for Win32.
(KJS::KRFCDate_parseDate): Move "errno = 0" line down closer to the first call to strol -- I believe
that on Win32 there's some other call before that setting errno.
* kjs/date_object.h: Remove unneeded include of <sys/time.h>.
* kjs/dtoa.cpp: Add an undef of strtod, needed on Win32.
* kjs/fast_malloc.cpp: Put #if !WIN32 around some customization that's not appropriate on Win32.
(KJS::region_list_append): Add a missing cast so this Win32-specific function compiles in C++.
(KJS::sbrk): Change parameter type to match the declaration.
* kjs/function.cpp: (isxdigit): Define a locale-independent isxdigit on Win32.
* kjs/function.h: Remove unneeded friend class Function for FunctionImp.
* kjs/identifier.cpp: Took out the APPLE_CHANGES from around the AVOID_STATIC_CONSTRUCTORS
define. We ultimately intend to phase out APPLE_CHANGES entirely. Also fix the
non-AVOID_STATIC_CONSTRUCTORS code path.
* kjs/internal.cpp: Remove uneeded include of <strings.h>, which was confused with <string.h>!
Add a Win32 implementation of copysign. Put the threads code inside KJS_MULTIPLE_THREADS.
* kjs/internal.h: Define a KJS_MULTIPLE_THREADS macro on non-Win32 only. Later we can make this
specific to Mac OS X if we like.
* kjs/interpreter_map.cpp: Add missing include of <stdlib.h>.
* kjs/list.cpp:
(KJS::ListImp::markValues): Use std::min instead of MIN.
(KJS::List::copy): Ditto.
(KJS::List::copyTail): Ditto.
* kjs/math_object.cpp: (signbit): Add a Win32 implementation of signbit.
* kjs/nodes.cpp: (Node::finalCheck): Use unsigned instead of uint.
Put the use of always_inline inside __GNUC__.
* kjs/number_object.cpp: (NumberProtoFuncImp::callAsFunction): Use "10.0" instead of "10"
inside all the calls to pow to avoid ambiguity caused by overloading of pow on Win32, seen
when passing an int rather than a double or float.
* kjs/operations.cpp:
(KJS::isInf): Add Win32 implementation.
(KJS::isPosInf): Add Win32 implementation.
(KJS::isNegInf): Add Win32 implementation.
* kjs/regexp.cpp: Use unsigned instead of uint.
* kjs/regexp.h: Ditto.
* kjs/regexp_object.cpp: Ditto.
* kjs/regexp_object.h: Ditto.
2005-09-02 Beth Dakin <bdakin@apple.com>
Fix for <rdar://problem/4235531> Denver Regression: Safari crash in KWQStringData::makeUnicode
The other half of the fix is in WebCore.
Fix written by Maciej and Darin.
Reviewed by me/Maciej
As Maciej said in Radar: These problems was caused by a conflict between some of our custom
allocators, causing them to return null. Symptom is typically a null pointer dereference in
a place where it might be expected an allocation has just occurred.
* kjs/fast_malloc.cpp: Added #define for MORECORE_CONTIGUOUS, MORECORE_CANNOT_TRIM,
and MALLOC_FAILURE_ACTION.
2005-08-31 Geoffrey Garen <ggaren@apple.com>
-rolled in fix for http://bugs.webkit.org/show_bug.cgi?id=4698
kjs does not allow named functions in function expressions
Fix by Arthur Langereis.
Reviewed by darin.
* kjs/grammar.y:
* kjs/nodes.cpp:
(FuncExprNode::evaluate):
* kjs/nodes.h:
(KJS::FuncExprNode::FuncExprNode):
Test cases added:
* layout-tests/fast/js/named-function-expression-expected.txt: Added.
* layout-tests/fast/js/named-function-expression.html: Added.
2005-08-31 Justin Haygood <justin@xiondigital.net>
Reviewed, tweaked, and landed by Darin.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4085
- fixed http://bugs.webkit.org/show_bug.cgi?id=4087
- fixed http://bugs.webkit.org/show_bug.cgi?id=4096
Some fixes for compiling on windows.
* kjs/config.h: Added a WIN32 case in here, with suitable defines.
(To be tweaked as necessary.)
* kjs/function.cpp: Took out APPLE_CHANGES around use of ICU.
* kjs/operations.cpp: Removed some bogus code that always set HAVE_FLOAT_H.
2005-08-30 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4758
unify SharedPtr in WebCore and JavaScriptCore
* kjs/shared_ptr.h: Updated namespace to KXMLCore instead of kxhmlcore.
Made a few small improvements to use local variables a bit more and added
an "operator int" to reduce the chance that we'll convert a SharedPtr to
an int by accident. Also made the == operators normal functions rather than
friend functions, added a couple of comemnts.
* kjs/function.h: Updated for namespace change.
* kjs/function.cpp: Ditto.
* kjs/function_object.cpp: Ditto.
* kjs/internal.h: Ditto.
* kjs/internal.cpp: Ditto.
* kjs/nodes.h: Ditto.
* kjs/nodes2string.cpp: Ditto.
2005-08-26 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
<rdar://problem/4224911> many many leaks in kjsyyparse with malformed Javascript
Record all nodes that are created during parsing, and delete any
that are left floating with a refcount of 0.
* kjs/internal.cpp:
(KJS::Parser::saveNewNode):
(KJS::clearNewNodes):
(KJS::Parser::parse):
* kjs/internal.h:
* kjs/nodes.cpp:
(Node::Node):
* kjs/nodes.h:
(KJS::Node::refcount):
2005-08-26 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
- fixed <rdar://problem/4232452> many many leaks in kjsyyparse on some well-formed JavaScript (can repro on sony.com, webkit tests)
Fixed by changing the refcounting scheme for nodes. Instead of each node implementing a custom ref and
deref for all its children (and being responsible for deleting them), nodes use a smart pointer to
hold their children, and smart pointers are used outside the node tree as well. This change mostly
removes code.
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/function.cpp:
(KJS::DeclaredFunctionImp::DeclaredFunctionImp):
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function.h:
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/grammar.y:
* kjs/internal.cpp:
(KJS::Parser::parse):
(KJS::Parser::accept):
(KJS::InterpreterImp::checkSyntax):
(KJS::InterpreterImp::evaluate):
* kjs/internal.h:
* kjs/nodes.cpp:
(Node::Node):
(Node::~Node):
(ElementNode::evaluate):
(PropertyValueNode::evaluate):
(ArgumentListNode::evaluateList):
(NewExprNode::evaluate):
(FunctionCallValueNode::evaluate):
(FunctionCallBracketNode::evaluate):
(FunctionCallDotNode::evaluate):
(RelationalNode::evaluate):
(StatListNode::execute):
(StatListNode::processVarDecls):
(VarDeclListNode::evaluate):
(VarDeclListNode::processVarDecls):
(ForInNode::ForInNode):
(ClauseListNode::processVarDecls):
(CaseBlockNode::evalBlock):
(FuncDeclNode::processFuncDecl):
(FuncExprNode::evaluate):
(SourceElementsNode::execute):
(SourceElementsNode::processFuncDecl):
(SourceElementsNode::processVarDecls):
* kjs/nodes.h:
(KJS::Node::ref):
(KJS::Node::deref):
(KJS::NumberNode::NumberNode):
(KJS::GroupNode::GroupNode):
(KJS::ElementNode::ElementNode):
(KJS::ArrayNode::ArrayNode):
(KJS::PropertyValueNode::PropertyValueNode):
(KJS::ObjectLiteralNode::ObjectLiteralNode):
(KJS::BracketAccessorNode::BracketAccessorNode):
(KJS::DotAccessorNode::DotAccessorNode):
(KJS::ArgumentListNode::ArgumentListNode):
(KJS::ArgumentsNode::ArgumentsNode):
(KJS::NewExprNode::NewExprNode):
(KJS::FunctionCallValueNode::FunctionCallValueNode):
(KJS::FunctionCallResolveNode::FunctionCallResolveNode):
(KJS::FunctionCallBracketNode::FunctionCallBracketNode):
(KJS::FunctionCallDotNode::FunctionCallDotNode):
(KJS::PostfixNode::PostfixNode):
(KJS::DeleteNode::DeleteNode):
(KJS::VoidNode::VoidNode):
(KJS::TypeOfNode::TypeOfNode):
(KJS::PrefixNode::PrefixNode):
(KJS::UnaryPlusNode::UnaryPlusNode):
(KJS::NegateNode::NegateNode):
(KJS::BitwiseNotNode::BitwiseNotNode):
(KJS::LogicalNotNode::LogicalNotNode):
(KJS::MultNode::MultNode):
(KJS::AddNode::AddNode):
(KJS::ShiftNode::ShiftNode):
(KJS::RelationalNode::RelationalNode):
(KJS::EqualNode::EqualNode):
(KJS::BitOperNode::BitOperNode):
(KJS::BinaryLogicalNode::BinaryLogicalNode):
(KJS::ConditionalNode::ConditionalNode):
(KJS::AssignResolveNode::AssignResolveNode):
(KJS::AssignBracketNode::AssignBracketNode):
(KJS::AssignDotNode::AssignDotNode):
(KJS::CommaNode::CommaNode):
(KJS::AssignExprNode::AssignExprNode):
(KJS::VarDeclListNode::VarDeclListNode):
(KJS::VarStatementNode::VarStatementNode):
(KJS::ExprStatementNode::ExprStatementNode):
(KJS::IfNode::IfNode):
(KJS::DoWhileNode::DoWhileNode):
(KJS::WhileNode::WhileNode):
(KJS::ForNode::ForNode):
(KJS::ReturnNode::ReturnNode):
(KJS::WithNode::WithNode):
(KJS::CaseClauseNode::CaseClauseNode):
(KJS::ClauseListNode::ClauseListNode):
(KJS::ClauseListNode::clause):
(KJS::ClauseListNode::next):
(KJS::SwitchNode::SwitchNode):
(KJS::LabelNode::LabelNode):
(KJS::ThrowNode::ThrowNode):
(KJS::CatchNode::CatchNode):
(KJS::FinallyNode::FinallyNode):
(KJS::TryNode::TryNode):
(KJS::ParameterNode::ParameterNode):
(KJS::ParameterNode::nextParam):
(KJS::FuncDeclNode::FuncDeclNode):
(KJS::FuncExprNode::FuncExprNode):
* kjs/nodes2string.cpp:
(KJS::SourceStream::operator<<):
(ElementNode::streamTo):
(PropertyValueNode::streamTo):
(ArgumentListNode::streamTo):
(StatListNode::streamTo):
(VarDeclListNode::streamTo):
(CaseBlockNode::streamTo):
(ParameterNode::streamTo):
(SourceElementsNode::streamTo):
* kjs/shared_ptr.h: Added.
(kxmlcore::SharedPtr::SharedPtr):
(kxmlcore::SharedPtr::~SharedPtr):
(kxmlcore::SharedPtr::isNull):
(kxmlcore::SharedPtr::notNull):
(kxmlcore::SharedPtr::reset):
(kxmlcore::SharedPtr::get):
(kxmlcore::SharedPtr::operator*):
(kxmlcore::SharedPtr::operator->):
(kxmlcore::SharedPtr::operator!):
(kxmlcore::SharedPtr::operator bool):
(kxmlcore::SharedPtr::operator==):
(kxmlcore::::operator):
(kxmlcore::operator!=):
(kxmlcore::static_pointer_cast):
(kxmlcore::const_pointer_cast):
2005-08-26 Geoff Garen <ggaren@apple.com>
Reviewed by John.
Landed by Darin.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4664
TOT Crash from backwards null check in WebScriptObject.mm
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
Remove bogus !.
2005-08-25 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
- rename KJS::UString::string() to KJS::UString::domString()
- rename KJS::Identifier::string() to KJS::Identifier::domString()
* kjs/identifier.h: Renamed.
* kjs/ustring.h: Ditto.
2005-08-19 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4435
speed up JavaScript by tweaking the Identifier class
* kjs/identifier.h: Add a new global nullIdentifier and make Identifier::null a function
that returns it.
* kjs/identifier.cpp: (KJS::Identifier::init): Initialize a global for the null identifier
as well as all the other globals for special identifiers.
* kjs/ustring.h: (KJS::UString::UString): Make this empty constructor inline.
* kjs/ustring.cpp: Remove the old non-inline version.
2005-08-19 Mitz Pettel <opendarwin.org@mitzpettel.com>
Reviewed by Maciej.
Revised and landed by Darin.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4474
REGRESSION: Crash when using in-place operator on uninitialized array element
* kjs/nodes.cpp:
(AssignResolveNode::evaluate): Remove unneeded "isSet" assertion.
(AssignBracketNode::evaluate): Replace code that tested "isSet" with code that
tests the return value of getPropertySlot.
* kjs/property_slot.h: Removed unneeded "isSet" function. Property slots are
either uninitialized or set. There's no "initialized and not set" state.
2005-08-18 Adele Peterson <adele@apple.com>
Checked "Inline Functions Hidden" box
* JavaScriptCore.xcodeproj/project.pbxproj:
2005-08-16 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- fixed crash in one of the JavaScript tests (introduced by my throwError change)
* kjs/nodes.cpp: (Node::setExceptionDetailsIfNeeded): Check if the exception is an
object before setting the file and line number properties on it. Something to think
about in the future -- do we really want to do this on any object that's thrown?
How about limiting it to error objects that were created by the JavaScript engine?
- changed kjs_fast_malloc so we don't have two conflicting versions of the same function
* kjs/fast_malloc.h: Took out all the ifdefs from this header.
* kjs/fast_malloc.cpp: Added non-NDEBUG versions of the functions that just call
the system malloc, and put the NDEBUG versions in an #else.
2005-08-16 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- clean up exported symbols that are not in a "KJS" namespace
* bindings/NP_jsobject.cpp: (identiferFromNPIdentifier): Marked this function static
so it no longer has external linkage.
* bindings/c/c_utility.h: Put all this stuff inside the KJS namespace.
* bindings/c/c_utility.cpp: Also marked some globals static so they don't have external
linkage; not as important given the namespace.
* bindings/npruntime.cpp: Marked functions static so they no longer have internal linkage.
Also removed unused _NPN_SetExceptionWithUTF8 function (not in header, had C++ linkage!).
* bindings/jni/jni_utility.cpp: (KJS::Bindings::getJavaVM): Call KJS_GetCreatedJavaVMs
using the soft linking header, instead of calling the JNI call. This allows processes
to link both JavaScriptCore and JavaVM without a symbol conflict.
* bindings/softlinking.c:
(loadFramework): Marked this function static so it no longer has external linkage.
(getFunctionPointer): Ditto.
(KJS_GetCreatedJavaVMs): Renamed this so it has a KJS prefix.
* JavaScriptCore.xcodeproj/project.pbxproj: Added softlinking.h.
* bindings/softlinking.h: Added.
* kjs/nodes2string.cpp: (streamAssignmentOperatorTo): Marked this function static so it
no longer has external linkage.
2005-08-15 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4437
clean up error creation with new throwError function
* bindings/NP_jsobject.cpp:
(_NPN_SetException):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_runtime.cpp:
(JavaField::dispatchValueFromInstance):
(JavaField::dispatchSetValueToInstance):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject _initializeWithObjectImp:originExecutionContext:executionContext:]):
(-[WebScriptObject _initWithObjectImp:originExecutionContext:executionContext:]):
(+[WebScriptObject throwException:]):
(-[WebScriptObject setException:]):
(+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
* bindings/objc/objc_class.h:
(KJS::Bindings::ObjcClass::~ObjcClass):
(KJS::Bindings::ObjcClass::ObjcClass):
(KJS::Bindings::ObjcClass::operator=):
(KJS::Bindings::ObjcClass::constructorAt):
(KJS::Bindings::ObjcClass::numConstructors):
* bindings/objc/objc_header.h:
* bindings/objc/objc_runtime.h:
(KJS::Bindings::ObjcField::~ObjcField):
(KJS::Bindings::ObjcField::ObjcField):
(KJS::Bindings::ObjcField::operator=):
(KJS::Bindings::ObjcMethod::ObjcMethod):
(KJS::Bindings::ObjcMethod::~ObjcMethod):
(KJS::Bindings::ObjcMethod::operator=):
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(ObjcField::setValueToInstance):
(ObjcArray::setValueAt):
(ObjcArray::valueAt):
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(KJS::Bindings::JSMethodNameToObjCMethodName):
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertNSStringToString):
(KJS::Bindings::convertObjcValueToValue):
(KJS::Bindings::objcValueTypeForType):
(KJS::Bindings::createObjcInstanceForValue):
(KJS::Bindings::throwError):
* bindings/runtime.h:
(KJS::Bindings::Parameter::~Parameter):
(KJS::Bindings::Method::~Method):
(KJS::Bindings::Instance::Instance):
(KJS::Bindings::Instance::begin):
(KJS::Bindings::Instance::end):
(KJS::Bindings::Instance::getValueOfUndefinedField):
(KJS::Bindings::Instance::supportsSetValueOfUndefinedField):
(KJS::Bindings::Instance::setValueOfUndefinedField):
(KJS::Bindings::Instance::valueOf):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::put):
* bindings/runtime_object.h:
(KJS::RuntimeObjectImp::setInternalInstance):
(KJS::RuntimeObjectImp::getInternalInstance):
* kjs/array_object.cpp:
(getProperty):
(ArrayProtoFuncImp::callAsFunction):
(ArrayObjectImp::construct):
* kjs/bool_object.cpp:
(BooleanProtoFuncImp::callAsFunction):
* kjs/date_object.cpp:
(KJS::DateProtoFuncImp::callAsFunction):
* kjs/function.cpp:
(KJS::decode):
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function_object.cpp:
(FunctionProtoFuncImp::callAsFunction):
(FunctionObjectImp::construct):
* kjs/internal.cpp:
(KJS::UndefinedImp::toObject):
(KJS::NullImp::toObject):
(KJS::InterpreterImp::evaluate):
(KJS::InternalFunctionImp::hasInstance):
* kjs/nodes.cpp:
(Node::throwError):
(substitute):
(Node::setExceptionDetailsIfNeeded):
(undefinedVariableError):
(ProgramNode::ProgramNode):
* kjs/number_object.cpp:
(NumberProtoFuncImp::callAsFunction):
* kjs/object.cpp:
(KJS::ObjectImp::call):
(KJS::ObjectImp::defaultValue):
(KJS::Error::create):
(KJS::throwError):
* kjs/object.h:
(KJS::ObjectImp::clearProperties):
(KJS::ObjectImp::getPropertySlot):
(KJS::ObjectImp::getOwnPropertySlot):
* kjs/object_object.cpp:
(ObjectProtoFuncImp::callAsFunction):
* kjs/reference.cpp:
(KJS::Reference::getBase):
(KJS::Reference::getValue):
(KJS::Reference::putValue):
(KJS::Reference::deleteValue):
* kjs/regexp_object.cpp:
(RegExpProtoFuncImp::callAsFunction):
(RegExpObjectImp::construct):
* kjs/string_object.cpp:
(StringProtoFuncImp::callAsFunction):
2005-08-15 Anders Carlsson <andersca@mac.com>
Reviewed by Darin.
* tests/mozilla/ecma_3/Date/15.9.5.5.js:
Remove the code which tests that Date.toLocaleString should be parsable
by Date.parse. That is not true according to the spec.
2005-08-15 Darin Adler <darin@apple.com>
Reviewed by Geoff.
* kjs/collector.cpp: (KJS::Collector::allocate): Use a local instead of a global in one
more place; slight speedup.
2005-08-14 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed crash observed on one of the Apple-only layout tests
* kjs/property_map.cpp: (KJS::PropertyMap::mark): Change code to understand that deleted
entries have a value of NULL, so the deleted sentinel count doesn't need to be included
in the count of things to mark since we're ignoring the keys.
2005-08-14 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4421
speed up JavaScript by inlining some label stack functions
* kjs/internal.h: Removed the copy constructor and assignment operator for LabelStack.
They were unused, and the implementations had bugs; I removed them rather than fixing them.
Also removed the clear function, since that was only needed to help the assignment operator
share code with the destructor, and was not efficient enough for the destructor.
(KJS::LabelStack::~LabelStack): Made this inline. Also used an efficient implementation
that's nice and fast when the stack is empty, better than the old clear() function which
used to keep updating and refetching "tos" each time through the loop.
(KJS::LabelStack::pop): Made this inline.
* kjs/internal.cpp: Deleted the now-inline functions and the obsolete functions. Also
deleted a commented-out line of code.
2005-08-14 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4419
speed up JavaScript by improving KJS::List
my measurements show an improvement of 1% on iBench JavaScript
* kjs/list.cpp: Rearrange list to make the values and free list share the same storage,
which saves 4 bytes per list. Also remove the pointers used only on the heap from the
lists that are in the pool, which saves 8 bytes per list. Moving the free list pointer
closer to the start of the list object also speeds up access to the free list. New
"HeapListImp" struct is used only for the lists on the heap.
(KJS::List::markProtectedLists): Shadowed global variable in local and updated for the
new terminology ("heap" instead of "outside pool").
(KJS::allocateListImp): Updated for new terminology.
(KJS::List::release): Moved the code from deallocateListImp in here -- it wasn't being
inlined and didn't need to be in a separate function.
2005-08-14 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4417
speed up JavaScript with some small changes to the property map code
my measurements show an improvement of 2% on iBench JavaScript
* kjs/property_map.h: (KJS::PropertyMap::PropertyMap): Made the default constructor inline.
* kjs/property_map.cpp:
(KJS::PropertyMap::~PropertyMap): Changed loop to exit early once we know we've processed
all the hash table entries, based on the count.
(KJS::PropertyMap::mark): Ditto.
* kjs/object.h: Made an arbitrary change here to force recompiling so we pick up changes to
property_map.h. Works around what seems to be an Xcode header dependency bug.
2005-08-14 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4416
speed up JavaScript with some improvements to the garbage collector
my measurements show an improvement of 2% on iBench JavaScript
* kjs/collector.cpp:
(KJS::Collector::allocate): Use local variables to shadow globals instead of repeatedly
going at global variables. Tighten up loop implementations to make the common case fast.
(KJS::Collector::markStackObjectsConservatively): Use local variables to shadow globals.
Used a goto to eliminate a boolean since it was showing up in the profile.
(KJS::Collector::markProtectedObjects): Iterate through the table using pointer rather
than an index since the profile showed that generating better code.
(KJS::Collector::collect): Added a special case for blocks where all cells are used,
Use local variables to shadow globals. Eliminated a boolean by computing it another
way (checking to see if the number of live objects changed). Also used local variables
to shadow fields in the current cell when sweeping.
(KJS::Collector::numReferencedObjects): Use AllocatedValueImp instead of ValueImp
in one place -- means we get faster versions of various functions that don't worry
about SimpleNumber.
(KJS::className): Ditto.
(KJS::Collector::rootObjectClasses): Ditto.
2005-08-14 Darin Adler <darin@apple.com>
- fixed http://bugs.webkit.org/show_bug.cgi?id=4344
REGRESSION: JavaScript crash when going back from viewing a thread (NULL protoype)
* kjs/error_object.cpp: (NativeErrorImp::NativeErrorImp): Set proto in a more
straightforward way. The old code set the proto to 0 and then to the correct value.
This showed up as a "false positive" when searching for places that set prototype
to NULL/0 so I fixed it.
* kjs/function_object.cpp: (FunctionPrototypeImp::FunctionPrototypeImp): Change to
not pass an explicit "0" to the base class (InternalFunctionImp) constructor.
* kjs/internal.h: Added a default constructor for InternalFunctionImp.
* kjs/internal.cpp: (KJS::InternalFunctionImp::InternalFunctionImp): Added the
default constructor (empty body, just calls base class's default constructor).
* kjs/object.h:
(KJS::ObjectImp::ObjectImp): Add an assertion to catch NULL prototypes earlier
in Development builds.
(KJS::ObjectImp::setPrototype): Ditto.
2005-08-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
- two simple speed improvements for a 3% speed gain
* JavaScriptCore.xcodeproj/project.pbxproj: turn on -fstrict-aliasing
* kjs/scope_chain.h:
(KJS::ScopeChainIterator::ScopeChainIterator): Add a scope chain iterator
so you can walk a scope chain without having to make a copy that you then mutate.
(KJS::ScopeChainIterator::operator*): standard iterator operation
(KJS::ScopeChainIterator::operator->): ditto
(KJS::ScopeChainIterator::operator++): ditto
(KJS::ScopeChainIterator::operator==): ditto
(KJS::ScopeChainIterator::operator!=): ditto
(KJS::ScopeChain::begin): Iterator for the top of the scope chain
(KJS::ScopeChain::end): Iterator for one past the bottom (i.e. null)
* kjs/nodes.cpp:
(ResolveNode::evaluate): Use scope chain iterator instead of copying
a scope chain and then modifying the copy
(ResolveNode::evaluateReference): ditto
(FunctionCallResolveNode::evaluate): ditto
(AssignResolveNode::evaluate): ditto
2005-08-12 Maciej Stachowiak <mjs@apple.com>
Patch from Anders Carlsson, reviewed by me.
* kjs/nodes.h: Fix build breakage.
2005-08-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by hyatt.
- refactor function calls, 3% speedup on JS iBench.
* kjs/grammar.y:
* kjs/nodes.cpp:
(Node::throwError): Added new useful variants.
(FunctionCallValueNode::evaluate): New node to handle calls on expressions
that are strictly values, not references.
(FunctionCallValueNode::ref): ditto
(FunctionCallValueNode::deref): ditto
(FunctionCallResolveNode::evaluate): New node to handle calls on identifier
expressions, so that they are looked up in the scope chain.
(FunctionCallResolveNode::ref): ditto
(FunctionCallResolveNode::deref): ditto
(FunctionCallBracketNode::evaluate): New node to handle calls on bracket
dereferences, so that the expression before brackets is used as the this
object.
(FunctionCallBracketNode::ref): ditto
(FunctionCallBracketNode::deref): ditto
(FunctionCallDotNode::evaluate): New node to handle calls on dot
dereferences, so that the expression before the dot is used as the this
object.
(FunctionCallDotNode::ref): ditto
(FunctionCallDotNode::deref): ditto
(dotExprNotAnObjectString): helper function to avoid global variable access.
(dotExprDoesNotAllowCallsString): ditto
* kjs/nodes.h: Declared new classes.
* kjs/nodes2string.cpp:
(FunctionCallValueNode::streamTo): Added - serializes the appropriate function call
(FunctionCallResolveNode::streamTo): ditto
(FunctionCallBracketNode::streamTo): ditto
(FunctionCallParenBracketNode::streamTo): ditto
(FunctionCallDotNode::streamTo): ditto
(FunctionCallParenDotNode::streamTo): ditto
* kjs/object.h:
(KJS::ObjectImp::isActivation): Change how activation objects are
detected in the scope chain, a virtual function is cheaper than the
old inheritance test.
* kjs/function.h:
(KJS::ActivationImp::isActivation): Ditto.
2005-08-11 Maciej Stachowiak <mjs@apple.com>
- added missing file from earlier checkin
* kjs/grammar_types.h: Added.
(KJS::makeNodePair):
(KJS::makeNodeWithIdent):
2005-08-11 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
* kjs/date_object.cpp:
(timetUsingCF): Fix one of the date tests my making the CF version of mktime
have the same quirk about the DST field as the real mktime.
* tests/mozilla/expected.html: Updated for newly fixed test.
2005-08-11 Maciej Stachowiak <mjs@apple.com>
- updated for one of the tests that Darin incidentally fixed.
* tests/mozilla/expected.html:
2005-08-10 Maciej Stachowiak <mjs@apple.com>
Reviewed by Geoff.
Refactor assignment grammar to avoid Reference type, and to later
be able to take advantage of writeable PropertySlots, when those
are added. I also fixed a minor bug, turning a function to a
string lost parentheses, I made sure they are printed at least
where semantically significant.
Test cases: see WebCore
* kjs/grammar.y: Change grammar so that assignment expressions are parsed
directly to nodes that know how to set the kind of location being assigned, instead
of having a generic assign node that counts on evaluateReference.
* kjs/lexer.cpp: Include grammar_types.h.
* kjs/nodes.cpp:
(BracketAccessorNode): Renamed from AccessorNode1 for clarity.
(DotAccessorNode): Renamed from AccessorNode2 for clarity.
(combineForAssignment): Inline function for doing the proper kind of
operation for various update assignments like += or *=.
(AssignResolveNode): Node that handles assignment to a bare identifier.
(AssignDotNode): Node that handles assignments of the form EXPR . IDENT = EXPR
(AssignBracketNode): EXPR [ IDENT ] = EXPR
* kjs/nodes.h: Updated for declarations/renames of new classes.
* kjs/nodes2string.cpp:
(GroupNode::streamTo): Fixed to print parens around the expression.
(BracketAccessorNode::streamTo): Renamed.
(DotAccessorNode::streamTo): Renamed.
(AssignResolveNode::streamTo): Added.
(AssignBracketNode::streamTo): Added.
(AssignDotNode::streamTo): Added.
(streamAssignmentOperatorTo): helper function for the above
* kjs/property_slot.h:
(KJS::PropertySlot::isSet): Made this const.
2005-08-10 Adele Peterson <adele@apple.com>
Bumping version to 420+
* Info.plist:
2005-08-10 Geoffrey Garen <ggaren@apple.com>
-fixed <rdar://problem/4151132> REGRESSION: Some applet liveconnect calls
throws privilege exception.
Reviewed by richard and mjs.
-I removed the global static JavaClass cache, since it violated Java
security to cache classes between websites and applets.
* bindings/jni/jni_class.cpp:
-removed global static cache dictionary
-instance constructor and destructor now do the work that used to
be done by static factory methods
-removed obsolete functions
(JavaClass::JavaClass):
(JavaClass::~JavaClass):
* bindings/jni/jni_class.h:
-removed obsolete function declarations
-made copying private since it's unused and it's also not clear
excatly how copying would work with Java security
-made default construction private since it's meaningless
* bindings/jni/jni_instance.cpp:
-removed obsolete functions
(JavaInstance::~JavaInstance):
(JavaInstance::getClass):
* bindings/jni/jni_instance.h:
-made copying private since it's unused and it's also not clear
excatly how copying would work with Java security
-made default construction private since it's meaningless
2005-08-08 Geoffrey Garen <ggaren@apple.com>
-fixed crash caused by fix for http://bugs.webkit.org/show_bug.cgi?id=4313
- exceptionDescription now gets explicitly initialized to NULL in all
the places listed below -- our wrapper classes used to take care of this
automagically
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_runtime.cpp:
(JavaField::dispatchValueFromInstance):
(JavaField::dispatchSetValueToInstance):
2005-08-08 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4325
Mozilla Date tests have an unnecessary loop that runs 1970 times before each test
* tests/mozilla/ecma/shell.js: Added TIME_YEAR_0 constant.
* tests/mozilla/ecma/Date/15.9.5.10-1.js: Removed the loop and changed code to use the constant.
* tests/mozilla/ecma/Date/15.9.5.10-10.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-11.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-12.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-13.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-2.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-3.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-4.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-5.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-6.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-7.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-8.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.10-9.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.11-2.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-1.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-2.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-3.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-4.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-5.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-6.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-7.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.12-8.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.13-2.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.13-8.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.14.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.15.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.16.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.17.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.18.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.19.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.20.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-1.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-2.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-3.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-4.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-5.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-6.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-7.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.21-8.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-1.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-2.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-3.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-4.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-5.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-6.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-7.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.22-8.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.23-4.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.23-5.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.23-6.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.23-7.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.23-8.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.23-9.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.5.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.6.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.7.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.8.js: Ditto.
* tests/mozilla/ecma/Date/15.9.5.9.js: Ditto.
2005-08-08 Darin Adler <darin@apple.com>
- forgot to delete an obsolete file
* kjs/object_wrapper.h: Deleted.
2005-08-07 Darin Adler <darin@apple.com>
- fixed two problems compiling with gcc 4.0
* kjs/array_object.cpp: (ArrayProtoFuncImp::callAsFunction): Initialized a
variable to quiet an erroneous warning.
* kjs/date_object.cpp: (KJS::makeTime): Removed extraneous KJS:: prefix.
2005-08-07 Darin Adler <darin@apple.com>
Rubber stamped by Maciej.
- fixed http://bugs.webkit.org/show_bug.cgi?id=4313
eliminate KJS::Value and KJS::Object smart pointer wrappers (for simplicity and speed)
* JavaScriptCore.xcodeproj/project.pbxproj: Removed object_wrapper.h.
Global replaces and other wonderful stuff.
* bindings/NP_jsobject.cpp:
(_NPN_Invoke):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_HasMethod):
(_NPN_SetException):
* bindings/c/c_instance.cpp:
(KJS::Bindings::CInstance::CInstance):
(KJS::Bindings::CInstance::invokeMethod):
(KJS::Bindings::CInstance::invokeDefaultMethod):
(KJS::Bindings::CInstance::defaultValue):
(KJS::Bindings::CInstance::stringValue):
(KJS::Bindings::CInstance::numberValue):
(KJS::Bindings::CInstance::booleanValue):
(KJS::Bindings::CInstance::valueOf):
* bindings/c/c_instance.h:
* bindings/c/c_runtime.cpp:
(CField::valueFromInstance):
(CField::setValueToInstance):
* bindings/c/c_runtime.h:
* bindings/c/c_utility.cpp:
(convertNPStringToUTF16):
(convertUTF8ToUTF16):
(coerceValueToNPVariantStringType):
(convertValueToNPVariant):
(convertNPVariantToValue):
* bindings/c/c_utility.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::stringValue):
(JavaInstance::numberValue):
(JavaInstance::booleanValue):
(JavaInstance::invokeMethod):
(JavaInstance::invokeDefaultMethod):
(JavaInstance::defaultValue):
(JavaInstance::valueOf):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_jsobject.cpp:
(JSObject::invoke):
(JSObject::call):
(JSObject::eval):
(JSObject::getMember):
(JSObject::getSlot):
(JSObject::toString):
(JSObject::convertValueToJObject):
(JSObject::convertJObjectToValue):
(JSObject::listFromJArray):
* bindings/jni/jni_jsobject.h:
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
* bindings/jni/jni_runtime.cpp:
(JavaArray::convertJObjectToArray):
(JavaField::dispatchValueFromInstance):
(JavaField::valueFromInstance):
(JavaField::dispatchSetValueToInstance):
(JavaField::setValueToInstance):
(JavaArray::setValueAt):
(JavaArray::valueAt):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaString::ustring):
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJavaVM):
(KJS::Bindings::getJNIEnv):
(KJS::Bindings::getMethodID):
(KJS::Bindings::callJNIVoidMethod):
(KJS::Bindings::callJNIObjectMethod):
(KJS::Bindings::callJNIBooleanMethod):
(KJS::Bindings::callJNIStaticBooleanMethod):
(KJS::Bindings::callJNIByteMethod):
(KJS::Bindings::callJNICharMethod):
(KJS::Bindings::callJNIShortMethod):
(KJS::Bindings::callJNIIntMethod):
(KJS::Bindings::callJNILongMethod):
(KJS::Bindings::callJNIFloatMethod):
(KJS::Bindings::callJNIDoubleMethod):
(KJS::Bindings::callJNIVoidMethodA):
(KJS::Bindings::callJNIObjectMethodA):
(KJS::Bindings::callJNIByteMethodA):
(KJS::Bindings::callJNICharMethodA):
(KJS::Bindings::callJNIShortMethodA):
(KJS::Bindings::callJNIIntMethodA):
(KJS::Bindings::callJNILongMethodA):
(KJS::Bindings::callJNIFloatMethodA):
(KJS::Bindings::callJNIDoubleMethodA):
(KJS::Bindings::callJNIBooleanMethodA):
(KJS::Bindings::callJNIVoidMethodIDA):
(KJS::Bindings::callJNIObjectMethodIDA):
(KJS::Bindings::callJNIByteMethodIDA):
(KJS::Bindings::callJNICharMethodIDA):
(KJS::Bindings::callJNIShortMethodIDA):
(KJS::Bindings::callJNIIntMethodIDA):
(KJS::Bindings::callJNILongMethodIDA):
(KJS::Bindings::callJNIFloatMethodIDA):
(KJS::Bindings::callJNIDoubleMethodIDA):
(KJS::Bindings::callJNIBooleanMethodIDA):
(KJS::Bindings::getCharactersFromJString):
(KJS::Bindings::releaseCharactersForJString):
(KJS::Bindings::getCharactersFromJStringInEnv):
(KJS::Bindings::releaseCharactersForJStringInEnv):
(KJS::Bindings::getUCharactersFromJStringInEnv):
(KJS::Bindings::releaseUCharactersForJStringInEnv):
(KJS::Bindings::JNITypeFromClassName):
(KJS::Bindings::signatureFromPrimitiveType):
(KJS::Bindings::JNITypeFromPrimitiveType):
(KJS::Bindings::getJNIField):
(KJS::Bindings::convertValueToJValue):
* bindings/jni/jni_utility.h:
* bindings/objc/WebScriptObject.mm:
(_didExecute):
(-[WebScriptObject _initializeWithObjectImp:originExecutionContext:Bindings::executionContext:Bindings::]):
(-[WebScriptObject _initWithObjectImp:originExecutionContext:Bindings::executionContext:Bindings::]):
(-[WebScriptObject _imp]):
(-[WebScriptObject _executionContext]):
(-[WebScriptObject _setExecutionContext:]):
(-[WebScriptObject _originExecutionContext]):
(-[WebScriptObject _setOriginExecutionContext:]):
(+[WebScriptObject throwException:]):
(listFromNSArray):
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject stringRepresentation]):
(-[WebScriptObject webScriptValueAtIndex:]):
(-[WebScriptObject setException:]):
(+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:Bindings::]):
* bindings/objc/WebScriptObjectPrivate.h:
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::fallbackObject):
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
(ObjcInstance::invokeDefaultMethod):
(ObjcInstance::setValueOfField):
(ObjcInstance::setValueOfUndefinedField):
(ObjcInstance::getValueOfField):
(ObjcInstance::getValueOfUndefinedField):
(ObjcInstance::defaultValue):
(ObjcInstance::stringValue):
(ObjcInstance::numberValue):
(ObjcInstance::booleanValue):
(ObjcInstance::valueOf):
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(convertValueToObjcObject):
(ObjcField::setValueToInstance):
(ObjcArray::setValueAt):
(ObjcArray::valueAt):
(ObjcFallbackObjectImp::put):
(ObjcFallbackObjectImp::callAsFunction):
(ObjcFallbackObjectImp::defaultValue):
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(Bindings::JSMethodNameToObjCMethodName):
(Bindings::convertValueToObjcValue):
(Bindings::convertNSStringToString):
(Bindings::convertObjcValueToValue):
(Bindings::objcValueTypeForType):
(Bindings::createObjcInstanceForValue):
* bindings/runtime.cpp:
(Instance::getValueOfField):
(Instance::setValueOfField):
(Instance::createRuntimeObject):
(Instance::createLanguageInstanceForValue):
* bindings/runtime.h:
(KJS::Bindings::Constructor::~Constructor):
(KJS::Bindings::Field::~Field):
(KJS::Bindings::MethodList::MethodList):
(KJS::Bindings::Class::fallbackObject):
(KJS::Bindings::Class::~Class):
(KJS::Bindings::Instance::Instance):
(KJS::Bindings::Instance::getValueOfUndefinedField):
(KJS::Bindings::Instance::supportsSetValueOfUndefinedField):
(KJS::Bindings::Instance::setValueOfUndefinedField):
(KJS::Bindings::Instance::valueOf):
(KJS::Bindings::Instance::setExecutionContext):
(KJS::Bindings::Instance::~Instance):
(KJS::Bindings::Array::~Array):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::RuntimeArrayImp):
(RuntimeArrayImp::lengthGetter):
(RuntimeArrayImp::indexGetter):
(RuntimeArrayImp::put):
* bindings/runtime_array.h:
* bindings/runtime_method.cpp:
(RuntimeMethodImp::lengthGetter):
(RuntimeMethodImp::callAsFunction):
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::fallbackObjectGetter):
(RuntimeObjectImp::fieldGetter):
(RuntimeObjectImp::methodGetter):
(RuntimeObjectImp::getOwnPropertySlot):
(RuntimeObjectImp::put):
(RuntimeObjectImp::defaultValue):
(RuntimeObjectImp::callAsFunction):
* bindings/runtime_object.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::ArrayInstanceImp):
(ArrayInstanceImp::lengthGetter):
(ArrayInstanceImp::getOwnPropertySlot):
(ArrayInstanceImp::put):
(ArrayInstanceImp::propList):
(ArrayInstanceImp::setLength):
(compareByStringForQSort):
(compareWithCompareFunctionForQSort):
(ArrayInstanceImp::sort):
(ArrayInstanceImp::pushUndefinedObjectsToEnd):
(ArrayPrototypeImp::ArrayPrototypeImp):
(ArrayProtoFuncImp::ArrayProtoFuncImp):
(ArrayProtoFuncImp::callAsFunction):
(ArrayObjectImp::ArrayObjectImp):
(ArrayObjectImp::construct):
(ArrayObjectImp::callAsFunction):
* kjs/array_object.h:
* kjs/bool_object.cpp:
(BooleanPrototypeImp::BooleanPrototypeImp):
(BooleanProtoFuncImp::BooleanProtoFuncImp):
(BooleanProtoFuncImp::callAsFunction):
(BooleanObjectImp::BooleanObjectImp):
(BooleanObjectImp::construct):
(BooleanObjectImp::callAsFunction):
* kjs/bool_object.h:
* kjs/collector.cpp:
(KJS::Collector::markStackObjectsConservatively):
(KJS::Collector::collect):
(KJS::className):
* kjs/completion.h:
(KJS::Completion::Completion):
(KJS::Completion::value):
(KJS::Completion::isValueCompletion):
* kjs/context.h:
(KJS::ContextImp::variableObject):
(KJS::ContextImp::setVariableObject):
(KJS::ContextImp::thisValue):
(KJS::ContextImp::activationObject):
(KJS::ContextImp::pushScope):
* kjs/date_object.cpp:
(formatLocaleDate):
(KJS::timeFromArgs):
(KJS::DatePrototypeImp::DatePrototypeImp):
(KJS::DateProtoFuncImp::DateProtoFuncImp):
(KJS::DateProtoFuncImp::callAsFunction):
(KJS::DateObjectImp::DateObjectImp):
(KJS::DateObjectImp::construct):
(KJS::DateObjectImp::callAsFunction):
(KJS::DateObjectFuncImp::DateObjectFuncImp):
(KJS::DateObjectFuncImp::callAsFunction):
(KJS::parseDate):
(KJS::KRFCDate_parseDate):
(KJS::timeClip):
* kjs/date_object.h:
* kjs/debugger.cpp:
(Debugger::exception):
(Debugger::callEvent):
(Debugger::returnEvent):
* kjs/debugger.h:
* kjs/error_object.cpp:
(ErrorPrototypeImp::ErrorPrototypeImp):
(ErrorProtoFuncImp::ErrorProtoFuncImp):
(ErrorProtoFuncImp::callAsFunction):
(ErrorObjectImp::ErrorObjectImp):
(ErrorObjectImp::construct):
(ErrorObjectImp::callAsFunction):
(NativeErrorPrototypeImp::NativeErrorPrototypeImp):
(NativeErrorImp::NativeErrorImp):
(NativeErrorImp::construct):
(NativeErrorImp::callAsFunction):
* kjs/error_object.h:
* kjs/function.cpp:
(KJS::FunctionImp::FunctionImp):
(KJS::FunctionImp::callAsFunction):
(KJS::FunctionImp::processParameters):
(KJS::FunctionImp::argumentsGetter):
(KJS::FunctionImp::lengthGetter):
(KJS::FunctionImp::put):
(KJS::DeclaredFunctionImp::DeclaredFunctionImp):
(KJS::DeclaredFunctionImp::construct):
(KJS::ArgumentsImp::ArgumentsImp):
(KJS::ArgumentsImp::mappedIndexGetter):
(KJS::ArgumentsImp::put):
(KJS::ActivationImp::argumentsGetter):
(KJS::GlobalFuncImp::GlobalFuncImp):
(KJS::encode):
(KJS::decode):
(KJS::GlobalFuncImp::callAsFunction):
* kjs/function.h:
* kjs/function_object.cpp:
(FunctionPrototypeImp::FunctionPrototypeImp):
(FunctionPrototypeImp::callAsFunction):
(FunctionProtoFuncImp::FunctionProtoFuncImp):
(FunctionProtoFuncImp::callAsFunction):
(FunctionObjectImp::FunctionObjectImp):
(FunctionObjectImp::construct):
(FunctionObjectImp::callAsFunction):
* kjs/function_object.h:
* kjs/internal.cpp:
(KJS::UndefinedImp::toPrimitive):
(KJS::UndefinedImp::toObject):
(KJS::NullImp::toPrimitive):
(KJS::NullImp::toObject):
(KJS::BooleanImp::toPrimitive):
(KJS::BooleanImp::toObject):
(KJS::StringImp::toPrimitive):
(KJS::StringImp::toObject):
(KJS::NumberImp::toPrimitive):
(KJS::NumberImp::toObject):
(KJS::NumberImp::getUInt32):
(KJS::LabelStack::push):
(KJS::ContextImp::ContextImp):
(KJS::InterpreterImp::globalInit):
(KJS::InterpreterImp::globalClear):
(KJS::InterpreterImp::InterpreterImp):
(KJS::InterpreterImp::initGlobalObject):
(KJS::InterpreterImp::clear):
(KJS::InterpreterImp::mark):
(KJS::InterpreterImp::evaluate):
(KJS::InternalFunctionImp::hasInstance):
(KJS::roundValue):
(KJS::printInfo):
* kjs/internal.h:
(KJS::InterpreterImp::builtinObject):
(KJS::InterpreterImp::builtinFunction):
(KJS::InterpreterImp::builtinArray):
(KJS::InterpreterImp::builtinBoolean):
(KJS::InterpreterImp::builtinString):
(KJS::InterpreterImp::builtinNumber):
(KJS::InterpreterImp::builtinDate):
(KJS::InterpreterImp::builtinRegExp):
(KJS::InterpreterImp::builtinError):
(KJS::InterpreterImp::builtinObjectPrototype):
(KJS::InterpreterImp::builtinFunctionPrototype):
(KJS::InterpreterImp::builtinArrayPrototype):
(KJS::InterpreterImp::builtinBooleanPrototype):
(KJS::InterpreterImp::builtinStringPrototype):
(KJS::InterpreterImp::builtinNumberPrototype):
(KJS::InterpreterImp::builtinDatePrototype):
(KJS::InterpreterImp::builtinRegExpPrototype):
(KJS::InterpreterImp::builtinErrorPrototype):
(KJS::InterpreterImp::builtinEvalError):
(KJS::InterpreterImp::builtinRangeError):
(KJS::InterpreterImp::builtinReferenceError):
(KJS::InterpreterImp::builtinSyntaxError):
(KJS::InterpreterImp::builtinTypeError):
(KJS::InterpreterImp::builtinURIError):
(KJS::InterpreterImp::builtinEvalErrorPrototype):
(KJS::InterpreterImp::builtinRangeErrorPrototype):
(KJS::InterpreterImp::builtinReferenceErrorPrototype):
(KJS::InterpreterImp::builtinSyntaxErrorPrototype):
(KJS::InterpreterImp::builtinTypeErrorPrototype):
(KJS::InterpreterImp::builtinURIErrorPrototype):
* kjs/interpreter.cpp:
(Context::variableObject):
(Context::thisValue):
(Interpreter::Interpreter):
(Interpreter::globalObject):
(Interpreter::evaluate):
(Interpreter::builtinObject):
(Interpreter::builtinFunction):
(Interpreter::builtinArray):
(Interpreter::builtinBoolean):
(Interpreter::builtinString):
(Interpreter::builtinNumber):
(Interpreter::builtinDate):
(Interpreter::builtinRegExp):
(Interpreter::builtinError):
(Interpreter::builtinObjectPrototype):
(Interpreter::builtinFunctionPrototype):
(Interpreter::builtinArrayPrototype):
(Interpreter::builtinBooleanPrototype):
(Interpreter::builtinStringPrototype):
(Interpreter::builtinNumberPrototype):
(Interpreter::builtinDatePrototype):
(Interpreter::builtinRegExpPrototype):
(Interpreter::builtinErrorPrototype):
(Interpreter::builtinEvalError):
(Interpreter::builtinRangeError):
(Interpreter::builtinReferenceError):
(Interpreter::builtinSyntaxError):
(Interpreter::builtinTypeError):
(Interpreter::builtinURIError):
(Interpreter::builtinEvalErrorPrototype):
(Interpreter::builtinRangeErrorPrototype):
(Interpreter::builtinReferenceErrorPrototype):
(Interpreter::builtinSyntaxErrorPrototype):
(Interpreter::builtinTypeErrorPrototype):
(Interpreter::builtinURIErrorPrototype):
(Interpreter::createLanguageInstanceForValue):
* kjs/interpreter.h:
(KJS::Interpreter::isGlobalObject):
(KJS::ExecState::setException):
(KJS::ExecState::clearException):
(KJS::ExecState::exception):
(KJS::ExecState::hadException):
(KJS::ExecState::ExecState):
* kjs/list.cpp:
(KJS::List::at):
* kjs/list.h:
(KJS::List::operator[]):
(KJS::ListIterator::operator->):
(KJS::ListIterator::operator*):
(KJS::ListIterator::operator++):
(KJS::ListIterator::operator--):
* kjs/lookup.h:
(KJS::staticFunctionGetter):
(KJS::staticValueGetter):
(KJS::lookupPut):
(KJS::cacheGlobalObject):
* kjs/math_object.cpp:
(MathObjectImp::getValueProperty):
(MathFuncImp::MathFuncImp):
(MathFuncImp::callAsFunction):
* kjs/math_object.h:
* kjs/nodes.cpp:
(Node::evaluateReference):
(Node::throwError):
(Node::setExceptionDetailsIfNeeded):
(NullNode::evaluate):
(BooleanNode::evaluate):
(NumberNode::evaluate):
(StringNode::evaluate):
(RegExpNode::evaluate):
(ThisNode::evaluate):
(ResolveNode::evaluate):
(ResolveNode::evaluateReference):
(GroupNode::evaluate):
(ElementNode::evaluate):
(ArrayNode::evaluate):
(ObjectLiteralNode::evaluate):
(PropertyValueNode::evaluate):
(PropertyNode::evaluate):
(AccessorNode1::evaluate):
(AccessorNode1::evaluateReference):
(AccessorNode2::evaluate):
(AccessorNode2::evaluateReference):
(ArgumentListNode::evaluate):
(ArgumentListNode::evaluateList):
(ArgumentsNode::evaluate):
(NewExprNode::evaluate):
(FunctionCallNode::evaluate):
(PostfixNode::evaluate):
(DeleteNode::evaluate):
(VoidNode::evaluate):
(TypeOfNode::evaluate):
(PrefixNode::evaluate):
(UnaryPlusNode::evaluate):
(NegateNode::evaluate):
(BitwiseNotNode::evaluate):
(LogicalNotNode::evaluate):
(MultNode::evaluate):
(AddNode::evaluate):
(ShiftNode::evaluate):
(RelationalNode::evaluate):
(EqualNode::evaluate):
(BitOperNode::evaluate):
(BinaryLogicalNode::evaluate):
(ConditionalNode::evaluate):
(AssignNode::evaluate):
(CommaNode::evaluate):
(StatListNode::execute):
(AssignExprNode::evaluate):
(VarDeclNode::evaluate):
(VarDeclNode::processVarDecls):
(VarDeclListNode::evaluate):
(ExprStatementNode::execute):
(IfNode::execute):
(DoWhileNode::execute):
(WhileNode::execute):
(ForNode::execute):
(ForInNode::execute):
(ContinueNode::execute):
(BreakNode::execute):
(ReturnNode::execute):
(WithNode::execute):
(CaseClauseNode::evaluate):
(ClauseListNode::evaluate):
(CaseBlockNode::evaluate):
(CaseBlockNode::evalBlock):
(SwitchNode::execute):
(ThrowNode::execute):
(CatchNode::execute):
(TryNode::execute):
(ParameterNode::evaluate):
(FuncDeclNode::processFuncDecl):
(FuncExprNode::evaluate):
(SourceElementsNode::execute):
* kjs/nodes.h:
(KJS::StatementNode::evaluate):
* kjs/number_object.cpp:
(NumberPrototypeImp::NumberPrototypeImp):
(NumberProtoFuncImp::NumberProtoFuncImp):
(NumberProtoFuncImp::callAsFunction):
(NumberObjectImp::NumberObjectImp):
(NumberObjectImp::getValueProperty):
(NumberObjectImp::construct):
(NumberObjectImp::callAsFunction):
* kjs/number_object.h:
* kjs/object.cpp:
(KJS::ObjectImp::call):
(KJS::ObjectImp::mark):
(KJS::ObjectImp::classInfo):
(KJS::ObjectImp::get):
(KJS::ObjectImp::getProperty):
(KJS::ObjectImp::getPropertySlot):
(KJS::ObjectImp::put):
(KJS::ObjectImp::hasOwnProperty):
(KJS::ObjectImp::defaultValue):
(KJS::ObjectImp::findPropertyHashEntry):
(KJS::ObjectImp::construct):
(KJS::ObjectImp::callAsFunction):
(KJS::ObjectImp::hasInstance):
(KJS::ObjectImp::propList):
(KJS::ObjectImp::toPrimitive):
(KJS::ObjectImp::toNumber):
(KJS::ObjectImp::toString):
(KJS::ObjectImp::toObject):
(KJS::ObjectImp::putDirect):
(KJS::Error::create):
(KJS::error):
* kjs/object.h:
(KJS::):
(KJS::ObjectImp::getPropertySlot):
(KJS::AllocatedValueImp::isObject):
(KJS::ObjectImp::ObjectImp):
(KJS::ObjectImp::internalValue):
(KJS::ObjectImp::setInternalValue):
(KJS::ObjectImp::prototype):
(KJS::ObjectImp::setPrototype):
(KJS::ObjectImp::inherits):
* kjs/object_object.cpp:
(ObjectPrototypeImp::ObjectPrototypeImp):
(ObjectProtoFuncImp::ObjectProtoFuncImp):
(ObjectProtoFuncImp::callAsFunction):
(ObjectObjectImp::ObjectObjectImp):
(ObjectObjectImp::construct):
(ObjectObjectImp::callAsFunction):
* kjs/object_object.h:
* kjs/operations.cpp:
(KJS::equal):
(KJS::strictEqual):
(KJS::relation):
(KJS::add):
(KJS::mult):
* kjs/operations.h:
* kjs/property_map.cpp:
(KJS::PropertyMap::mark):
(KJS::PropertyMap::addEnumerablesToReferenceList):
(KJS::PropertyMap::addSparseArrayPropertiesToReferenceList):
(KJS::PropertyMap::save):
(KJS::PropertyMap::restore):
* kjs/property_map.h:
* kjs/property_slot.cpp:
(KJS::PropertySlot::undefinedGetter):
* kjs/property_slot.h:
(KJS::PropertySlot::getValue):
* kjs/protect.h:
(KJS::gcUnprotectNullTolerant):
(KJS::ProtectedValue::ProtectedValue):
(KJS::ProtectedValue::~ProtectedValue):
(KJS::ProtectedValue::operator=):
(KJS::ProtectedValue::operator ValueImp *):
(KJS::ProtectedValue::operator->):
* kjs/protected_object.h:
(KJS::ProtectedObject::ProtectedObject):
(KJS::ProtectedObject::operator=):
(KJS::ProtectedObject::operator ValueImp *):
(KJS::ProtectedObject::operator ObjectImp *):
(KJS::ProtectedObject::operator->):
(KJS::ProtectedReference::ProtectedReference):
(KJS::ProtectedReference::~ProtectedReference):
(KJS::ProtectedReference::operator=):
* kjs/protected_values.cpp:
(KJS::ProtectedValues::getProtectCount):
(KJS::ProtectedValues::increaseProtectCount):
(KJS::ProtectedValues::insert):
(KJS::ProtectedValues::decreaseProtectCount):
* kjs/protected_values.h:
* kjs/reference.cpp:
(KJS::Reference::Reference):
(KJS::Reference::makeValueReference):
(KJS::Reference::getBase):
(KJS::Reference::getValue):
(KJS::Reference::putValue):
(KJS::Reference::deleteValue):
* kjs/reference.h:
(KJS::Reference::baseIfMutable):
* kjs/regexp_object.cpp:
(RegExpPrototypeImp::RegExpPrototypeImp):
(RegExpProtoFuncImp::RegExpProtoFuncImp):
(RegExpProtoFuncImp::callAsFunction):
(RegExpObjectImp::RegExpObjectImp):
(RegExpObjectImp::arrayOfMatches):
(RegExpObjectImp::backrefGetter):
(RegExpObjectImp::construct):
(RegExpObjectImp::callAsFunction):
* kjs/regexp_object.h:
* kjs/string_object.cpp:
(StringInstanceImp::lengthGetter):
(StringInstanceImp::indexGetter):
(StringInstanceImp::getOwnPropertySlot):
(StringInstanceImp::put):
(StringPrototypeImp::StringPrototypeImp):
(StringProtoFuncImp::StringProtoFuncImp):
(regExpIsGlobal):
(replace):
(StringProtoFuncImp::callAsFunction):
(StringObjectImp::StringObjectImp):
(StringObjectImp::construct):
(StringObjectImp::callAsFunction):
(StringObjectFuncImp::StringObjectFuncImp):
(StringObjectFuncImp::callAsFunction):
* kjs/string_object.h:
* kjs/testkjs.cpp:
(TestFunctionImp::callAsFunction):
(VersionFunctionImp::callAsFunction):
(main):
* kjs/value.cpp:
(KJS::AllocatedValueImp::operator new):
(KJS::AllocatedValueImp::getUInt32):
(KJS::ValueImp::toInteger):
(KJS::ValueImp::toInt32):
(KJS::ValueImp::toUInt32):
(KJS::ValueImp::toUInt16):
(KJS::ValueImp::toObject):
(KJS::AllocatedValueImp::getBoolean):
(KJS::AllocatedValueImp::getNumber):
(KJS::AllocatedValueImp::getString):
(KJS::AllocatedValueImp::getObject):
(KJS::jsString):
(KJS::jsNumber):
(KJS::ConstantValues::init):
(KJS::ConstantValues::clear):
(KJS::ConstantValues::mark):
* kjs/value.h:
(KJS::):
(KJS::jsUndefined):
(KJS::jsNull):
(KJS::jsBoolean):
(KJS::jsNaN):
(KJS::ValueImp::ValueImp):
(KJS::ValueImp::~ValueImp):
(KJS::AllocatedValueImp::AllocatedValueImp):
(KJS::AllocatedValueImp::~AllocatedValueImp):
(KJS::AllocatedValueImp::isBoolean):
(KJS::AllocatedValueImp::isNumber):
(KJS::AllocatedValueImp::isString):
(KJS::AllocatedValueImp::isObject):
(KJS::AllocatedValueImp::marked):
(KJS::AllocatedValueImp::mark):
(KJS::ValueImp::downcast):
(KJS::ValueImp::isUndefined):
(KJS::ValueImp::isNull):
(KJS::ValueImp::isUndefinedOrNull):
(KJS::ValueImp::isBoolean):
(KJS::ValueImp::isNumber):
(KJS::ValueImp::isString):
(KJS::ValueImp::isObject):
(KJS::ValueImp::getBoolean):
(KJS::ValueImp::getNumber):
(KJS::ValueImp::getString):
(KJS::ValueImp::getObject):
(KJS::ValueImp::getUInt32):
(KJS::ValueImp::mark):
(KJS::ValueImp::marked):
(KJS::ValueImp::type):
(KJS::ValueImp::toPrimitive):
(KJS::ValueImp::toBoolean):
(KJS::ValueImp::toNumber):
(KJS::ValueImp::toString):
(KJS::jsZero):
(KJS::jsOne):
(KJS::jsTwo):
(KJS::Undefined):
(KJS::Null):
(KJS::Boolean):
(KJS::Number):
(KJS::String):
2005-08-06 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
Change over to the new PropertySlot mechanism for property
lookup. This allows the elimination of hasOwnProperty
methods. Also did some of the performance tuning enabled by this
(but not yet all the possible improvements for function calls,
assignment, ++, and so forth). And also much code cleanup.
Net result is about a 2% speedup on the JS iBench.
Also redid Geoff's fix for the chrashing applet by avoiding a NULL
prototype in the bindings code and using the default of Null()
instead.
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::ObjcFallbackObjectImp):
(ObjcFallbackObjectImp::getOwnPropertySlot):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::lengthGetter):
(RuntimeArrayImp::indexGetter):
(RuntimeArrayImp::getOwnPropertySlot):
* bindings/runtime_array.h:
* bindings/runtime_method.cpp:
(RuntimeMethodImp::lengthGetter):
(RuntimeMethodImp::getOwnPropertySlot):
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::fallbackObjectGetter):
(RuntimeObjectImp::fieldGetter):
(RuntimeObjectImp::methodGetter):
(RuntimeObjectImp::getOwnPropertySlot):
* bindings/runtime_object.h:
* bindings/runtime_root.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::lengthGetter):
(ArrayInstanceImp::getOwnPropertySlot):
(ArrayPrototypeImp::getOwnPropertySlot):
* kjs/array_object.h:
* kjs/date_object.cpp:
(DatePrototypeImp::getOwnPropertySlot):
* kjs/date_object.h:
* kjs/function.cpp:
(KJS::FunctionImp::argumentsGetter):
(KJS::FunctionImp::lengthGetter):
(KJS::FunctionImp::getOwnPropertySlot):
(KJS::FunctionImp::put):
(KJS::FunctionImp::deleteProperty):
(KJS::ArgumentsImp::mappedIndexGetter):
(KJS::ArgumentsImp::getOwnPropertySlot):
(KJS::ActivationImp::argumentsGetter):
(KJS::ActivationImp::getArgumentsGetter):
(KJS::ActivationImp::getOwnPropertySlot):
(KJS::ActivationImp::deleteProperty):
* kjs/function.h:
* kjs/internal.cpp:
(InterpreterImp::InterpreterImp):
(InterpreterImp::initGlobalObject):
(InterpreterImp::~InterpreterImp):
(InterpreterImp::evaluate):
* kjs/internal.h:
(KJS::InterpreterImp::globalExec):
* kjs/interpreter.cpp:
(Interpreter::Interpreter):
(Interpreter::createLanguageInstanceForValue):
* kjs/interpreter.h:
(KJS::Interpreter::argumentsIdentifier):
(KJS::Interpreter::specialPrototypeIdentifier):
* kjs/lookup.h:
(KJS::staticFunctionGetter):
(KJS::staticValueGetter):
(KJS::getStaticPropertySlot):
(KJS::getStaticFunctionSlot):
(KJS::getStaticValueSlot):
* kjs/math_object.cpp:
(MathObjectImp::getOwnPropertySlot):
* kjs/math_object.h:
* kjs/nodes.cpp:
(ResolveNode::evaluate):
(ResolveNode::evaluateReference):
(AccessorNode1::evaluate):
(AccessorNode2::evaluate):
* kjs/number_object.cpp:
(NumberObjectImp::getOwnPropertySlot):
* kjs/number_object.h:
* kjs/object.cpp:
(KJS::ObjectImp::get):
(KJS::ObjectImp::getProperty):
(KJS::ObjectImp::getPropertySlot):
(KJS::ObjectImp::getOwnPropertySlot):
(KJS::ObjectImp::put):
(KJS::ObjectImp::hasProperty):
(KJS::ObjectImp::hasOwnProperty):
* kjs/object.h:
(KJS::ObjectImp::getDirectLocation):
(KJS::ObjectImp::getPropertySlot):
(KJS::ObjectImp::getOwnPropertySlot):
* kjs/object_wrapper.h: Added.
(KJS::):
(KJS::Object::Object):
(KJS::Object::operator ObjectImp *):
* kjs/property_map.cpp:
(KJS::PropertyMap::getLocation):
* kjs/property_map.h:
* kjs/property_slot.cpp: Added.
(KJS::PropertySlot::undefinedGetter):
* kjs/property_slot.h: Added.
(KJS::PropertySlot::isSet):
(KJS::PropertySlot::getValue):
(KJS::PropertySlot::setValueSlot):
(KJS::PropertySlot::setStaticEntry):
(KJS::PropertySlot::setCustom):
(KJS::PropertySlot::setCustomIndex):
(KJS::PropertySlot::setUndefined):
(KJS::PropertySlot::slotBase):
(KJS::PropertySlot::staticEntry):
(KJS::PropertySlot::index):
(KJS::PropertySlot::):
* kjs/protect.h:
* kjs/protected_object.h: Added.
(KJS::ProtectedObject::ProtectedObject):
(KJS::ProtectedObject::~ProtectedObject):
(KJS::ProtectedObject::operator=):
(KJS::ProtectedReference::ProtectedReference):
(KJS::ProtectedReference::~ProtectedReference):
(KJS::ProtectedReference::operator=):
* kjs/reference.h:
* kjs/reference_list.cpp:
* kjs/regexp_object.cpp:
(RegExpObjectImp::backrefGetter):
(RegExpObjectImp::getOwnPropertySlot):
* kjs/regexp_object.h:
* kjs/string_object.cpp:
(StringInstanceImp::lengthGetter):
(StringInstanceImp::indexGetter):
(StringInstanceImp::getOwnPropertySlot):
(StringPrototypeImp::getOwnPropertySlot):
* kjs/string_object.h:
2005-08-05 Adele Peterson <adele@apple.com>
Reviewed by Darin.
* JavaScriptCore.xcodeproj/project.pbxproj: Unchecked 'statics are thread safe' option.
2005-08-05 Geoffrey Garen <ggaren@apple.com>
-fixed <rdar://problem/4207220> REGRESSION (DENVER): Crash occurs
after clicking on Hangman applet
Reviewed by darin.
* kjs/object.cpp:
(KJS::ObjectImp::hasProperty): added check for null prototype.
FIXME: The long-term plan is to make runtime objects use JS Null()
instead of null pointers, which will allow us to eliminate null
checks, improving performance.
2005-08-05 Geoffrey Garen <ggaren@apple.com>
Fix by darin, reviewed by me.
- rolled in fix for: <rdar://problem/4161606> JavaScript regular
expressions with certain ranges of Unicode characters cause a crash
Test cases added:
* layout-tests/fast/js/regexp-big-unicode-ranges-expected.txt: Added.
* layout-tests/fast/js/regexp-big-unicode-ranges.html: Added.
* pcre/pcre.c:
(compile_branch): added checks for characters > 255
2005-08-04 Maciej Stachowiak <mjs@apple.com>
- updated expected test results now that we no longer exlude the
date tests (apparently this was overlooked)
* tests/mozilla/expected.html:
2005-07-31 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- remove uses of Mac-OS-X-specific MAX macro
- remove one of the many excess "APPLE_CHANGES" ifdefs
* kjs/collector.cpp: (KJS::Collector::allocate): Use std::max instead of MAX.
* kjs/property_map.cpp: (KJS::PropertyMap::rehash): Ditto.
* kjs/ustring.cpp:
(KJS::UChar::toLower): Take out non-ICU code path.
(KJS::UChar::toUpper): Ditto.
(KJS::UString::spliceSubstringsWithSeparators): Use std::max instead of MAX.
2005-07-27 Geoffrey Garen <ggaren@apple.com>
- fixed http://bugs.webkit.org/show_bug.cgi?id=4147
Array.toString() and toLocaleString() improvements from KDE KJS
(rolled in KDE changes)
Test cases added:
* layout-tests/fast/js/toString-overrides-expected.txt: Added.
* layout-tests/fast/js/toString-overrides.html: Added.
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call):
2005-07-27 Maciej Stachowiak <mjs@apple.com>
Changes by Michael Kahl, reviewed by me.
- fixed <rdar://problem/4194278> Need better debugging support in JavaScriptCore
* JavaScriptCore.xcodeproj/project.pbxproj:
* kjs/debugger.cpp:
(KJS::AttachedInterpreter::AttachedInterpreter):
(KJS::AttachedInterpreter::~AttachedInterpreter):
(Debugger::~Debugger):
(Debugger::attach):
(Debugger::detach):
(Debugger::sourceParsed):
* kjs/debugger.h:
* kjs/function.cpp:
(KJS::FunctionImp::call):
(KJS::GlobalFuncImp::call):
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/grammar.y:
* kjs/internal.cpp:
(Parser::parse):
(InterpreterImp::evaluate):
* kjs/internal.h:
(KJS::InterpreterImp::setDebugger):
* kjs/interpreter.cpp:
* kjs/interpreter.h:
(KJS::Interpreter::imp):
* kjs/nodes.cpp:
2005-07-27 Geoffrey Garen <ggaren@apple.com>
- fixed http://bugs.webkit.org/show_bug.cgi?id=3381
Date.prototype.setDate() incorrect for values >=128
- Test cases added:
* layout-tests/fast/js/date-big-setdate-expected.txt: Added.
* layout-tests/fast/js/date-big-setdate.html: Added.
Reviewed by darin.
* kjs/date_object.cpp:
(DateProtoFuncImp::call):
2005-07-27 Geoffrey Garen <ggaren@apple.com>
-rolled in patch by Carsten Guenther <cguenther@gmail.com>
for http://bugs.webkit.org/show_bug.cgi?id=3759
Date object enhancements
Test cases added:
* layout-tests/fast/js/date-preserve-milliseconds-expected.txt: Added.
* layout-tests/fast/js/date-preserve-milliseconds.html: Added.
Reviewed by darin.
* kjs/date_object.cpp:
(timeFromArgs):
(DateProtoFuncImp::call):
(DateObjectImp::construct):
(DateObjectFuncImp::call):
(KJS::makeTime):
* kjs/date_object.h:
* tests/mozilla/expected.html:
2005-07-26 Justin Garcia <justin.garcia@apple.com>
Added a forward declaration to fix gcc4 build error
* kjs/function.h:
2005-07-25 Geoffrey Garen <ggaren@apple.com>
- fixed mistake in my last checkin -- the expected results included
results from a patch that hasn't landed yet.
* tests/mozilla/expected.html:
2005-07-25 Maciej Stachowiak <mjs@apple.com>
- fix mistake in last change that leads to assertion failure in the Development build
* kjs/lookup.h:
(KJS::lookupGetOwnValue):
2005-07-24 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- http://bugs.webkit.org/show_bug.cgi?id=4124
(change JavaScript property access to avoid double lookup)
- 10% speedup on JavaScript iBench
- 5% speedup on 24fun BenchJS benchmark
Changed all get methods to getOwnProperty - they are no longer
responsible for prototype lookup, and determine if the property
was found as a side efect.
get() is now a nonvirtual ObjectImp method which calls the virtual
getOwnProperty and walks the prototype chain. A few selected
methods were inlined.
Changed ResolveNode::evaluate plus some other places to use
getProperty which does get() and hasProperty() in one lookup.
Also miscellaneous code cleanup.
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::ObjcFallbackObjectImp):
(ObjcFallbackObjectImp::getOwnProperty):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::RuntimeArrayImp):
(RuntimeArrayImp::getOwnProperty):
* bindings/runtime_array.h:
* bindings/runtime_method.cpp:
(RuntimeMethodImp::getOwnProperty):
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::getOwnProperty):
* bindings/runtime_object.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::getOwnProperty):
(ArrayPrototypeImp::getOwnProperty):
(ArrayProtoFuncImp::call):
* kjs/array_object.h:
* kjs/date_object.cpp:
(DatePrototypeImp::getOwnProperty):
* kjs/date_object.h:
* kjs/function.cpp:
(KJS::FunctionImp::getOwnProperty):
(KJS::ArgumentsImp::getOwnProperty):
(KJS::ActivationImp::getOwnProperty):
* kjs/function.h:
* kjs/lookup.h:
(KJS::lookupGetOwnProperty):
(KJS::lookupGetOwnFunction):
(KJS::lookupGetOwnValue):
* kjs/math_object.cpp:
(MathObjectImp::getOwnProperty):
(MathObjectImp::getValueProperty):
* kjs/math_object.h:
* kjs/nodes.cpp:
(ResolveNode::evaluate):
* kjs/number_object.cpp:
(NumberObjectImp::getOwnProperty):
* kjs/number_object.h:
* kjs/object.cpp:
(KJS::ObjectImp::get):
(KJS::ObjectImp::getOwnProperty):
(KJS::ObjectImp::getProperty):
* kjs/object.h:
(KJS::ObjectImp::getProperty):
(KJS::ObjectImp::getOwnProperty):
* kjs/object_object.cpp:
(ObjectProtoFuncImp::call):
* kjs/regexp_object.cpp:
(RegExpObjectImp::getOwnProperty):
* kjs/regexp_object.h:
* kjs/string_object.cpp:
(StringInstanceImp::getOwnProperty):
(StringPrototypeImp::getOwnProperty):
* kjs/string_object.h:
2005-07-25 Geoffrey Garen <ggaren@apple.com>
- fixed http://bugs.webkit.org/show_bug.cgi?id=3971
JS test suite depends on JS 1.2 behavior
Reviewed by darin.
* tests/mozilla/js1_2/Array/tostring_1.js: now tests only for JS 1.5 behavior
* tests/mozilla/js1_2/Array/tostring_2.js: ditto
* tests/mozilla/expected.html:
2005-07-24 Justin Garcia <justin.garcia@apple.com>
Reviewed by kevin.
Fixes make clean problem introduced in xcode2.1 transition
* Makefile.am:
2005-07-22 Geoffrey Garen <ggaren@apple.com>
Reviewed by darin.
* kjs/date_object.cpp: DatePrototypeImp now identifies itself as a
child class of DateInstanceImp -- this enables calls to Date.ValueOf().
fixes: ecma/Date/15.9.5.js (once we enable the date tests).
2005-07-22 Geoffrey Garen <ggaren@apple.com>
Reviewed by darin.
* tests/mozilla/jsDriver.pl: now takes the path to testkjs as a command-line argument
* tests/mozilla/run-mozilla-tests: Removed.
2005-07-21 Geoffrey Garen <ggaren@apple.com>
* JavaScriptCore.xcodeproj/.cvsignore: Added.
2005-07-21 Geoffrey Garen <ggaren@apple.com>
* JavaScriptCore.pbproj/project.pbxproj: Removed.
* JavaScriptCore.xcodeproj/ggaren.pbxuser: Added.
* JavaScriptCore.xcodeproj/ggaren.perspective: Added.
* JavaScriptCore.xcodeproj/project.pbxproj: Added.
* Makefile.am:
2005-07-20 Maciej Stachowiak <mjs@apple.com>
Patch from Trey Matteson <trey@usa.net>, reviewed by me.
- fixed http://bugs.webkit.org/show_bug.cgi?id=3956
some of WebKit builds with symbols, some doesn't
* JavaScriptCore.pbproj/project.pbxproj: Generate symbols even for
Deployment.
2005-07-19 Geoffrey Garen <ggaren@apple.com>
-fixed http://bugs.webkit.org/show_bug.cgi?id=3991
JSC doesn't implement Array.prototype.toLocaleString()
-test failure: ecma_3/Array/15.4.4.3-1.js
Reviewed by mjs.
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call): now searches for toString and
toLocaleString overrides in the array's elements
* tests/mozilla/expected.html: failures are under 100! woohoo!
2005-07-19 Darin Adler <darin@apple.com>
- fixed the build
* kjs/lookup.h: (KJS::lookupPut): Remove bogus const; was preventing WebCore from
compiling (not sure why this didn't affect my other build machine).
- one other tiny tweak (so sue me)
* bindings/runtime_root.cpp: Remove unneeded declaration.
2005-07-19 Darin Adler <darin@apple.com>
Reviewed by Geoff Garen.
- eliminated try wrappers for get/put/call since we don't use C++ exceptions any more
* kjs/lookup.h: Changed tryCall in IMPLEMENT_PROTOFUNC here to call. It doesn't make
sense for this macro to use the name tryCall anyway, since that's specific to how
WebCore used this, so this is good anyway. On the other hand, it might be a problem
for KDOM or KSVG, in which case we'll need another macro for them, since JavaScriptCore
should presumably not have the C++ exception support.
2005-07-18 Geoffrey Garen <ggaren@apple.com>
-fixed http://bugs.webkit.org/show_bug.cgi?id=4008
Error objects report incorrect length
Reviewed by darin.
* kjs/error_object.cpp: Error objects now include a length property
(ErrorObjectImp::ErrorObjectImp):
* tests/mozilla/expected.html: updated expected results to reflect fix
* tests/mozilla/js1_5/Exceptions/regress-123002.js: test now expects
ecma compliant results
2005-07-15 Geoffrey Garen <ggaren@apple.com>
-rolled in KDE fixes for http://bugs.webkit.org/show_bug.cgi?id=3601
Error instance type info
Reviewed by mjs.
* kjs/error_object.cpp:
- Created ErrorInstanceImp class for Error() objects.
- Changed parent object for Native Errors to "Function" (matches
ECMA spec).
(ErrorInstanceImp::ErrorInstanceImp):
(ErrorProtoFuncImp::call):
(ErrorObjectImp::construct):
(NativeErrorImp::construct):
* kjs/error_object.h:
(KJS::ErrorInstanceImp::classInfo):
* kjs/object.h: made comment more informative about ClassInfo
* tests/mozilla/expected.html:
2005-07-14 Geoffrey Garen <ggaren@apple.com>
- fixed: JS test suite expects an out of memory error
that our memory efficiency avoids
Reviewed by mjs.
* tests/mozilla/js1_5/Array/regress-157652.js:
test now expects normal execution
* tests/mozilla/expected.html:
2005-07-14 Geoffrey Garen <ggaren@apple.com>
- fixed http://bugs.webkit.org/show_bug.cgi?id=4006
testkjs doesn't implement gc()
- test failure:
ecma_3/Function/regress-104584.js
Reviewed by mjs.
* kjs/interpreter.cpp:
(Interpreter::finalCheck): removed misleading while && comment
* kjs/testkjs.cpp: added "gc" function to global object
(TestFunctionImp::):
(TestFunctionImp::call):
(main):
* tests/mozilla/expected.html:
2005-07-14 Geoffrey Garen <ggaren@apple.com>
-rolled in patches for http://bugs.webkit.org/show_bug.cgi?id=3945
[PATCH] Safe merges of comments and other trivialities from KDE's kjs
-patch by Martijn Klingens <klingens@kde.org>
* kjs/array_instance.h:
* kjs/array_object.cpp:
* kjs/array_object.h:
* kjs/bool_object.cpp:
* kjs/bool_object.h:
* kjs/collector.cpp:
* kjs/collector.h:
* kjs/completion.h:
* kjs/context.h:
* kjs/date_object.cpp:
* kjs/date_object.h:
* kjs/debugger.cpp:
* kjs/debugger.h:
* kjs/dtoa.h:
* kjs/error_object.cpp:
* kjs/error_object.h:
* kjs/function.cpp:
* kjs/function.h:
* kjs/function_object.cpp:
* kjs/function_object.h:
* kjs/grammar.y:
* kjs/identifier.cpp:
* kjs/identifier.h:
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/interpreter.cpp:
* kjs/interpreter.h:
* kjs/interpreter_map.cpp:
* kjs/interpreter_map.h:
* kjs/lexer.cpp:
* kjs/lexer.h:
* kjs/list.cpp:
* kjs/list.h:
* kjs/lookup.cpp:
* kjs/lookup.h:
* kjs/math_object.cpp:
* kjs/math_object.h:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/nodes2string.cpp:
* kjs/number_object.cpp:
* kjs/number_object.h:
* kjs/object.cpp:
* kjs/object.h:
* kjs/object_object.cpp:
* kjs/object_object.h:
* kjs/operations.cpp:
* kjs/operations.h:
* kjs/property_map.cpp:
* kjs/property_map.h:
* kjs/reference.cpp:
* kjs/reference.h:
* kjs/reference_list.cpp:
* kjs/reference_list.h:
* kjs/regexp.cpp:
* kjs/regexp.h:
* kjs/regexp_object.cpp:
* kjs/regexp_object.h:
* kjs/scope_chain.cpp:
* kjs/scope_chain.h:
* kjs/simple_number.h:
* kjs/string_object.cpp:
* kjs/string_object.h:
* kjs/testkjs.cpp:
* kjs/types.h:
* kjs/ustring.cpp:
* kjs/ustring.h:
* kjs/value.cpp:
* kjs/value.h:
2005-07-14 Geoffrey Garen <ggaren@apple.com>
-fixed http://bugs.webkit.org/show_bug.cgi?id=3970
throw statements fail inside eval statements
Reviewed by mjs.
* kjs/function.cpp:
(KJS::GlobalFuncImp::call):
Big change since I fixed the tabbing. The important part is:
if (c.complType() == Throw)
exec->setException(c.value());
* kjs/nodes.cpp:
(ThrowNode::execute): removed duplicate KJS_CHECKEXCEPTION
(TryNode::execute):
try now clears the exception state before the finally block executes,
and checks the state after the block executes, so that exceptions in
finally code get caught.
* tests/mozilla/expected.html:
2005-07-14 Geoffrey Garen <ggaren@apple.com>
-landed fix for http://bugs.webkit.org/show_bug.cgi?id=3412
Object.prototype is missing toLocaleString
- patch by Mark Rowe (bdash) <opendarwin.org@bdash.net.nz>
-layout test info in webcore changelog
Reviewed by mjs.
* kjs/object_object.cpp:
(ObjectPrototypeImp::ObjectPrototypeImp):
(ObjectProtoFuncImp::call):
* kjs/object_object.h:
(KJS::ObjectProtoFuncImp::):
2005-07-12 Geoffrey Garen <ggaren@apple.com>
Reviewed by mjs.
* kjs/function.cpp:
(KJS::IndexToNameMap::operator[]): fixed infinite recursion
bug in last checkin
2005-07-12 Geoffrey Garen <ggaren@apple.com>
-fixed http://bugs.webkit.org/show_bug.cgi?id=3881
arguments object should share values with function parameters
Reviewed by mjs.
ArgumentsImp now uses a simple hash lookup to share values
with the activation object.
* kjs/function.cpp:
(KJS::FunctionImp::getParameterName):
(KJS::IndexToNameMap::IndexToNameMap):
(KJS::IndexToNameMap::~IndexToNameMap):
(KJS::IndexToNameMap::isMapped):
(KJS::IndexToNameMap::unMap):
(KJS::IndexToNameMap::operator[]):
(KJS::ArgumentsImp::ArgumentsImp):
(KJS::ArgumentsImp::mark):
(KJS::ArgumentsImp::get):
(KJS::ArgumentsImp::put):
(KJS::ArgumentsImp::deleteProperty):
(KJS::ArgumentsImp::hasOwnProperty):
(KJS::ActivationImp::createArgumentsObject):
* kjs/function.h:
* tests/mozilla/expected.html: updated results
2005-07-09 Maciej Stachowiak <mjs@apple.com>
- backing out my earlier collector change, it causes a performance regression in TOT
* kjs/collector.cpp:
(KJS::Collector::allocate):
2005-07-08 Eric Seidel <eseidel@apple.com>
Reviewed by mjs/hyatt (only in concept).
* JavaScriptCore.pbproj/project.pbxproj: Added JavaScriptCore+SVG
Turns on RTTI support for JavaScriptCore.framework when
building the JavaScriptCore+SVG target. This is needed as
kdom (part of WebCore+SVG) requires RTTI for the time being.
2005-07-08 Maciej Stachowiak <mjs@apple.com>
Reviewed by hyatt.
- When there are many live objects, GC less often, to try to make
GC cost proportional to garbage, not proportional to total memory used.
* kjs/collector.cpp:
(KJS::Collector::allocate):
2005-07-08 Vicki Murley <vicki@apple.com>
Fix from Carsten Guenther, reviewed by Maciej
- fixed http://bugs.webkit.org/show_bug.cgi?id=3644 (Error string representation)
Switch from "-" to ":" in error strings.
* kjs/error_object.cpp:
(ErrorProtoFuncImp::call):
* tests/mozilla/expected.html:
2005-07-08 Geoffrey Garen <ggaren@apple.com>
-rolled in patch for http://bugs.webkit.org/show_bug.cgi?id=3878
arguments object should be an object not an array
Reviewed by mjs.
* kjs/function.cpp:
(KJS::ArgumentsImp::ArgumentsImp): now manually handles initialization
we used to get for free by inheriting from ArrayInstanceImp
* kjs/function.h: ArgumentsImp now inherits from ObjectImp
* tests/mozilla/expected.html: updated expected test results
2005-07-07 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
* kjs/grammar.y: removed #define YYMAXDEPTH 0 for bison 2.0
http://bugs.webkit.org/show_bug.cgi?id=3882
2005-07-03 Maciej Stachowiak <mjs@apple.com>
Original patch from Mark Rowe <opendarwin.org@bdash.net.nz>, reviewed by me.
Fixes to patch by me, reviewed by John Sullivan.
- fixed http://bugs.webkit.org/show_bug.cgi?id=3293
Test cases added:
* tests/mozilla/expected.html: Two tests newly pass.
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::hasOwnProperty):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::hasOwnProperty):
* bindings/runtime_array.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::hasOwnProperty):
* bindings/runtime_object.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::hasOwnProperty):
* kjs/function.cpp:
(KJS::FunctionImp::hasOwnProperty):
(KJS::ActivationImp::hasOwnProperty):
* kjs/function.h:
* kjs/lookup.h:
* kjs/object.cpp:
(KJS::ObjectImp::hasProperty):
(KJS::ObjectImp::hasOwnProperty):
* kjs/object.h:
(KJS::Object::hasOwnProperty):
* kjs/object_object.cpp:
(ObjectPrototypeImp::ObjectPrototypeImp):
(ObjectProtoFuncImp::call):
* kjs/object_object.h:
(KJS::ObjectProtoFuncImp::):
* kjs/string_object.cpp:
(StringInstanceImp::hasOwnProperty):
* kjs/string_object.h:
2005-07-01 Geoffrey Garen <ggaren@apple.com>
-landed patch by Eric Seidel <macdome@opendarwin.org>
-for http://bugs.webkit.org/show_bug.cgi?id=3657
GroundWork: Moving some functions from khtml->jsc following kjs TOT
- no layout test necessary yet - only groundwork
Reviewed by darin.
* kjs/lookup.h:
(KJS::cacheGlobalObject):
2005-07-01 Geoffrey Garen <ggaren@apple.com>
-landed patch by Carsten Guenther <cguenther@gmail.com>
-fixes http://bugs.webkit.org/show_bug.cgi?id=3477
some US-centric date formats not parsed by JavaScript (clock at news8austin.com)
-relevant tests:
mozilla/ecma_3/Date/15.9.5.5.js
layout-tests/fast/js/date-parse-test.html
Reviewed by darin.
* kjs/date_object.cpp:
(formatLocaleDate):
(day):
(dayFromYear):
(daysInYear):
(timeFromYear):
(yearFromTime):
(weekDay):
(timeZoneOffset):
(DateProtoFuncImp::call):
(DateObjectImp::construct):
(KJS::parseDate):
(ymdhms_to_seconds):
(KJS::makeTime):
(findMonth):
(KJS::KRFCDate_parseDate):
* kjs/date_object.h:
* tests/mozilla/expected.html: updated expected results to reflect fix
2005-07-01 Geoffrey Garen <ggaren@apple.com>
-fixed <rdar://problem/4168186> JavaScript fails to throw exceptions
for invalid return statements
relevant tests:
ecma/Statements/12.9-1-n.js
ecma_2/Exceptions/lexical-052.js
ecma_2/Exceptions/statement-009.js
Reviewed by sullivan.
* kjs/nodes.cpp:
(ReturnNode::execute): now throws exception if return is not inside
a function.
* tests/mozilla/expected.html: updated to reflect fix
2005-07-01 Geoffrey Garen <ggaren@apple.com>
Reviewed by sullivan.
* tests/mozilla/expected.html: Updated test results for last fix.
2005-07-01 Geoffrey Garen <ggaren@apple.com>
-fixed <rdar://problem/4168161> JavaScript fails to throw an exception
for invalid function calls
Reviewed by sullivan.
Relevant mozilla test: ecma_3/Exceptions/regress-95101.js
* kjs/nodes.cpp:
(FunctionCallNode::evaluate): evaluate now checks for an exception
after resolving a function name (in case the function is undefined)
2005-07-01 Eric Seidel <eseidel@apple.com>
Reviewed by darin.
* kjs/interpreter.h:
(KJS::Context::curStmtFirstLine): stub for compatibility with KDE
* kjs/value.h:
(KJS::Value::isValid): compatibility with KDE
http://bugs.webkit.org/show_bug.cgi?id=3687
2005-07-01 Eric Seidel <eseidel@apple.com>
Reviewed by darin.
* kjs/create_hash_table: rolled in changes from KDE, including
-n <namespace> support from KDOM and support for newer comments
http://bugs.webkit.org/show_bug.cgi?id=3771
2005-06-30 Geoffrey Garen <ggaren@apple.com>
-rolled in KDE fix to <rdar://problem/4167660> JavaScript fails to
throw exceptions for invalid break/continue statements
No layout tests because it's already covered by the Mozilla suite
Reviewed by mjs.
* kjs/internal.h: LabelStack now tracks where you are relative to
switch and iteration (loop) statements
(KJS::LabelStack::LabelStack):
(KJS::LabelStack::pushIteration):
(KJS::LabelStack::popIteration):
(KJS::LabelStack::inIteration):
(KJS::LabelStack::pushSwitch):
(KJS::LabelStack::popSwitch):
(KJS::LabelStack::inSwitch):
* kjs/nodes.cpp:
These files were updated to use the new LabelStack:
(DoWhileNode::execute):
(WhileNode::execute):
(ForNode::execute):
(ForInNode::execute):
(SwitchNode::execute):
These files were updated to throw exceptions for invalid
break/continue statements:
(BreakNode::execute):
(ContinueNode::execute):
* tests/mozilla/expected.html: Updated expected results to reflect fix
2005-06-30 Kevin Decker <kdecker@apple.com>
Reviewed by rjw.
fixed: <rdar://problem/4166838> failed assertion in`Interpreter::lockCount() > 0
no layout test added; this is in the bindings code.
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]): make sure to lock and unlock the interpreter around allocations.
2005-06-29 Geoffrey Garen <ggaren@apple.com>
Patch by Francisco Tolmasky <tolmasky@gmail.com>
- fixes http://bugs.webkit.org/show_bug.cgi?id=3667
Core JavaScript 1.5 Reference:Objects:Array:forEach
See WebCore Changelog for layout tests added.
Reviewed by darin.
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call):
* kjs/array_object.h:
(KJS::ArrayProtoFuncImp::):
2005-06-29 Geoffrey Garen <ggaren@apple.com>
Patch contributed by Oliver Hunt <ojh16@student.canterbury.ac.nz>
-fixed http://bugs.webkit.org/show_bug.cgi?id=3743
Incorrect error message given for certain calls
See WebCore Changelog for layout test added.
Reviewed by mjs.
* kjs/object.cpp:
(KJS::ObjectImp::defaultValue):
2005-06-29 Geoffrey Garen <ggaren@apple.com>
Rolling out date patch from 6-28-05 because it breaks
fast/js/date-parse-test
* kjs/date_object.cpp:
(formatLocaleDate):
(DateProtoFuncImp::call):
(DateObjectImp::construct):
(KJS::parseDate):
(ymdhms_to_seconds):
(isSpaceOrTab):
(KJS::KRFCDate_parseDate):
* kjs/date_object.h:
* tests/mozilla/expected.html:
2005-06-29 Geoffrey Garen <ggaren@apple.com>
Reviewed by Darin.
-fixes http://bugs.webkit.org/show_bug.cgi?id=3750
build fails with KJS_VERBOSE set
* kjs/nodes.cpp: changed debug print statement to use UString
(VarDeclNode::evaluate):
* kjs/reference.cpp: ditto
(KJS::Reference::putValue):
2005-06-28 Geoffrey Garen <ggaren@apple.com>
Patch contributed by Carsten Guenther <cguenther@gmail.com>.
-fixes http://bugs.webkit.org/show_bug.cgi?id=3477
some US-centric date formats not parsed by JavaScript (clock at news8austin.com)
Reviewed by darin.
* kjs/date_object.cpp:
(formatLocaleDate):
(day):
(dayFromYear):
(daysInYear):
(timeFromYear):
(yearFromTime):
(weekDay):
(timeZoneOffset):
(DateProtoFuncImp::call):
(DateObjectImp::construct):
(KJS::parseDate):
(ymdhms_to_seconds):
(KJS::makeTime):
(findMonth):
(KJS::KRFCDate_parseDate):
* kjs/date_object.h:
* tests/mozilla/expected.html: updated expected test results to reflect fix
2005-06-26 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- replace hash functions with better ones
* JavaScriptCore.pbproj/project.pbxproj: Add new file to build.
* kjs/interpreter_map.cpp:
(KJS::InterpreterMap::computeHash): Use shared pointer hash.
* kjs/pointer_hash.h: Added.
(KJS::pointerHash): Pointer hash based on 32-bit mix and 64-bit mix hashes.
* kjs/protected_values.cpp:
(KJS::ProtectedValues::computeHash): Use shared pointer hash.
* kjs/ustring.cpp:
(KJS::UString::Rep::computeHash): Use SuperFastHash algorithm.
2005-06-22 Darin Adler <darin@apple.com>
Change by Anders Carlsson.
Reviewed by me.
- fixed <http://bugs.webkit.org/show_bug.cgi?id=3294>
String.prototype.replace() fails with function as second param
* kjs/string_object.cpp: (replace): Added code to handle functions.
* tests/mozilla/expected.html: Updated since ecma_3/RegExp/regress-209067.js is fixed now.
* tests/mozilla/run-mozilla-tests: Fix a minor coding style issue that leads to a warning each
time we run the tests.
2005-06-21 Adele Peterson <adele@apple.com>
rolling out fix for http://bugs.webkit.org/show_bug.cgi?id=3293, since it caused layout test failures.
fast/forms/element-by-name
fast/loader/loadInProgress
* ChangeLog:
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::hasProperty):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::hasProperty):
* bindings/runtime_array.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::hasProperty):
* bindings/runtime_object.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::hasProperty):
* kjs/function.cpp:
(KJS::FunctionImp::hasProperty):
(KJS::ActivationImp::hasProperty):
* kjs/function.h:
* kjs/object.cpp:
(KJS::ObjectImp::hasProperty):
* kjs/object.h:
* kjs/object_object.cpp:
(ObjectPrototypeImp::ObjectPrototypeImp):
(ObjectProtoFuncImp::call):
* kjs/object_object.h:
(KJS::ObjectProtoFuncImp::):
* kjs/string_object.cpp:
(StringInstanceImp::hasProperty):
* kjs/string_object.h:
* tests/mozilla/expected.html:
2005-06-21 Darin Adler <darin@apple.com>
* JavaScriptCore.pbproj/project.pbxproj: Switched to a build rule rather than a build phase for
.y files -- this gets rid of the problem where modifying the .y file would not cause sufficient
compilation.
* kjs/grammar_wrapper.cpp: Removed.
2005-06-21 Adele Peterson <adele@apple.com>
Patch from Anders Carlsson <andersca@mac.com>, reviewed by Darin.
Fixed: <http://bugs.webkit.org/show_bug.cgi?id=3450>
<rdar://problem/3881901> String.replace() method not working when regex pattern contains {n, m}
* pcre/pcre.c: (pcre_compile): Remember the last char length so it can be subtracted correctly if needed.
2005-06-21 Geoffrey Garen <ggaren@apple.com>
- fixed <rdar://problem/4155532> 'delete' succeeds on functions
- fixed <rdar://problem/4155049> javascript function named as "opener" doesn't get called because of window.opener property
Reviewed by cblu.
* kjs/nodes.cpp:
(FuncDeclNode::processFuncDecl): Functions now have DontDelete and Internal attributes set when appropriate.
Test cases:
* tests/mozilla/expected.html: Updated for one new success.
- see also test case added in WebCore.
2005-06-20 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin(first pass) and Hyatt.
- fixed http://bugs.webkit.org/show_bug.cgi?id=3576
(roll in support for "const" keyword from KDE tree)
- make processVarDecls handle deletability of variables declared
in an eval block the same as evaluate would
- make eval() call processVarDecls - needed to match mozilla and
to make the second change testable
I started with the KDE implementation of const but I ended up changing it a bit
to avoid the use of a global variable. Now instead of the global variable it distinguishes
const and var at the grammar level so the appropriate node can know the right kind of
declaration.
Test cases:
* tests/mozilla/expected.html: Updated for one new test that is
failing - we used to bail on it entirely because it checks for
const support before starting.
- see also test cases added in WebCore
* kjs/grammar.y: Add rules for const declarations.
* kjs/keywords.table: Add const keyword.
* kjs/nodes.cpp:
(VarDeclNode::VarDeclNode): Add parameter.
(VarDeclNode::evaluate): Add const support.
(VarDeclNode::processVarDecls): Add const support.
(VarStatementNode::execute): Irrelevant change.
(ForInNode::ForInNode): Tell our variable node that it's a variable.
* kjs/nodes.h:
(KJS::VarDeclNode::): Add declaration of type enum, extra constructor parameter.
(KJS::VarStatementNode::VarStatementNode): Irrelevant change.
* kjs/function.cpp:
(KJS::GlobalFuncImp::call): Process var decls before evaluating.
2005-06-20 Maciej Stachowiak <mjs@apple.com>
Patch from Mark Rowe <opendarwin.org@bdash.net.nz>, reviewed by me.
- fixed http://bugs.webkit.org/show_bug.cgi?id=3293
Test cases added:
* tests/mozilla/expected.html: Updated for two fixed tests.
- also added a layout test
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::hasOwnProperty):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::hasOwnProperty):
* bindings/runtime_array.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::hasOwnProperty):
* bindings/runtime_object.h:
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::hasOwnProperty):
* kjs/function.cpp:
(KJS::FunctionImp::hasOwnProperty):
(KJS::ActivationImp::hasOwnProperty):
* kjs/function.h:
* kjs/object.cpp:
(KJS::ObjectImp::hasProperty):
(KJS::ObjectImp::hasOwnProperty):
* kjs/object.h:
(KJS::Object::hasOwnProperty):
* kjs/object_object.cpp:
(ObjectPrototypeImp::ObjectPrototypeImp):
(ObjectProtoFuncImp::call):
* kjs/object_object.h:
(KJS::ObjectProtoFuncImp::):
* kjs/string_object.cpp:
(StringInstanceImp::hasOwnProperty):
* kjs/string_object.h:
2005-06-18 Darin Adler <darin@apple.com>
Reviewed by Eric Seidel.
* pcre/get.c: (pcre_get_substring): Fix some computations so this works for UTF-16.
This is unused in the current JavaScriptCore, but still good to fix.
2005-06-18 Darin Adler <darin@apple.com>
Change by Finlay Dobbie.
Reviewed by me.
- fixed <http://bugs.webkit.org/show_bug.cgi?id=3331>
10.3.9 Build Failure: NSString may not respond to `+stringWithCString:encoding:'
* bindings/objc/WebScriptObject.mm: (-[WebScriptObject stringRepresentation]):
Undo change we did a while back to work around the gcc 3.3 compiler error.
It no longer seems to happen, and the workaround code was 10.4-specific.
2005-06-16 Geoffrey Garen <ggaren@apple.com>
Fixed: <rdar://problem/4151759> 'delete' fails on variables declared inside 'eval' statements.
Reviewed by cblu.
* kjs/context.h:
(KJS::ContextImp::codeType): Added code type accessor for execution context objects.
* kjs/internal.cpp:
(ContextImp::ContextImp): Reflects change to ContextImp::codeType.
* kjs/nodes.cpp:
(VarDeclNode::evaluate): Added separate code path for variable declarations inside 'eval' statements.
* tests/mozilla/expected.html: Updated expected test results to reflect fix.
2005-06-14 Geoffrey Garen <ggaren@apple.com>
Updated expected.html to reflect fix to <rdar://problem/4147745>.
Reviewed by cblu.
* tests/mozilla/expected.html:
2005-06-14 Geoffrey Garen <ggaren@apple.com>
Fixed: <rdar://problem/4147745> JavaScript discards locally defined "arguments" property
No layout tests added because this change fixes existing tests:
ecma/ExecutionContexts/10.1.6.js
ecma_3/Function/regress-94506.js
js1_4/Functions/function-001.js
Reviewed by cblu.
* kjs/function.cpp:
(KJS::ActivationImp::get): get now checks for an "arguments" property defined in the local variable object
before trying to return the built-in arguments array.
* kjs/function.h: ActivationImp::put no longer overrides ObjectImp::put
2005-06-10 Darin Adler <darin@apple.com>
Change by Mark Rowe <opendarwin.org@bdash.net.nz>.
Reviewed by me.
- further improvements to exception file/line number fix
* kjs/nodes.h: Added setExceptionDetailsIfNeeded function.
* kjs/nodes.cpp: Updated macros to call the new setExceptionDetailsIfNeeded function.
(Node::setExceptionDetailsIfNeeded): Added.
2005-06-09 Darin Adler <darin@apple.com>
Change by Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by me.
* kjs/nodes.cpp: Get rid of unneeded this->.
2005-06-08 Maciej Stachowiak <mjs@apple.com>
Change by Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by me.
- fixed http://bugs.webkit.org/show_bug.cgi?id=3327
(Exception When Setting Style to Invalid Value Lacks Line/File Information)
* kjs/nodes.cpp: Include source file and line number when making exception in
KJS_CHECKEXCEPTIONVALUE.
2005-06-07 Darin Adler <darin@apple.com>
Change by Toby Peterson <toby@opendarwin.org>.
Reviewed by me.
* JavaScriptCore.pbproj/project.pbxproj: Allow bison 2.0, which generates the file
with a different name.
2005-06-07 Darin Adler <darin@apple.com>
Change by Toby Peterson <toby@opendarwin.org>.
Reviewed by me.
* kjs/grammar.y: Remove bogus extra line from grammar.y. Toby got this change from KDE KJS.
2005-06-06 Darin Adler <darin@apple.com>
* tests/mozilla/run-mozilla-tests: Wrote a perl version of this so we don't require
the "jst" tool to run the tests.
2005-06-04 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- add libicu headers
* JavaScriptCore.pbproj/project.pbxproj: Added icu directory to header search path.
* icu/README: Added.
* icu/unicode/platform.h: Added.
* icu/unicode/uchar.h: Added.
* icu/unicode/uconfig.h: Added.
* icu/unicode/umachine.h: Added.
* icu/unicode/urename.h: Added.
* icu/unicode/utf.h: Added.
* icu/unicode/utf16.h: Added.
* icu/unicode/utf8.h: Added.
* icu/unicode/utf_old.h: Added.
* icu/unicode/utypes.h: Added.
* icu/unicode/uversion.h: Added.
2005-05-19 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- turned off exceptions and RTTI; seems to cut JavaScriptCore code size by about 22%
* JavaScriptCore.pbproj/project.pbxproj: Turn off exceptions and RTTI for both
the framework and testkjs tool.
2005-05-18 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- got rid of code that depended on RTTI
* kjs/collector.cpp:
(KJS::className): Added. Gets class name in a KJS way, rather than a C++ RTTI way.
(KJS::Collector::rootObjectClasses): Use className instead of typeid names.
2005-05-18 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fix a failure seen in the Mozilla JavaScript tests where a live object was garbage-collected
when the only reference to it was in an argList on the stack
* kjs/list.h: Moved the operator= function into the .cpp file since it's too big to be
a good choice to inline.
* kjs/list.cpp: (KJS::List::operator=): Moved this formerly-inline function into a separate
file and added missing code to update valueRefCount. It's the latter that fixes the bug.
2005-05-16 Darin Adler <darin@apple.com>
Reviewed by Adele.
- fixed issues preventing us from compiling with newer versions of gcc 4.0
* kjs/ustring.cpp:
(KJS::operator==): Remove redundant and illegal KJS:: prefix on this function's definition.
(KJS::operator<): Ditto.
(KJS::compare): Ditto.
2005-05-09 Darin Adler <darin@apple.com>
Reviewed by John.
- turn on conservative GC unconditionally and start on SPI changes to
eliminate the now-unneeded smart pointers since we don't ref count any more
* kjs/value.h: Removed macros to turn conservative GC on and off.
Removed ref and deref functions.
(KJS::ValueImp::ValueImp): Removed non-conservative-GC code path.
(KJS::ValueImp::isUndefined): Added. New SPI to make it easier to deal with ValueImp directly.
(KJS::ValueImp::isNull): Ditto.
(KJS::ValueImp::isBoolean): Ditto.
(KJS::ValueImp::isNumber): Ditto.
(KJS::ValueImp::isString): Ditto.
(KJS::ValueImp::isObject): Ditto.
(KJS::Value::Value): Removed non-conservative-GC code path and made constructor no
longer explicit so we can quietly create Value wrappers from ValueImp *; inexpensive with
conservative GC and eases the transition.
(KJS::Value::operator ValueImp *): Added. Quietly creates ValueImp * from Value.
(KJS::ValueImp::marked): Removed non-conservative-GC code path.
* kjs/value.cpp:
(KJS::ValueImp::mark): Removed non-conservative-GC code path.
(KJS::ValueImp::isUndefinedOrNull): Added. New SPI to make it easier to deal with ValueImp directly.
(KJS::ValueImp::isBoolean): Ditto.
(KJS::ValueImp::isNumber): Ditto.
(KJS::ValueImp::isString): Ditto.
(KJS::ValueImp::asString): Ditto.
(KJS::ValueImp::isObject): Ditto.
(KJS::undefined): Ditto.
(KJS::null): Ditto.
(KJS::boolean): Ditto.
(KJS::string): Ditto.
(KJS::zero): Ditto.
(KJS::one): Ditto.
(KJS::two): Ditto.
(KJS::number): Ditto.
* kjs/object.h: Made constructor no longer explicit so we can quietly create Object
wrappers from ObjectImp *; inexpensive with conservative GC and eases the transition.
(KJS::Object::operator ObjectImp *): Added. Quietly creates ObjectImp * from Object.
(KJS::ValueImp::isObject): Added. Implementation of new object-related ValueImp function.
(KJS::ValueImp::asObject): Ditto.
* kjs/object.cpp:
(KJS::ObjectImp::setInternalValue): Remove non-conservative-GC code path.
(KJS::ObjectImp::putDirect): Ditto.
(KJS::error): Added. Function in the new SPI style to create an error object.
* kjs/internal.h: Added the new number-constructing functions as friends of NumberImp.
There may be a more elegant way to do this later; what's important now is the new SPI.
* kjs/collector.h: Remove non-conservative-GC code path and also take out some
unneeded APPLE_CHANGES.
* bindings/runtime_root.cpp:
(KJS::Bindings::addNativeReference): Remove non-conservative-GC code path.
(KJS::Bindings::removeNativeReference): Ditto.
(RootObject::removeAllNativeReferences): Ditto.
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::~RootObject): Ditto.
(KJS::Bindings::RootObject::setRootObjectImp): Ditto.
* kjs/collector.cpp:
(KJS::Collector::allocate): Ditto.
(KJS::Collector::collect): Ditto.
(KJS::Collector::numGCNotAllowedObjects): Ditto.
(KJS::Collector::numReferencedObjects): Ditto.
(KJS::Collector::rootObjectClasses): Ditto.
* kjs/internal.cpp:
(NumberImp::create): Ditto.
(InterpreterImp::globalInit): Ditto.
(InterpreterImp::globalClear): Ditto.
* kjs/list.cpp:
(KJS::List::markProtectedLists): Ditto.
(KJS::List::clear): Ditto.
(KJS::List::append): Ditto.
* kjs/list.h:
(KJS::List::List): Ditto.
(KJS::List::deref): Ditto.
(KJS::List::operator=): Ditto.
* kjs/protect.h:
(KJS::gcProtect): Ditto.
(KJS::gcUnprotect): Ditto.
2005-05-09 Chris Blumenberg <cblu@apple.com>
Workaround gcc 3.3 internal compiler errors.
Reviewed by darin.
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject stringRepresentation]): call [NSString stringWithCString:encoding] rather than using @""
2005-05-09 Darin Adler <darin@apple.com>
* Makefile.am: Don't set up PBXIntermediatesDirectory explicitly;
Not needed to make builds work, spews undesirable error messages too.
2005-05-06 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- make building multiple trees with make work better
* Makefile.am: Set up Xcode build directory before invoking xcodebuild.
2005-05-04 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
<rdar://problem/4086570> Crash in JavaScriptCore with RSS Visualizer
* kjs/internal.cpp:
(InterpreterImp::mark): mark staticNaN, it is usually protected by the Number
prototype but there is a small window where it can get collected.
2005-05-04 Darin Adler <darin@apple.com>
Reviewed by Dave Hyatt.
- another gcc-4.0-related fix
* bindings/runtime_root.h: Take off extra namespace prefixes that apparently cause problems
compiling with gcc 4.0, although I have not observed the problems.
2005-05-04 Darin Adler <darin@apple.com>
Reviewed by Dave Hyatt.
- fixed build rules to match other projects
* JavaScriptCore.pbproj/project.pbxproj: Set deployment target to 10.3 in the build styles.
When built without a build style (by Apple B&I) we want to get the target from the
environment. But when built with a build style (by Safari engineers and others), we want
to use 10.3.
* Makefile.am: Took out extra parameters that make command-line building different from
Xcode building. Now that this is fixed, you should not get a full rebuild if you switch
from command line to Xcode or back.
2005-05-04 Maciej Stachowiak <mjs@apple.com>
- revert presumably accidental change to mozilla JS test expected results, this
was making the tests fail.
* tests/mozilla/expected.html:
2005-05-03 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/4102644> Crash in LiveConnect below KJS::Bindings::JavaInstance::stringValue() const
Correctly handle accessing nil objects from a Java object array.
Reviewed by John.
* bindings/jni/jni_runtime.cpp:
(JavaArray::valueAt):
2005-05-01 Darin Adler <darin@apple.com>
- move to Xcode native targets and stop checking in generated files
* JavaScriptCore.pbproj/project.pbxproj: Updated to use native targets and generate all the generated
files, so we don't have to check them in any more.
* Info.plist: Added. Native targets use a separate file for this.
* Makefile.am: Removed pcre and kjs SUBDIRS. Also removed code that deleted the embedded copy of this
framework, since we haven't been embedding it for some time.
* kjs/grammar_wrapper.cpp: Added. Shell used to compile grammar.cpp since we can't add a generated file
easily to the list of files to be compiled.
* kjs/.cvsignore: Removed.
* kjs/Makefile.am: Removed.
* kjs/array_object.lut.h: Removed.
* kjs/date_object.lut.h: Removed.
* kjs/grammar.cpp: Removed.
* kjs/grammar.cpp.h: Removed.
* kjs/grammar.h: Removed.
* kjs/lexer.lut.h: Removed.
* kjs/math_object.lut.h: Removed.
* kjs/number_object.lut.h: Removed.
* kjs/string_object.lut.h: Removed.
* pcre/.cvsignore: Removed.
* pcre/Makefile.am: Removed.
* pcre/chartables.c: Removed.
2005-04-28 Darin Adler <darin@apple.com>
Reviewed by Dave Harrison.
- fixed problems preventing us from compiling with gcc 4.0
* JavaScriptCore.pbproj/project.pbxproj: Removed -Wmissing-prototypes from
WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.
* bindings/jni/jni_jsobject.cpp:
(JSObject::getSlot): Changed some %d to %ld where the parameters where long ints.
(JSObject::setSlot): Ditto.
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJavaVM): Ditto.
(KJS::Bindings::getJNIEnv): Ditto.
* bindings/objc/objc_utility.mm: Fixed include of <JavascriptCore/internal.h> that needed the
letter "S" capitalized.
* kjs/bool_object.cpp: (BooleanProtoFuncImp::call): Rearranged how this function returns to
avoid incorrect gcc 4.0 warning.
* kjs/collector.cpp: (KJS::Collector::markStackObjectsConservatively): Changed code to check
the alignment of the passed-in pointers to only require pointer-level alignment, not 8-byte alignment.
Prevents a crash on garbage collect when compiled with gcc 4.0.
* kjs/nodes.cpp:
(WhileNode::execute): Added a redundant return after an infinite loop to work around incorrect gcc 4.0 warning.
(ForNode::execute): Ditto.
(SwitchNode::execute):Rearranged how this function returns to avoid incorrect gcc 4.0 warning.
(LabelNode::execute): Ditto.
* kjs/string_object.cpp: (replace): Ditto.
2005-04-26 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/4098713> Scripting API is incompatible with Mozilla
We were incompatible with Mozilla's implementation of the scripting APIs in
two ways:
Their NPN_SetException has the following signature:
void NPN_SetException(NPObject *npobj, const NPUTF8 *message);
ours has:
void NPN_SetException (NPObject * npobj, const NPString *message);
Also, they expect the string returned from NPN_UTF8FromIdentifier() to be freed by caller.
We do not.
I changed both behaviors to match Mozilla.
Reviewed by Chris.
* bindings/NP_jsobject.cpp:
(_NPN_SetException):
* bindings/npruntime.cpp:
(_NPN_UTF8FromIdentifier):
(_NPN_IntFromIdentifier):
(_NPN_SetExceptionWithUTF8):
* bindings/npruntime.h:
* bindings/npruntime_impl.h:
2005-04-26 Maciej Stachowiak <mjs@apple.com>
Reviewed by Chris.
<rdar://problem/4092136> reproducible crash in KJS::kjs_fast_realloc loading maps.google.com
* kjs/string_object.cpp:
(StringObjectFuncImp::call): Allocate adopted ustring buffer properly.
2005-04-22 Darin Adler <darin@apple.com>
Reviewed by Maciej.
* kjs/ustring.cpp: (KJS::UString::UTF8String): Fix off-by-one error in surrogate pair logic.
2005-04-22 Darin Adler <darin@apple.com>
Reviewed by John.
- fixed <rdar://problem/4090046> JavaScript throw statement causes parse error when no semicolon is present
* kjs/grammar.y: Added an additional rule for throw like the ones we have for all the other semicolon rules.
Not sure why we missed this one earlier.
* kjs/grammar.cpp: Regenerated.
=== JavaScriptCore-412.1 ===
2005-04-20 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- speedups, total 12% on JavaScript iBench
I ran the benchmark under Shark and followed its advice a lot, mainly.
* kjs/collector.cpp:
(KJS::Collector::allocate): Take out special case for 0; costing speed but unexercised.
Use numLiveObjectsAtLastCollect instead of numAllocationsSinceLastCollect so we don't
have to bump it each time we call allocate. Put numLiveObjects into a local variable to
cut down on global variable accesses. Make "next" cell pointer be a byte offset rather
than a pointer so we don't need a special case for NULL. Allow freeList to point to some
bogus item when the entire block is full rather than going out of our way to make it
point to NULL.
(KJS::Collector::markProtectedObjects): Get table size and pointer into locals outside
the loop to avoid re-loading them over and over again.
(KJS::Collector::collect): Put numLiveObjects into a local variable to cut down on global
variable accesses. Make "next" cell pointer be a byte offset as above. Put numLiveObjects
into a local variable to cut down on global variable accesses. Set numLiveObjectsAtLastCollect
rather than numAllocationsSinceLastCollect.
(KJS::Collector::numReferencedObjects): Get table size and pointer into locals outside
the loop to avoid re-loading them over and over again.
(KJS::Collector::rootObjectClasses): Ditto.
* kjs/internal.h: Make Value be a friend of NumberImp so it can construct number objects
directly, avoiding the conversion from Number to Value.
* kjs/internal.cpp: (StringImp::toObject): Don't use Object::dynamicCast, because we know
the thing is an object and we don't want to do all the extra work; just cast directly.
* kjs/list.cpp: (KJS::List::List): Construct valueRefCount in a way that avoids the need for
a branch -- in the hot case this just meant avoiding checking a variable we just set to false.
* kjs/lookup.cpp: (keysMatch): Marked this inline.
* kjs/nodes.cpp: Disabled KJS_BREAKPOINT, to avoid calling hitStatement all the time.
(BooleanNode::evaluate): Make a Value directly, rather than making a Boolean which is converted
into a Value.
(NumberNode::evaluate): Ditto.
(StringNode::evaluate): Ditto.
(ArrayNode::evaluate): Ditto.
(FunctionCallNode::evaluate): Use new inline baseIfMutable to avoid unnecessary getBase function.
Also just use a pointer for func, rather than an Object.
(PostfixNode::evaluate): Change code so that it doesn't make an excess Number, and so that it
passes a "known to be integer" boolean in, often avoiding a conversion from floating point to
integer and back.
(DeleteNode::evaluate): Make a Value directly.
(TypeOfNode::evaluate): Use new inline baseIfMutable and make Value directly.
(PrefixNode::evaluate): Change code so that it doesn't make an excess Number, and so that it
passes a "known to be integer" boolean in, often avoiding a conversion from floating point to
integer and back.
(UnaryPlusNode::evaluate): Make a Value directly.
(NegateNode::evaluate): Change code so that it doesn't make an excess Number, and so that it
passes a "known to be integer" boolean in, often avoiding a conversion from floating point to
integer and back.
(BitwiseNotNode::evaluate): Make a Value directly.
(LogicalNotNode::evaluate): Ditto.
(ShiftNode::evaluate): Don't convert to a double before making a Value.
(RelationalNode::evaluate): Make a Value directly.
(EqualNode::evaluate): Ditto.
(BitOperNode::evaluate): Ditto.
(AssignNode::evaluate): Make a Value directly. Change code so that it passes a "known to be integer"
boolean in, often avoiding a conversion from floating point to integer and back.
(VarDeclNode::evaluate): Make a Value directly.
(ForNode::execute): Remove unused local variable.
* kjs/operations.h:
(KJS::isNaN): Inlined.
(KJS::isInf): Ditto.
(KJS::isPosInf): Ditto.
(KJS::isNegInf): Ditto.
* kjs/operations.cpp: Change isNaN, isInf, isPosInf, and isNegInf to be inlines.
(KJS::equal): Rewrite to avoid creating values and recursing back into the function.
(KJS::relation): Rearranged code so that we don't need explicit isNaN checks.
(KJS::add): Changed code to make Value directly, and so that it passes a "known to be integer"
boolean in, often avoiding a conversion from floating point to integer and back.
(KJS::mult): Ditto.
* kjs/property_map.cpp:
(KJS::PropertyMap::~PropertyMap): Get size and entries pointer outside loop to avoid
re-getting them inside the loop.
(KJS::PropertyMap::clear): Ditto. Clear value pointer in addition to key, so we can just
look at the value pointer in the mark function.
(KJS::PropertyMap::get): Get sizeMask and entries pointer outside loop to avoid
re-getting them inside the loop.
(KJS::PropertyMap::put): Ditto.
(KJS::PropertyMap::insert): Ditto.
(KJS::PropertyMap::remove): Ditto.
(KJS::PropertyMap::mark): Get size and entries pointer outside loop to avoid
re-getting them inside the loop. Don't bother checking key for 0, since we already have
to check value for 0. (Also had to change clear() to set value to 0.)
(KJS::PropertyMap::addEnumerablesToReferenceList): Get size and entries pointer outside
loop to avoid re-getting them inside the loop.
(KJS::PropertyMap::addSparseArrayPropertiesToReferenceList): Ditto.
(KJS::PropertyMap::save): Ditto.
- other changes
* kjs/protected_values.h: Remove unneeded class name qualifiers.
* kjs/reference.h:
(KJS::Reference::baseIfMutable): New inline function: replaces isMutable().
(KJS::Reference::Reference): Inlined.
* kjs/reference.cpp:
(KJS::Reference::getValue): Rewrite to not use getBase.
(KJS::Reference::putValue): Ditto.
(KJS::Reference::deleteValue): Dittol
* kjs/simple_number.h:
(KJS::SimpleNumber::integerFits): Added. For use when the parameter is known to be integral.
* kjs/string_object.cpp: (StringProtoFuncImp::call): Create the number without first converting
to double in various cases that involve integers.
* kjs/ustring.h:
(KJS::UString::attach): Inlined.
(KJS::UString::release): Inlined.
* kjs/ustring.cpp:
(KJS::UString::find): Get first character outside the loop instead of re-fetching it each time.
* kjs/value.cpp:
(Value::Value): Added overloads for all the various specific types of values, so you don't have
to convert from, say, Number to Value, just to create one.
(Number::Number): Added an overload that takes a boolean to indicate the number is already
known to be an integer.
* kjs/value.h: Added more Value constructors, added a version of toNumber that returns
a boolean to indicate if the number is known to be an integer (because it was a "simple number").
(KJS::ValueImp::marked): Inlined.
(KJS::ValueImp::dispatchType): Inlined.
(KJS::ValueImp::dispatchToPrimitive): Inlined.
(KJS::ValueImp::dispatchToBoolean): Inlined.
(KJS::ValueImp::dispatchToNumber): Inlined.
(KJS::ValueImp::dispatchToString): Inlined.
(KJS::ValueImp::dispatchToUInt32): Inlined.
2005-04-14 Maciej Stachowiak <mjs@apple.com>
- make fast_malloc.h a private header, not project
* JavaScriptCore.pbproj/project.pbxproj:
2005-04-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by Richard.
<rdar://problem/4089734> JavaScript iBench can be sped up ~10% with custom allocator
- use custom single-threaded malloc for all non-GC JavaScriptCore
allocations, for a 9.1% speedup on JavaScript iBench
* JavaScriptCore.pbproj/project.pbxproj:
* kjs/collector.cpp:
(KJS::Collector::allocate): Use dlmalloc to allocate the collector blocks.
(KJS::Collector::collect): And dlfree to free it.
* kjs/fast_malloc.cpp: Added, just the standard dlmalloc here.
* kjs/fast_malloc.h: Added. Declarations for the functions. Also added a handy
macro to give a class custom operator new/delete
* kjs/identifier.cpp:
(KJS::Identifier::add): Use dlmalloc/dlfree.
* kjs/nodes.h: make nodes KJS_FAST_ALLOCATED.
* kjs/property_map.cpp:
(KJS::PropertyMap::~PropertyMap): Use dlmalloc/dlfree.
(KJS::PropertyMap::rehash): ditto
* kjs/scope_chain.h:
* kjs/ustring.cpp:
(KJS::UString::Rep::createCopying): New named constructor that copies a passed-in
buffer, to hide allocation details from webcore.
(KJS::UString::UString): use createCopying when appropriate.
(KJS::UString::Rep::destroy): Use dlmalloc/dlfree.
(KJS::UString::expandedSize): likewise
(KJS::UString::expandCapacity): likewise
(KJS::UString::expandPreCapacity): likewise
(KJS::UString::spliceSubstringsWithSeparators): likewise
(KJS::UString::append): likewise
(KJS::UString::operator=): likewise
(KJS::UString::detach): likewise
* kjs/ustring.h: make UString and UString::Rep KJS_FAST_ALLOCATED.
2005-04-11 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
<rdar://problem/4086819> Avoid using protect count hash table so much for 5.6% JS iBench speedup
- Avoid using protected values hash for the two most common cases
- Bump up ListImp high water mark, new testing shows 508 ListImps are
created during JS iBench.
Net result is a 5.6% speedup on JavaScript iBench
* kjs/collector.cpp:
(KJS::Collector::collect): mark protected lists as appropriate.
* kjs/context.h:
* kjs/list.cpp:
(KJS::ListImp::markValues): Moved implementation from List::markValues
(KJS::List::markProtectedLists): Implemented - scan pool and overflow
list.
(KJS::allocateListImp): link lists outside the pool into a separate
doubly linked list to be able to mark protected lists
(KJS::deallocateListImp): do the corresponding delinking
(KJS::List::derefValues): do nothing in conservative GC mode
(KJS::List::refValues): do nothing in conservative GC mode
(KJS::List::markValues): call ListImp version
(KJS::List::append):
* kjs/list.h:
=== Safari-412 ===
=== Safari-411 ===
=== Safari-410 ===
=== Safari-409 ===
=== Safari-408 ===
=== Safari-407 ===
2005-03-16 Jens Alfke <jens@apple.com>
Reviewed by Kevin.
Fix for <rdar://problem/4025212> "REGRESSION (163-164): search not performed correctly; united.com"
JavaScript unescape("") was returning a messed-up String object that appeared identical to an empty string, but would in some cases act as 'null' when passed to native functions, in this case the Option() constructor.
In the implementation of unescape, the UString holding the result was not initialized to "", so it started out as a null string. If nothing was appended to it, it remained null, resulting in a JavaScript String object with some bad behaviors (namely, converting it to a DOMStringImpl results in a NULL pointer.)
Darin says this regression occurred when we replaced our own implementation of unescape() with code from KJS.
* kjs/function.cpp:
(KJS::GlobalFuncImp::call):
2005-03-15 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/4053276> WebScripting protocol in WebKit cannot convert Boolean in Javascript to BOOL in Objective-C
Added JavaScript boolean to type that can be converted to
ObjC scalar parameters.
Reviewed by Ken Kocienda.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
=== Safari-406 ===
=== Safari-405 ===
=== Safari-403 ===
=== Safari-402 ===
=== Safari-401 ===
=== Safari-400 ===
=== Safari-188 ===
2005-02-21 Darin Adler <darin@apple.com>
* kjs/date_object.cpp: (timetUsingCF): Fixed indenting.
2005-02-17 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/4003251> Safari crashed at www.icelandair.com in LiveConnect code converting a Java object to a string
Added nil check.
Reviewed by John Sullivan.
* bindings/jni/jni_runtime.cpp:
(JavaField::valueFromInstance):
=== Safari-187 ===
2005-02-11 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3985118> DOM objects not being marshaled on JS->native calls
Re-factored how 'native' wrappers for JS objects are created. The interpreter now
creates these wrappers. The WebCore subclass of the interpreter now overrides
createLanguageInstanceForValue() and creates a DOM ObjC wrapper for DOM objects.
Reviewed by Ken.
* bindings/c/c_utility.cpp:
(convertValueToNPVariant):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
* bindings/jni/jni_runtime.cpp:
(JavaField::valueFromInstance):
(JavaArray::valueAt):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject _setExecutionContext:KJS::Bindings::]):
(+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
* bindings/objc/WebScriptObjectPrivate.h:
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
(KJS::Bindings::createObjcInstanceForValue):
* bindings/runtime.cpp:
(Instance::createBindingForLanguageInstance):
(Instance::createRuntimeObject):
(Instance::createLanguageInstanceForValue):
* bindings/runtime.h:
* kjs/interpreter.cpp:
(Interpreter::createLanguageInstanceForValue):
* kjs/interpreter.h:
=== Safari-186 ===
2005-02-10 Darin Adler <darin@apple.com>
"Reviewed" by Richard (he told me the file was obsolete).
- got rid of an obsolete file
* bindings/npsap.h: Removed.
=== Safari-185 ===
=== Safari-183 ===
2005-02-03 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3972905> CrashTracer: ...36 crashes at com.apple.WebCore: khtml::CSSStyleSelector::applyDeclarations + 120
Revert to old (and correct) behavior of returning runtime object
when passed as a parameter, rather than it's corresponding DOM
object.
Reviewed by Chris.
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
=== Safari-182 ===
2005-01-28 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3980389> JavaScript bindings access incorrect runtime object
Only use special 'back door' property to get the runtime object if thisObj isn't
already a runtime object.
<gratuitous> Cleaned up a couple of strcmp on ClassInfo name. Used == on
ClassInfo pointer instead.
Reviewed by Chris.
* bindings/c/c_utility.cpp:
(convertValueToNPVariant):
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
* bindings/runtime_method.cpp:
(RuntimeMethodImp::call):
=== Safari-181 ===
2005-01-26 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3972522> (179-180) 40% slowdown on iBench JavaScript test
I added a member variable to ObjectImp. This changed it's size and consequently
hampered the optimizations built into the garbage collector. Objects no longer
fit within the allocators cell size, and thus allocation fell back to a slower
allocator.
As a result of this fix I also dramatically cleaned up how runtime objects are
accessed. The path mostly *removes* code.
Reviewed by Chris.
* bindings/runtime_method.cpp:
(RuntimeMethodImp::call):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::hasProperty):
(RuntimeObjectImp::defaultValue):
* bindings/runtime_object.h:
* kjs/object.cpp:
(KJS::ObjectImp::ObjectImp):
* kjs/object.h:
2005-01-20 Darin Adler <darin@apple.com>
Reviewed by me, changes by Han Ming Ong.
- <rdar://problem/3964302> SWB: A few files need to be updated to be compilable under GCC 4.0
* bindings/objc/WebScriptObjectPrivate.h: Make members public.
* kjs/lookup.h: Change "value.h" to "object.h" because we need KJS::Object to compile a template.
2005-01-20 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3964634> undefined property value from binding seems to evaluate to true in an if statement
The comprehensive fix for this problem requires new API, as described in 3965326. However,
given that we can't add new API at this point, the 'ObjcFallbackObjectImp' will behave
like and Undefined object if invokeUndefinedMethodFromWebScript:withArguments: isn't
implemented on the bound object.
Reviewed by Chris.
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::type):
(ObjcFallbackObjectImp::implementsCall):
(ObjcFallbackObjectImp::toBoolean):
* bindings/testbindings.mm:
(+[MyFirstInterface isSelectorExcludedFromWebScript:]):
(+[MyFirstInterface isKeyExcludedFromWebScript:]):
=== Safari-180 ===
2005-01-19 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3853676> Browser Crash when accessing CCWeb Progress Page - KJS::Bindings::convertValueToJValue
Fixed the following problems with LiveConnect that are demonstrated by the application
described in 3853676.
1. If a nil object is passed in an array from Java to JavaScript we will crash.
2. We sometimes will incorrectly attempt to access a generic JavaScript as a Java runtime object wrapper.
3. We will sometimes fail to find the correct static method ID.
Reviewed by Maciej.
* bindings/jni/jni_jsobject.cpp:
(JSObject::convertJObjectToValue):
(JSObject::listFromJArray):
* bindings/jni/jni_runtime.cpp:
(JavaField::valueFromInstance):
(JavaField::setValueToInstance):
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getMethodID):
(KJS::Bindings::convertValueToJValue):
* bindings/runtime_array.h:
2005-01-18 Richard Williamson <rjw@apple.com>
Fixed several issues all arising from analysis of plugin detection code at ifilm.com:
Fixed <rdar://problem/3958592> can't script plug-ins if plug-in is invoked with <object> element instead of <embed>
Fixed <rdar://problem/3958597> <object> elements with IDs do not show up as named properties of the document
Fixed <rdar://problem/3960973> DOM objects for plugin elements are not accessible
Fixed <rdar://problem/3958601> need an additional class ID in WebCore for the Real plug-in
We now support accessing scriptable plugin objects that are specified with <applet>, <embed>, or <object>
tags. Also, if any of these elements are named they can be accessed from the document or window objects.
Finally, DOM methods are properties will be forwarded appropriately for the plugin's root scriptable object.
Reviewed by Chris.
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::supportsSetValueOfUndefinedField):
* bindings/runtime.h:
(KJS::Bindings::Instance::supportsSetValueOfUndefinedField):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::get):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::hasProperty):
(RuntimeObjectImp::defaultValue):
* bindings/runtime_object.h:
(KJS::RuntimeObjectImp::fallbackObject):
* kjs/object.cpp:
(KJS::ObjectImp::ObjectImp):
* kjs/object.h:
(KJS::ObjectImp::forwardingScriptMessage):
(KJS::ObjectImp::setForwardingScriptMessage):
2005-01-18 Richard Williamson <rjw@apple.com>
Back out a change that was incorrectly committed yesterday.
Reviewed by Chris.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
2005-01-17 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3753030> Need to ensure same origin for plugin binding invocations (origin security rules)
Keep track of originating execution context and target execution
context for native JS object wrappers, and perform appropriate
security checks.
Reviewed by David Harrison.
* bindings/NP_jsobject.cpp:
(_isSafeScript):
(_NPN_CreateScriptObject):
(_NPN_Invoke):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_RemoveProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
(_NPN_SetException):
* bindings/NP_jsobject.h:
* bindings/c/c_instance.cpp:
(CInstance::CInstance):
(CInstance::stringValue):
* bindings/c/c_instance.h:
* bindings/c/c_utility.cpp:
(convertValueToNPVariant):
* bindings/jni/jni_instance.cpp:
(JavaInstance::JavaInstance):
(JavaInstance::valueOf):
* bindings/jni/jni_instance.h:
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject _initializeWithObjectImp:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
(-[WebScriptObject _initWithObjectImp:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
(-[WebScriptObject KJS::Bindings::]):
(-[WebScriptObject _setOriginExecutionContext:KJS::Bindings::]):
(-[WebScriptObject _isSafeScript]):
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject stringRepresentation]):
(-[WebScriptObject webScriptValueAtIndex:]):
(-[WebScriptObject setWebScriptValueAtIndex:value:]):
(+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
* bindings/objc/WebScriptObjectPrivate.h:
* bindings/objc/objc_instance.h:
* bindings/objc/objc_runtime.mm:
(convertValueToObjcObject):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
* bindings/runtime.cpp:
(Instance::Instance):
(Instance::operator=):
* bindings/runtime.h:
(KJS::Bindings::Instance::Instance):
(KJS::Bindings::Instance::setExecutionContext):
(KJS::Bindings::Instance::executionContext):
* bindings/runtime_root.cpp:
(RootObject::setInterpreter):
* bindings/runtime_root.h:
* kjs/interpreter.h:
(KJS::Interpreter::isGlobalObject):
(KJS::Interpreter::interpreterForGlobalObject):
(KJS::Interpreter::isSafeScript):
=== Safari-179 ===
2005-01-13 Vicki Murley <vicki@apple.com>
Reviewed by Adele.
- fix <rdar://problem/3946836> Safari about box lists 2004 instead of 2005
* JavaScriptCore.pbproj/project.pbxproj: bump "2004" to "2005"
2005-01-12 Richard Williamson <rjw@apple.com>
Avoid additional work on dealloc by adding early out to
removeNativeReference(). (This will save time on dealloc
for all ObjC DOM objects.)
Reviewed by Darin.
* bindings/runtime_root.cpp:
(KJS::Bindings::removeNativeReference):
2005-01-12 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3923356> REGRESSION: Java/JavaScript security checks working incorrectly
We were always returning the first "root" object for all runtime
objects. Changed 0 in loop to i, the index.
Reviewed by David Harrison.
* bindings/runtime_root.cpp:
(KJS::Bindings::rootForImp):
2005-01-11 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3887930> Must use new Java plug-in API to get/set fields so exception handling works (fixes many LiveConnect crashes)
Use the new dispatching API to invoke JNI, rather than calling JNI
directly.
Reviewed by David Harrison.
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_runtime.cpp:
(JavaField::dispatchValueFromInstance):
(JavaField::valueFromInstance):
(JavaField::dispatchSetValueToInstance):
(JavaField::setValueToInstance):
* bindings/jni/jni_runtime.h:
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::convertValueToJValue):
=== Safari-178 ===
=== Safari-177 ===
=== Safari-176 ===
2004-12-17 Maciej Stachowiak <mjs@apple.com>
Reviewed by Kevin.
<rdar://problem/3926869> Opening caches window after running PLT causes crash
* kjs/protected_values.cpp:
(KJS::ProtectedValues::getProtectCount): Don't include simple numbers in
the protected value table.
(KJS::ProtectedValues::increaseProtectCount): Ditto.
(KJS::ProtectedValues::decreaseProtectCount): Ditto.
2004-12-16 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3920764> Unimplemented String methods toLocaleLowerCase and toLocaleUpperCase
* kjs/string_object.h: Added toLocaleLowerCase and toLocaleUpperCase.
* kjs/string_object.cpp: (StringProtoFuncImp::call): Made locale versions be synonmyms for the
non-locale-specific versions.
* kjs/string_object.lut.h: Regenerated.
2004-12-14 Richard Williamson <rjw@apple.com>
Pass URL of plugin view when call into JNI.
Reviewed by Chris.
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
2004-12-13 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3827799> repro. crash with IBM Rational ClearCase Web under Safari (Java/LiveConnect-related)
Add support for calling static Java methods from JavaScript.
Reviewed by Maciej.
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_runtime.cpp:
(JavaMethod::JavaMethod):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaMethod::isStatic):
* bindings/jni/jni_utility.cpp:
(callJNIStaticMethod):
(KJS::Bindings::callJNIBooleanMethod):
(KJS::Bindings::callJNIStaticBooleanMethod):
* bindings/jni/jni_utility.h:
2004-12-13 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3887767> LiveConnect doesn't propagate Java exceptions back to JavaScript (prevents security suite from running)
Reviewed by John.
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
* bindings/jni/jni_runtime.h:
* bindings/jni/jni_utility.h:
=== Safari-175 ===
2004-12-07 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
<rdar://problem/3908017> REGRESSION (172-173): assertion in ObjectImp::construct trying to create JS error (24hourfitness.com)
The fix was to implement copy constructor and assignment operator,
the ones that worked on the base class did not replace the
defaults apparently!
* kjs/protect.h:
(KJS::ProtectedValue::ProtectedValue):
(KJS::ProtectedValue::operator=):
(KJS::ProtectedObject::ProtectedObject):
(KJS::ProtectedObject::operator=):
Also fixed a bug in the GC test mode that compares the results of
the old collector and the new collector.
* kjs/value.cpp:
(ValueImp::mark):
=== Safari-173 ===
2004-11-23 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3890385> field and method cache incorrectly capped (c bindings)
Reviewed by Ken.
* bindings/c/c_class.cpp:
(CClass::_commonInit):
2004-11-21 Maciej Stachowiak <mjs@apple.com>
Reviewed by Ken.
<rdar://problem/3889696> Enable conservative garbage collection for JavaScript
* kjs/collector.cpp:
(KJS::Collector::Thread::Thread):
(KJS::destroyRegisteredThread):
(KJS::initializeRegisteredThreadKey):
(KJS::Collector::registerThread):
(KJS::Collector::markStackObjectsConservatively):
(KJS::Collector::markCurrentThreadConservatively):
(KJS::Collector::markOtherThreadConservatively):
* kjs/collector.h:
* kjs/internal.cpp:
(lockInterpreter):
* kjs/value.h:
=== Safari-172 ===
2004-11-15 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3880561> Default string value of ObjC object in JS should be [obj description].
Reviewed by Hyatt.
* bindings/objc/objc_instance.mm:
(ObjcInstance::stringValue):
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertNSStringToString):
(KJS::Bindings::convertObjcValueToValue):
=== Safari-171 ===
2004-11-09 Chris Blumenberg <cblu@apple.com>
Fixed: <rdar://problem/3872724> soft link against JavaVM to save ~2MB RSHRD
Reviewed by rjw.
* ChangeLog:
* JavaScriptCore.pbproj/project.pbxproj: don't link against JavaVM
* bindings/softlinking.c: Added.
(loadFramework): new
(getFunctionPointer): new
(JNI_GetCreatedJavaVMs): load JavaVM if not already loaded, get _JNI_GetCreatedJavaVMs symbol if we don't already have it, call JNI_GetCreatedJavaVMs
=== Safari-170 ===
2004-11-04 Darin Adler <darin@apple.com>
Reviewed by Ken.
- fixed <rdar://problem/3865365> since -[WebScriptObject dealloc] does not call [super dealloc], the build will fail due to a warning
- fixed behavior so that [[WebScriptObject alloc] initWithCoder:] doesn't leak WebUndefined instances
and incidentally so that [[WebScriptObject alloc] init] returns the single shared instance rather
than allocating a new one
* bindings/objc/WebScriptObject.mm: Removed some stray semicolons.
(+[WebUndefined allocWithZone:]): Made this the common bottleneck that returns the single instance
of WebUndefined, since it's the single method that normally allocates new instances. Calls super to
actually allocate only the very first time it's called.
(-[WebUndefined initWithCoder:]): Simplified to just return self (no reason to re-lookup the single
shared instance since there can be only one).
(-[WebUndefined copyWithZone:]): Ditto.
(-[WebUndefined retain]): Ditto.
(-[WebUndefined retainCount]): Use UINT_MAX constant here (matches usage in NSObject.m for retain count
of class).
(-[WebUndefined autorelease]): Simplified to just return self (see above).
(-[WebUndefined copy]): No need to override this since it just turns around and calls copyWithZone:.
(-[WebUndefined dealloc]): Added an assertion since this method should never be called. Also added
a call to [super dealloc] after return; to make the new -Wdealloc-check compiler happy (fixing the
bug mentioned above).
(+[WebUndefined undefined]): Reimplemented; calls allocWithZone:NULL to get to the shared instance.
No need to call init, since that's a no-op for this class.
2004-11-03 David Harrison <harrison@apple.com>
Reviewed by Darin.
Eliminate the use of a marker file to determine how to build.
* .cvsignore:
* Makefile.am:
2004-11-01 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3861469> Latest Real player crashes Safari on some sites.
Reviewed by Ken.
* bindings/c/c_instance.cpp:
(CInstance::invokeMethod):
(CInstance::invokeDefaultMethod):
Initialize out parameters to void type.
* bindings/c/c_runtime.cpp:
(CField::valueFromInstance):
(CField::setValueToInstance):
Initialize out parameters to void type.
Also added additional checks to protect against classes that
don't implement all functions.
2004-11-01 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3861257> WebUndefined should be returned for undefined values
Reviewed by John.
* ChangeLog:
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
Added additional conversion Undefined -> WebUndefined.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
Added additional conversion WebUndefined -> Undefined.
2004-11-01 Darin Adler <darin@apple.com>
- fixed <rdar://problem/3855573> Remove reference to "WebScriptMethods" from WebScriptObject.h comments
* bindings/objc/WebScriptObject.h: Removed unneeded #ifdef protection for multiple includes (since
this is an Objective-C header and we use #import for those). Fixed comments as requested in the bug
report to match the contents of the file.
=== Safari-169 ===
=== Safari-168 ===
2004-10-22 Ken Kocienda <kocienda@apple.com>
Reviewed by me
* JavaScriptCore.pbproj/project.pbxproj:
Add GCC_ENABLE_OBJC_GC and GCC_FAST_OBJC_DISPATCH flags.
=== Safari-167 ===
2004-10-13 Richard Williamson <rjw@apple.com>
Moved boolean checks prior to NSNumber checks. booleans are
NSNumbers.
Follow on to <rdar://problem/3821515> binding layer needs to convert NSNumber-bools to js type boolean not number.
Reviewed by John.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
2004-10-12 Richard Williamson <rjw@apple.com>
Fixed access to DOM object via WebScriptObject API.
The execution context for DOM objects wasn't being found.
<rdar://problem/3831372> The valueForKey method for @"offsetLeft" on a paragraph element causes a crash.
Reviewed by Chris.
* bindings/objc/WebScriptObject.mm:
(_didExecute):
(-[WebScriptObject KJS::Bindings::]):
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject stringRepresentation]):
* bindings/objc/WebScriptObjectPrivate.h:
2004-10-09 Darin Adler <darin@apple.com>
Reviewed by Kevin.
- fixed <rdar://problem/3804661> REGRESSION: JavaScriptCore framework now has two init routines
* bindings/NP_jsobject.cpp: Fixed unnecessarily-complex globals set up that was
creating an init routine.
* kjs/ustring.cpp: Changed around the UString::Rep::empty construction to not
require a global constructor that creates an init routine.
2004-10-09 Darin Adler <darin@apple.com>
Reviewed by Kevin.
- fixed <rdar://problem/3822618> REGRESSION (164-165): expedia.com's popup help doesn't work
* kjs/reference.cpp: (Reference::putValue): Change so that references not found in any object
work with the window object of the page the function is in, not the page of the caller. This
is what all other browsers do. This code was hidden before by the "everything is defined on
window object" hack in WebCore.
2004-10-07 Richard Williamson <rjw@apple.com>
Added simple JavaScript call tracing. Very useful for
debugging complex pages.
Tracing is only available in development builds and is
enabled by:
(gdb) set traceJavaScript = 1
or programatically
setTraceJavaScript(true)
Function, args, and return values are printed to console. Very
verbose.
Reviewed by Ken.
* kjs/function_object.cpp:
(FunctionProtoFuncImp::call):
* kjs/object.cpp:
(KJS::Object::call):
=== Safari-166 ===
2004-10-05 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3819234> NPN_SetException (and throwException:) isn't implemented
Reviewed by Chris.
* bindings/NP_jsobject.cpp:
(_NPN_SetException):
* bindings/npruntime.cpp:
(_NPN_SetExceptionWithUTF8):
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject throwException:]):
* kjs/internal.h:
(KJS::InterpreterImp::context):
2004-10-05 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3821515> binding layer needs to convert NSNumber-bools to js type boolean not number
Reviewed by Ken.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
2004-10-04 Darin Adler <darin@apple.com>
Reviewed by Ken.
- rolled in a fix the KDE folks did for the operations that generate HTML fragments
* kjs/string_object.cpp: (StringProtoFuncImp::call): Added quote marks to generated HTML.
- rolled out an old workaround we don't need any more
* JavaScriptCore.pbproj/project.pbxproj: Remove -Wno-long-double because the <math.h> issue that
required it is no longer there.
2004-09-30 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3821215> NPN hasMethod and hasProperty functions should take NPObjects, not NPClass
Reviewed by Chris.
* bindings/NP_jsobject.cpp:
(_NPN_GetProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
* bindings/c/c_class.cpp:
(CClass::methodsNamed):
(CClass::fieldNamed):
* bindings/c/c_class.h:
* bindings/c/c_instance.cpp:
(CInstance::invokeMethod):
* bindings/jni/jni_class.cpp:
(JavaClass::methodsNamed):
* bindings/jni/jni_class.h:
* bindings/npruntime.h:
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
(ObjcClass::methodsNamed):
* bindings/runtime.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::hasProperty):
2004-09-29 Chris Blumenberg <cblu@apple.com>
Prepended underscores to NPN methods so that when the QT plug-in loads these symbols, it uses the non-underscore versions in WebKit. Without this, the QT plug-in was failing to load when launching Safari from the command-line.
Reviewed by rjw.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.cpp:
(_NPN_CreateScriptObject):
(_NPN_InvokeDefault):
(_NPN_Invoke):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_RemoveProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
* bindings/c/c_class.cpp:
(CClass::methodsNamed):
(CClass::fieldNamed):
* bindings/c/c_instance.cpp:
(CInstance::CInstance):
(CInstance::~CInstance):
(CInstance::operator=):
(CInstance::invokeMethod):
(CInstance::invokeDefaultMethod):
* bindings/c/c_runtime.cpp:
* bindings/c/c_runtime.h:
(KJS::Bindings::CField::name):
(KJS::Bindings::CMethod::name):
* bindings/npruntime.cpp:
(_NPN_GetStringIdentifier):
(_NPN_GetStringIdentifiers):
(_NPN_GetIntIdentifier):
(_NPN_IdentifierIsString):
(_NPN_UTF8FromIdentifier):
(_NPN_IntFromIdentifier):
(NPN_InitializeVariantWithObject):
(_NPN_ReleaseVariantValue):
(_NPN_CreateObject):
(_NPN_RetainObject):
(_NPN_ReleaseObject):
(_NPN_SetExceptionWithUTF8):
(_NPN_SetException):
2004-09-26 Darin Adler <darin@apple.com>
* kjs/string_object.cpp: (StringProtoFuncImp::call): Remove strange use of high() and
low() to get Unicode value of character, and just use unicode().
2004-09-26 Darin Adler <darin@apple.com>
- refine charAt/charCodeAt fix slightly
* kjs/string_object.cpp: (StringProtoFuncImp::call): Treat undefined the same was as an
omitted parameter, as we do everywhere else, and as other browsers do here.
2004-09-26 Darin Adler <darin@apple.com>
Reviewed by Kevin.
- fixed <rdar://problem/3816097> REGRESSION: mailblocks, and presumably many other pages, failing because variable not found
* kjs/internal.cpp: (InterpreterImp::evaluate): Process variable declarations before executing
the program. We were doing this properly for functions, but not entire programs.
- fixed <rdar://problem/3814706> REGRESSION: text fields in mailblocks wizards do not accept keystrokes due to use of charCodeAt()
* kjs/string_object.cpp: (StringProtoFuncImp::call): Changed the implementation of charAt
and charCodeAt to treat a missing parameter as an index of 0, rather than an invalid index.
* tests/mozilla/expected.html: Update for two tests that now pass with these changes.
=== Safari-165 ===
=== Safari-164 ===
2004-09-14 Richard Williamson <rjw@apple.com>
1. Add class parameter to object allocation function. This is somewhat redundant, given that
the allocation function is in the class function vector, but people wanted to use the same
allocation function for different classes.
2. Renamed NPN_Class to NPN_Invoke to match the name in the function vector.
3. Add support for a default function on an object. This is a feature that ActiveX supports,
and will allow JavaScript code to be written that will look exactly the same for both ActiveX
plugins and Netscape or WebKit plugins. There are implementations included for the 'C' and
'Objective-C' bindings.
There bugs are covered by
<rdar://problem/3776343> Support for default functions in the JavaScript bindings
<rdar://problem/3779186> NPN_Call needs to be renamed to NPN_Invoke
<rdar://problem/3674754> Need to implement latest npruntime.h
Reviewed by John.
* bindings/NP_jsobject.cpp:
(jsAllocate):
(NPN_InvokeDefault):
(NPN_Invoke):
* bindings/c/c_class.cpp:
* bindings/c/c_instance.cpp:
(CInstance::CInstance):
(CInstance::operator=):
(CInstance::invokeMethod):
(CInstance::invokeDefaultMethod):
* bindings/c/c_instance.h:
* bindings/c/c_runtime.cpp:
* bindings/c/c_runtime.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeDefaultMethod):
* bindings/jni/jni_instance.h:
* bindings/npruntime.cpp:
(NPN_CreateObject):
* bindings/npruntime.h:
* bindings/objc/WebScriptObject.h:
* bindings/objc/objc_class.mm:
(ObjcClass::fallbackObject):
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeDefaultMethod):
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcFallbackObjectImp::ObjcFallbackObjectImp):
(ObjcFallbackObjectImp::get):
(ObjcFallbackObjectImp::put):
(ObjcFallbackObjectImp::canPut):
(ObjcFallbackObjectImp::implementsCall):
(ObjcFallbackObjectImp::call):
(ObjcFallbackObjectImp::hasProperty):
(ObjcFallbackObjectImp::deleteProperty):
(ObjcFallbackObjectImp::defaultValue):
* bindings/runtime.h:
(KJS::Bindings::Class::fallbackObject):
(KJS::Bindings::Instance::getValueOfUndefinedField):
(KJS::Bindings::Instance::setValueOfUndefinedField):
(KJS::Bindings::Instance::valueOf):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::implementsCall):
(RuntimeObjectImp::call):
* bindings/runtime_object.h:
2004-09-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
<rdar://problem/3794735> Gmail- sending a very long message with Safari is so slow it seems like a hang
* kjs/string_object.cpp:
(StringProtoFuncImp::call): Replaced implementation of replace()
method with function below...
(replace): In order to avoid excessive allocation and copying,
figure out the ranges of the original string and replacement
strings to be assembled, instead of constantly creating new
strings at each substitution. The old behavior is basically O(N^2)
for a global replace on a pattern that matches many places in the
string.
(regExpIsGlobal): Helper function for the above.
(expandSourceRanges): ditto
(pushSourceRange): ditto
(expandReplacements): ditto
(pushReplacement): ditto
* kjs/ustring.cpp:
(KJS::UString::spliceSubstringsWithSeparators): New method that
pieces together substring ranges of this string together with
specified separators, all at one go.
* kjs/ustring.h:
(KJS::UString::Range::Range): Added new helper class to represent
substring choices.
2004-09-14 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fixed <rdar://problem/3800315> encode-URI-test layout test is failing
* kjs/function.cpp:
(KJS::GlobalFuncImp::call): Make sure to escape null
characters. This is a bug in the new code that made part of the
test fail.
2004-09-13 Darin Adler <darin@apple.com>
Reviewed by Kevin and Maciej.
- new function to support fix for DIG bug in WebCore
* kjs/scope_chain.h: Added new push function that pushes another entire scope chain.
* kjs/scope_chain.cpp: (KJS::ScopeChain::push): Ditto.
2004-09-12 Darin Adler <darin@apple.com>
* tests/mozilla/expected.html: Updated test results for 3 more tests that pass with the new version
of escape and unescape.
2004-09-12 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3798209> any non-ASCII characters are garbled in the result of toLocaleString
* kjs/date_object.cpp:
(formatLocaleDate): Replaced two old functions that used LongDateTime with this one new function that
uses CFDateFormatter.
(DateProtoFuncImp::call): Call the new formatLocaleDate instead of both formatLocaleDate and formatLocaleTime.
2004-09-09 Maciej Stachowiak <mjs@apple.com>
Reviewed by Richard.
<rdar://problem/3493140> REGRESSION (85-100): cedille displays %-escaped in JavaScript message at hotmail.com
* kjs/function.cpp:
(KJS::GlobalFuncImp::call): Replace our escape() and unescape() implementations with
ones from KDE KJS, which have the proper latin-1 behavior to match Win IE.
* kjs/lexer.cpp:
(Lexer::isHexDigit): Made static and non-const.
* kjs/lexer.h:
=== Safari-163 ===
2004-09-06 Darin Adler <darin@apple.com>
* JavaScriptCore.pbproj/project.pbxproj: Bump MACOSX_DEPLOYMENT_TARGET to 10.3.
=== Safari-162 ===
2004-09-01 Richard Williamson <rjw@apple.com>
Add pid to exception messages (to help debug dashboard clients).
Reviewed by Chris.
* kjs/interpreter.cpp:
(Interpreter::evaluate):
=== Safari-161 ===
2004-08-20 Richard Williamson <rjw@apple.com>
Implemented new JNI abstraction. We no longer invoke Java methods
directly with JNI, rather we call into the plugin. This allows the
plugin to dispatch the call to the appropriate VM thread. This
change should (will?) fix a whole class of threading related problems with
the Java VM.
Reviewed by Hyatt.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/c/c_instance.h:
(KJS::Bindings::CInstance::setExecutionContext):
(KJS::Bindings::CInstance::executionContext):
* bindings/jni/jni_instance.cpp:
(JavaInstance::JavaInstance):
(JavaInstance::invokeMethod):
(JavaInstance::setExecutionContext):
(JavaInstance::executionContext):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_jsobject.cpp:
(JSObject::convertJObjectToValue):
* bindings/jni/jni_runtime.cpp:
(JavaField::JavaField):
(JavaArray::convertJObjectToArray):
(JavaField::valueFromInstance):
(JavaArray::JavaArray):
(JavaArray::valueAt):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaArray::operator=):
(KJS::Bindings::JavaArray::executionContext):
* bindings/jni/jni_utility.h:
* bindings/objc/objc_instance.h:
(KJS::Bindings::ObjcInstance::setExecutionContext):
(KJS::Bindings::ObjcInstance::executionContext):
* bindings/runtime.cpp:
(Instance::createBindingForLanguageInstance):
* bindings/runtime.h:
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::nativeHandle):
=== Safari-158 ===
2004-08-19 Vicki Murley <vicki@apple.com>
Reviewed by John.
* kjs/property_map.cpp:
(KJS::PropertyMap::put): initialize deletedElementIndex to zero, to make the compiler happy
2004-08-17 Darin Adler <darin@apple.com>
Reviewed by Adele.
- fixed <rdar://problem/3746676> SAP WebDynpro app hangs inside JavaScript property map hash table code (deleted sentinel problem)
* kjs/property_map.h: Added some private functions.
* kjs/property_map.cpp:
(KJS::PropertyMap::clear): Set sentinelCount to 0.
(KJS::PropertyMap::put): Complete search for the element before choosing to use the deleted-element sentinel.
Also keep sentinel count up to date when we destroy a sentinel by overwriting with a new added element.
(KJS::PropertyMap::expand): Added. Calls rehash with a size 2x the old size, or 16.
(KJS::PropertyMap::rehash): Added. Refactored the rehash code into a separate function.
(KJS::PropertyMap::remove): Add one to sentinelCount, and rehash if 1/4 or more of the elements are
deleted-element sentinels.
(KJS::PropertyMap::checkConsistency): Check the sentinelCount.
2004-08-16 Maciej Stachowiak <mjs@apple.com>
Code change by Eric Albert, reviewd by me.
<rdar://problem/3571960> washingtonpost.com claims I don't have cookies enabled and won't let me read articles
* kjs/date_object.cpp:
(timetUsingCF): Clamp time to LONG_MAX (getting rid of time_t
entirely would be even better, but is not required to fix this bug.
=== Safari-157 ===
2004-08-16 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3581092> cash in KJS::Bindings::JSObject::eval at tcvetantcvetkov.com
Adds bullet proofing to protect against evaluation of bogus JS in all the flavors of bindings (Java, C, and ObjC).
Reviewed by Chris.
* bindings/NP_jsobject.cpp:
(NPN_Evaluate):
* bindings/jni/jni_jsobject.cpp:
(JSObject::eval):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject evaluateWebScript:]):
2004-08-15 Richard Williamson <rjw@apple.com>
More updates to np headers. Implemented new NPN functions.
Reviewed by Darin.
* bindings/NP_jsobject.cpp:
(NPN_HasProperty):
(NPN_HasMethod):
* bindings/npapi.h:
* bindings/npruntime.h:
2004-08-13 Darin Adler <darin@apple.com>
- fix build so we can compile again
* bindings/npapi.h: Added. Richard forgot to check this in. The one I'm checking in here
is good enough so that we can compile, but it's only a stopgap measure, because I think
Richard has a newer one he wants to check in.
2004-08-12 Richard Williamson <rjw@apple.com>
Bring npruntime.h and friends closer to compliance with
latest spec.
Reviewed by Maciej.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.cpp:
(jsAllocate):
(_NPN_CreateScriptObject):
(NPN_Call):
(NPN_Evaluate):
(NPN_GetProperty):
(NPN_SetProperty):
(NPN_RemoveProperty):
* bindings/NP_jsobject.h:
* bindings/c/c_instance.cpp:
(CInstance::invokeMethod):
* bindings/c/c_utility.cpp:
(convertNPVariantToValue):
* bindings/npruntime.cpp:
(NPN_IdentifierIsString):
(NPN_VariantIsVoid):
(NPN_VariantIsNull):
(NPN_VariantIsUndefined):
(NPN_VariantIsBool):
(NPN_VariantIsInt32):
(NPN_VariantIsDouble):
(NPN_VariantIsString):
(NPN_VariantIsObject):
(NPN_VariantToBool):
(NPN_VariantToString):
(NPN_VariantToInt32):
(NPN_VariantToDouble):
(NPN_VariantToObject):
(NPN_InitializeVariantAsVoid):
(NPN_InitializeVariantAsNull):
(NPN_InitializeVariantAsUndefined):
(NPN_InitializeVariantWithBool):
(NPN_InitializeVariantWithInt32):
(NPN_InitializeVariantWithDouble):
(NPN_InitializeVariantWithString):
(NPN_InitializeVariantWithStringCopy):
(NPN_InitializeVariantWithObject):
(NPN_InitializeVariantWithVariant):
(NPN_ReleaseVariantValue):
(NPN_CreateObject):
* bindings/npruntime.h:
(_NPString::):
(_NPString::_NPVariant::):
* bindings/npruntime_priv.h: Added.
2004-08-12 Darin Adler <darin@apple.com>
Reviewed by Adele.
- fixed 3 problems with parse functions that I just wrote, fixing 3 more Mozilla JavaScript tests
* kjs/function.cpp:
(KJS::parseDigit): Fix typo, 'Z' instead of 'z', that prevented lowercase hex digits from working.
(KJS::parseInt): Add octal support. Specification says it's optional, but I guess not.
(KJS::parseFloat): Fix check for "0x" in parseFloat to return 0 rather than NaN. Also add code
to skip leading "+" or "-".
=== Safari-156 ===
2004-08-12 Darin Adler <darin@apple.com>
Reviewed by Ken.
- fixed 43 Mozilla JavaScript tests
* kjs/date_object.h: Change parseDate and timeClip to take and return doubles.
* kjs/date_object.cpp:
(DateObjectImp::construct): Change to use a timeClip function that takes and returns a double rather
than constructing a number object to pass to it.
(DateObjectFuncImp::call): Change to use a parseDate function that returns a double.
(KJS::parseDate): Change to return a double instead of creating the Number object here.
(KJS::timeClip): Implement this as specified in the language standard.
* kjs/error_object.cpp: (NativeErrorImp::NativeErrorImp): Set the DontDelete, ReadOnly, and DontEnum
flags on the prototype property.
* kjs/function.cpp:
(KJS::FunctionImp::get): Return null rather than undefined for arguments when the function is not
currently in scope.
(KJS::isStrWhiteSpace): Added. Matches specification for StrWhiteSpace. Could move it to some utility
file later.
(KJS::parseDigit): Added. Helper function for parseInt.
(KJS::parseInt): Added. Integer parser that puts result in a double so we're not limited to what
strtoll can handle. Also matches standard more closely.
(KJS::parseFloat): Added. Handles "0x" properly and passes flag to make empty string turn into NaN
instead of 0.
(KJS::GlobalFuncImp::call): Use the new parseInt and parseFloat.
* kjs/function_object.cpp: (FunctionPrototypeImp::FunctionPrototypeImp): Add a length property.
* kjs/lexer.h: Added error flag and sawError() function for detecting errors.
* kjs/lexer.cpp:
(Lexer::setCode): Clear error state.
(Lexer::lex): Set error state if the lexer encounters an error
* kjs/internal.cpp:
(NumberImp::toString): Roll in change from KDE version to special case 0 so we handle -0 correctly.
(Parser::parse): Use new lexer error method so those errors are treated like parser errors.
* kjs/math_object.cpp: (MathFuncImp::call): Change min and max to treat -0 as less than +0.
Change round to round values between -0.5 and -0 to -0 instead of +0.
* kjs/nodes.h: Add evaluateReference function to GroupNode.
* kjs/nodes.cpp: (GroupNode::evaluateReference): Pass references through groups (parenthesized
expressions) properly so that expressions like "delete (x.y)" work. Before, the parentheses
would change x.y into a value that can't be deleted as a side effect.
* kjs/string_object.cpp: Change parameter count for indexOf and lastIndexOf from 2 to 1 to match
the specification.
* kjs/testkjs.cpp: Rolled in changes from KDE to add a "quit" function to the test tool and
get rid of the fixed size limit for code.
* kjs/ustring.cpp: (KJS::UString::substr): Added optimized case for substr(0, length) so it just
returns the string without creating a new Rep, since I'm using substr in a place where it will
often be passed a 0.
* tests/mozilla/ecma/String/15.5.4.11-1.js: Fixed one wrong entry in the Unicode table I added to
the other day that was making a couple tests fail.
* tests/mozilla/ecma/String/15.5.4.12-1.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-2.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-3.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-4.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-5.js: Ditto.
* kjs/string_object.lut.h: Regenerated.
2004-08-11 Darin Adler <darin@apple.com>
- fixed a tiny problem with the UTF-16 PCRE check-in
* pcre/maketables.c: (pcre_maketables): Fix mistake in table-generating code that sometimes caused
the ctype_meta flag to get set in items that should not have it.
* pcre/chartables.c: Regenerated.
2004-08-10 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3674747> Need to implement invokeUndefinedMethodFromWebScript:withArguments:
The following WebScripting methods are now supported on bound
objects:
- (id)invokeUndefinedMethodFromWebScript:(NSString *)name withArguments:(NSArray *)args;
- (void)setValue:(id)value forUndefinedKey:(NSString *)key
- (id)valueForUndefinedKey:(NSString *)key
Reviewed by Chris.
* bindings/c/c_class.cpp:
(CClass::fieldNamed):
* bindings/c/c_class.h:
* bindings/jni/jni_class.cpp:
(JavaClass::fieldNamed):
* bindings/jni/jni_class.h:
* bindings/objc/objc_class.h:
(KJS::Bindings::ObjcClass::isa):
* bindings/objc/objc_class.mm:
(ObjcClass::methodsNamed):
(ObjcClass::fieldNamed):
(ObjcClass::fallbackObject):
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
(ObjcInstance::setValueOfField):
(ObjcInstance::setValueOfUndefinedField):
(ObjcInstance::getValueOfField):
(ObjcInstance::getValueOfUndefinedField):
* bindings/objc/objc_runtime.h:
(KJS::Bindings::ObjcField::~ObjcField):
(KJS::Bindings::ObjcField::ObjcField):
(KJS::Bindings::ObjcField::operator=):
(KJS::Bindings::FallbackObjectImp::classInfo):
* bindings/objc/objc_runtime.mm:
(ObjcField::ObjcField):
(ObjcField::name):
(ObjcField::type):
(ObjcField::valueFromInstance):
(ObjcField::setValueToInstance):
(FallbackObjectImp::FallbackObjectImp):
(FallbackObjectImp::get):
(FallbackObjectImp::put):
(FallbackObjectImp::canPut):
(FallbackObjectImp::implementsCall):
(FallbackObjectImp::call):
(FallbackObjectImp::hasProperty):
(FallbackObjectImp::deleteProperty):
(FallbackObjectImp::defaultValue):
* bindings/runtime.h:
(KJS::Bindings::Class::fallbackObject):
(KJS::Bindings::Instance::getValueOfUndefinedField):
(KJS::Bindings::Instance::setValueOfUndefinedField):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::hasProperty):
* bindings/testbindings.mm:
(-[MyFirstInterface valueForUndefinedKey:]):
(-[MyFirstInterface setValue:forUndefinedKey:]):
2004-08-10 Darin Adler <darin@apple.com>
Reviewed by Dave.
- switch PCRE to do UTF-16 directly instead of converting to/from UTF-8 for speed
* pcre/pcre.h: Added PCRE_UTF16 switch, set to 1. Added pcre_char typedef, which is char
or uint16_t depending on the mode, and used appropriate in the 7 public functions
that need to use it.
* pcre/pcre.c: Add UTF-16 support to all functions.
* pcre/study.c: Ditto.
* pcre/internal.h: Added ichar typedef, which is unsigned char or uint16_t depending on
the mode. Changed declarations to use symbolic constants and typedefs so we size
things to ichar when needed.
* pcre/maketables.c: (pcre_maketables): Change code to make tables that are
sized to 16-bit characters instead of 8-bit.
* pcre/get.c:
(pcre_copy_substring): Use pcre_char instead of char.
(pcre_get_substring_list): Ditto.
(pcre_free_substring_list): Ditto.
(pcre_get_substring): Ditto.
(pcre_free_substring): Ditto.
* pcre/dftables.c: (main): Used a bit more const, and use ICHAR sizes instead
of hard-coding 8-bit table sizes.
* pcre/chartables.c: Regenerated.
* kjs/ustring.h: Remove functions that convert UTF-16 to/from UTF-8 offsets.
* kjs/ustring.cpp: Change the shared empty string to have a unicode pointer that
is not null. The null string still has a null pointer. This prevents us from
passing a null through to the regular expression engine (which results in a null
error even when the string length is 0).
* kjs/regexp.cpp:
(KJS::RegExp::RegExp): Null-terminate the pattern and pass it.
(KJS::RegExp::match): Use the 16-bit string directly, no need to convert to UTF-8.
2004-08-09 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed 28 Mozilla JavaScript tests
* kjs/array_object.cpp: (ArrayProtoFuncImp::call): Check for undefined rather than
checking the number of arguments for the join method.
* kjs/lexer.cpp: (Lexer::lex): Parse hexadecimal and octal constants in doubles rather
than integers, so we aren't limited to 32 bits.
* kjs/math_object.cpp: (MathFuncImp::call): Get rid of many unneeded special cases in
the implementation of the pow operation. Also simplied a case that was handling positive
and negative infinity separately.
* kjs/nodes.cpp: (ShiftNode::evaluate): Keep the result of shifts in a double instead of
putting them in a long, so that unsigned shift will work properly.
* kjs/number_object.cpp: Add the DontDelete and ReadOnly flags to the numeric constants.
* kjs/operations.cpp:
(KJS::isPosInf): Added an implementation inside APPLE_CHANGES that does not depend on the
sign of isinf; our isinf function returns +1 even for negative infinity.
(KJS::isNegInf): And again.
(KJS::relation): Put in a nice simple implementation of comparison inside APPLE_CHANGES.
Our floating point already handles the various infinity cases correctly.
* kjs/regexp_object.cpp:
(RegExpProtoFuncImp::call): Add missing return before Null() in Exec method.
(RegExpObjectImp::arrayOfMatches): Put undefined rather than an empty string into the
array in cases where we did not match.
(RegExpObjectImp::construct): Set the DontDelete, ReadOnly, and DontEnum flags for
"global", "ignoreCase", "multiline", and "source".
* kjs/string_object.cpp: (StringProtoFuncImp::call): For the match method, turn a null
string into undefined rather than an empty string. For the slice method, handle an
undefined parameter for the limit properly as decribed in the specification, and add
the limit to one case that didn't have the limit at all. For the methods that generate
HTML strings, use lowercase tags instead of uppercase.
* kjs/ustring.cpp:
(KJS::UChar::toLower): Use u_tolower from the ICU library.
(KJS::UChar::toUpper): Use u_toupper from the ICU library.
(KJS::UString::append): Fix some math that caused a buffer overflow.
(KJS::convertUTF16OffsetsToUTF8Offsets): Ignore negative numbers (-1 is used as a special
flag) rather than converting them all to 0.
(KJS::convertUTF8OffsetsToUTF16Offsets): Ditto.
* tests/mozilla/jsDriver.pl: Fixed the relative links to point to our actual test files.
* tests/mozilla/ecma/String/15.5.4.11-1.js: Fixed the Unicode table in this test to match
the Unicode specification in a few cases where it was wrong before.
* tests/mozilla/ecma/String/15.5.4.11-2.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.11-3.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.11-5.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.11-6.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-1.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-2.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-3.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-4.js: Ditto.
* tests/mozilla/ecma/String/15.5.4.12-5.js: Ditto.
* JavaScriptCore.pbproj/project.pbxproj: Link to libicu.
* kjs/number_object.lut.h: Regenerated.
2004-08-09 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3753467> REGRESSION (137-138): reproducible buffer overrun in UString manipulation code
* kjs/ustring.cpp: (KJS::UString::append): Fix incorrect size computation. Without it
we get a buffer overflow.
=== Safari-155 ===
2004-08-05 Richard Williamson <rjw@apple.com>
Fixed part of 3674747. The QT guys need this for feature freeze.
This patch implements support for the
- (id)invokeUndefinedMethodFromWebScript:(NSString *)name withArguments:(NSArray *)args
method of objects bound to JavaScript.
Reviewed by John.
* ChangeLog:
* bindings/objc/objc_class.mm:
(ObjcClass::methodsNamed):
(ObjcClass::fieldNamed):
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
* bindings/objc/objc_runtime.h:
(KJS::Bindings::ObjcMethod::~ObjcMethod):
(KJS::Bindings::ObjcMethod::isFallbackMethod):
(KJS::Bindings::ObjcMethod::javaScriptName):
* bindings/objc/objc_runtime.mm:
(ObjcMethod::ObjcMethod):
(ObjcMethod::getMethodSignature):
(ObjcMethod::setJavaScriptName):
* bindings/testbindings.mm:
2004-08-04 Vicki Murley <vicki@apple.com>
Reviewed by mjs.
- fix <rdar://problem/3649789> SAP WebGUI has problems loading first page because of parse error
* kjs/lexer.cpp:
(Lexer::lex): if the current character is a '\' and the next character is a line terminator,
go to the next line and continue parsing the string (instead of failing). This matches
behavior in Mac IE and Mozilla.
2004-08-03 Kevin Decker <kdecker@apple.com>
Reviewed by Darin.
Rolled in changes from the latest KJS sources that support additional
Number.prototype functions.
Specifically this patch covers the follow parts of the ECMA 3 spec:
15.7.4.5, 15.7.4.6, and 15.7.4.7
Fixes:
<rdar://problem/3663716> missing Number.toFixed (and toPrecision, toExponential)
<rdar://problem/3749492> missing Number.toPrecision prototype implementation
<rdar://problem/3749591> missing Number.toExponential prototype implementation
* kjs/identifier.h: Added toFixed, toPrecision, and toExponential to the
list of supported identifiers (a macro).
* kjs/number_object.cpp: Implemented support for toFixed(), toPrecision(),
and toExponential().
(NumberPrototypeImp::NumberPrototypeImp):
(NumberProtoFuncImp::call):
* kjs/number_object.h: Added property names for toFixed, toPrecision,
and toExponential.
(KJS::NumberProtoFuncImp::):
* tests/mozilla/expected.html: Update results.
2004-08-03 Darin Adler <darin@apple.com>
Reviewed by Ken.
- added support for copying RegExp objects so 7 more Mozilla regexp tests pass
* kjs/regexp_object.cpp: (RegExpObjectImp::construct): Check for case where
we are supposed to just copy the regular expression object, and do so.
Also tighten up arguments check to handle case where an actual "undefined"
is passed rather than just omitting an argument.
* tests/mozilla/expected.html: Update results.
2004-08-02 Darin Adler <darin@apple.com>
* tests/mozilla/.cvsignore: Added.
* tests/mozilla/expected.html: Update results.
2004-08-02 Darin Adler <darin@apple.com>
Reviewed by Ken.
- fixed RegExp.toString so 3 more Mozilla regexp tests pass
* kjs/regexp_object.cpp: (RegExpProtoFuncImp::call):
Append the flags here so more tests paseed.
2004-08-02 Darin Adler <darin@apple.com>
Reviewed by Ken.
- fixed a couple things making 5 Mozilla regexp tests pass
* kjs/regexp_object.cpp: (RegExpProtoFuncImp::call): Implement toString
for the prototype.
(RegExpObjectImp::construct): Fix bug where the string "undefined" would
be used as the flags string when no parameter was passed.
* kjs/regexp_object.h: (KJS::RegExpPrototypeImp::classInfo):
Added a class info object for RegExp prototype so it can return
a string instead of raising an exception when converting to a string.
* tests/mozilla/expected.html: Update results.
2004-08-02 Darin Adler <darin@apple.com>
Reviewed by Kevin.
- fix crashes in mozilla tests due to mishandling NaN
* kjs/array_object.cpp: (ArrayProtoFuncImp::call): Rerranged range checks after
calls to toInteger so that NaN will get turned into something that fits in an integer.
These were the ones John already fixed, but his fix used isnan and the new fix is
more efficient.
* kjs/number_object.cpp: (NumberProtoFuncImp::call): Rearranged radix range checks
after a call to toInteger to handle NaN properly. Also removed separate check
for undefined that's not needed.
* kjs/string_object.cpp: (StringProtoFuncImp::call): More of the same kinds of changes
as in the above two files, but for a lot more functions. Also changed one place with
an explicit check for undefined to instead just check isNaN.
* tests/mozilla/run-mozilla-tests: Changed to invoke jst using $SYMROOTS for people
like me who don't keep $SYMROOTS in their $PATH.
=== Safari-154 ===
=== Safari-153 ===
2004-07-26 Kevin Decker <kdecker@apple.com>
Changes done by Darin, reviewed by Kevin.
- changed testkjs to build in Xcode rather than from Makefile
* .cvsignore: Removed obsolete files from this list.
* Makefile.am: Removed code to build testkjs; we do this in Xcode now.
Changed to build target "All" rather than default target. This makes us
build the testkjs test tool.
* dummy.cpp: Removed.
* kjs/.cvsignore: Removed obsolete files from this list, including
the testkjs tool, which is now built in the symroots directory.
* kjs/testkjs.cpp: Added copyright notice that was missing, since we have
changed this file. Also this has the nice side effect of causing the tool
to be rebuilt in the new location even if there are no other changes in
your tree when you check this out.
* tests/mozilla/run-mozilla-tests: Invoke perl explicitly so this works
without setting the execute bit on jsDriver.pl.
2004-07-22 Kevin Decker <kdecker@apple.com>
Reviewed by Darin
Fixed <rdar://problem/3682340> (error console does not include source urls or line numbers of event exceptions).
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/function_object.h:
* kjs/object.cpp:
(KJS::ObjectImp::construct):
* kjs/object.h:
(KJS::Object::construct):
2004-07-21 Darin Adler <darin@apple.com>
* bindings/npruntime.h: Fixed typo.
2004-07-19 John Sullivan <sullivan@apple.com>
Reviewed by Maciej.
- bulletproofed array.slice() against NAN arguments. Harri noticed this
vulnerability in my patch for 3714644
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call):
handle NAN parameters passed to slice() by clamping to 0 and length.
2004-07-19 Richard Williamson <rjw@apple.com>
Fixed 3733349. Prevent Java applet callbacks into JavaScript after applet
has been destroyed.
Reviewed by John.
* bindings/jni/jni_jsobject.cpp:
(JSObject::invoke):
(JSObject::JSObject):
2004-07-16 John Sullivan <sullivan@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3714644> REGRESSION (125.8-146): bugzilla submit link
hangs browser with javascript
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call):
Check for undefined type for args[0] the same way we were already checking
for args[1]. In this case, args was zero-length, but we were treating
args[0] like an integer anyway. Resulted in some code looping from a NAN
value to 4, taking approximately forever.
* JavaScriptCore.pbproj/project.pbxproj:
version wars
=== Safari-152 ===
2004-07-14 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
<rdar://problem/3711474>: (REGRESSION (125-146): JavaScript 'toString(16)' is broken)
<rdar://problem/3644873>: (REGRESSION (125-140u): secondary list doesn't fill in at Southwest.com)
* kjs/number_object.cpp:
(NumberProtoFuncImp::call): Initialize radix from dradix, not from itself!
2004-07-13 Kevin Decker <kdecker@apple.com>
Reviewed by kocienda.
- made testkjs and JavaScriptCore a subtarget of 'All'
- testkjs now builds in $SYMROOTS
* JavaScriptCore.pbproj/project.pbxproj:
=== Safari-151 ===
2004-06-24 Chris Blumenberg <cblu@apple.com>
Ignore .mode1 files in JavaScriptCore.pbproj
Reviewed by kocienda.
* JavaScriptCore.pbproj/.cvsignore:
2004-06-23 Richard Williamson <rjw@apple.com>
Implemented changes for latest npruntime.h.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.cpp:
(listFromVariantArgs):
(identiferFromNPIdentifier):
(_NPN_CreateScriptObject):
(NPN_Call):
(NPN_Evaluate):
(NPN_GetProperty):
(NPN_SetProperty):
(NPN_RemoveProperty):
* bindings/NP_jsobject.h:
* bindings/c/c_class.cpp:
(CClass::methodsNamed):
(CClass::fieldNamed):
* bindings/c/c_instance.cpp:
(CInstance::invokeMethod):
* bindings/c/c_utility.cpp:
(convertNPVariantToValue):
* bindings/c/c_utility.h:
* bindings/npruntime.cpp:
(stringIdentifierEqual):
(stringIdentifierHash):
(getStringIdentifierDictionary):
(intIdentifierEqual):
(intIdentifierHash):
(getIntIdentifierDictionary):
(NPN_GetStringIdentifier):
(NPN_GetStringIdentifiers):
(NPN_GetIntIdentifier):
(NPN_IdentifierIsString):
(NPN_UTF8FromIdentifier):
(NPN_VariantToInt32):
(NPN_VariantToDouble):
(NPN_SetException):
* bindings/npruntime.h:
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::~RuntimeObjectImp):
* bindings/runtime_root.cpp:
(KJS::Bindings::rootForInterpreter):
* bindings/testbindings.cpp:
(initializeIdentifiers):
(logMessage):
(setDoubleValue):
(setIntValue):
(setBooleanValue):
=== JavaScriptCore-146.1 ===
2004-06-16 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3702287> Crash returning nil from bound ObjC
This turned out to be a show stopper for Dashboard. Accessing a nil
ObjC property from JS caused a crash. Similar to the problem
3696112 fixed below.
Reviewed by Trey.
* bindings/objc/objc_runtime.mm:
(KJS::Bindings::ObjcField::valueFromInstance):
=== Safari-146 ===
2004-06-16 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3696112>: nil from an Objective-C class seems to get wrapped as a JavaScript proxy that will not print.
This turned out to be a show stopper for Dashboard. We now
return Undefined() when nil is returned from a ObjC method
that returns an object type.
Reviewed by Maciej.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
=== Safari-145 ===
2004-06-15 Richard Williamson <rjw@apple.com>
Fixed <rdar://problem/3695875>: Objective-C instances that are exported to JavaScript are too promiscuous
No longer need to check respondsToSelector: for
isSelectorExcludedFromWebScript: and isKeyExcludedFromWebScript:
because these now have a default implementation on NSObject.
Reviewed by Trey.
* bindings/objc/objc_class.mm:
(ObjcClass::methodsNamed):
(ObjcClass::fieldNamed):
2004-06-14 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed some things for GC that Patrick missed, or that happened after the branch
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject dealloc]): Moved removeNativeReference call here from private object.
(-[WebScriptObject finalize]): Added.
- added some missing nil checks
* bindings/objc/objc_instance.mm:
(ObjcInstance::ObjcInstance): Check for nil.
(ObjcInstance::~ObjcInstance): Check for nil.
(ObjcInstance::operator=): Check for nil.
2004-06-14 Darin Adler <darin@apple.com>
Reviewed by me, code changes by Patrick Beard.
- fixed <rdar://problem/3671507>: (WebKit should adopt GC changes and compile with GC enabled)
* bindings/objc/objc_instance.mm:
(ObjcInstance::ObjcInstance): Use CFRetain instead of retain.
(ObjcInstance::~ObjcInstance): Use CFRelease instead of release.
(ObjcInstance::operator=): More of the same.
(ObjcInstance::end): Use [pool drain] if compiling on Tiger.
* bindings/objc/objc_runtime.mm:
(ObjcArray::ObjcArray): Use CFRetain instead of retain.
(ObjcArray::~ObjcArray): Use CFRelease instead of release.
(ObjcArray::operator=): More of the same.
* bindings/testbindings.mm: Fixed incorrect license.
(main): Use [pool drain] if compiling on Tiger.
=== Safari-144 ===
2004-06-10 Kevin Decker <kdecker@apple.com>
Reviewed by John.
* kjs/lexer.cpp:
(Lexer::setCode):
- fixed <rdar://problem/3682398>: (error console line numbers are offset by 1)
* kjs/lexer.h:
(KJS::Lexer::lineNo):
- fixed <rdar://problem/3682398>: (error console line numbers are offset by 1)
=== JavaScriptCore-143.2 ===
2004-06-07 Darin Adler <darin@apple.com>
- fixed <rdar://problem/3682489>: (JavaScriptGlue no longer compiles because Interpreter::evaluate parameters changed)
* kjs/interpreter.h: Added an overload to make JavaScriptGlue compile.
* kjs/interpreter.cpp: (KJS::Interpreter::evaluate): Implemented the overload.
=== JavaScriptCore-143.1 ===
2004-06-04 Kevin Decker <kdecker@apple.com>
Reviewed by Darin
- fixed <rdar://problem/3680594>
* kjs/object.cpp:
(KJS::Error::create):
=== Safari-143 ===
2004-06-04 Darin Adler <darin@apple.com>
* kjs/testkjs.cpp: (main): Fix build breakage by adding URL and line number parameters.
2004-06-04 Kevin Decker <kdecker@apple.com>
Reviewed by Dave.
- ObjC bindings do not (yet) pass along sourceurl or line numbers
- we don't have a way as of yet to accomidate line numbers and urls for dynamic javascript
- changed the wording of an error message
- the lexer, parser, and interpreter have been made "sourceURL aware"
- stored the url into Error
* bindings/NP_jsobject.cpp:
(NPN_Evaluate):
* bindings/jni/jni_jsobject.cpp:
(JSObject::eval):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject evaluateWebScript:]):
* kjs/function.cpp:
(GlobalFuncImp::call):
* kjs/function_object.cpp:
(FunctionObjectImp::construct):
* kjs/internal.cpp:
(Parser::parse):
(InterpreterImp::checkSyntax):
(InterpreterImp::evaluate):
* kjs/internal.h:
* kjs/interpreter.cpp:
(Interpreter::evaluate):
* kjs/interpreter.h:
* kjs/lexer.cpp:
(Lexer::setCode):
* kjs/lexer.h:
(KJS::Lexer::sourceURL):
* kjs/nodes.cpp:
(Node::Node):
(Node::throwError):
(FunctionCallNode::evaluate):
* kjs/nodes.h:
* kjs/object.cpp:
(KJS::Error::create):
* kjs/object.h:
2004-06-04 Richard Williamson <rjw@apple.com>
Fixed crash when attempting to access properties on nil
object.
Reviewed by John.
* bindings/objc/objc_instance.mm:
(ObjcInstance::getClass):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
* bindings/testM.js:
* bindings/testbindings.mm:
(-[MyFirstInterface getString]):
2004-05-27 Kevin Decker <kdecker@apple.com>
Reviewed by Ken.
-revised generated error message content
* kjs/error_object.cpp:
(ErrorProtoFuncImp::call):
* kjs/internal.cpp:
(Parser::parse):
* kjs/object.cpp:
(KJS::Error::create):
=== Safari-142 ===
2004-05-27 Richard Williamson <rjw@apple.com>
Renamed WebScriptMethods to WebScripting based on feedback from Nancy.
Reviewed by Chris.
* bindings/objc/WebScriptObject.h:
2004-05-27 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- moved to new symlink technique for embedding frameworks
* JavaScriptCore.pbproj/project.pbxproj: Get rid of embed-frameworks build step
because we don't need it any more.
2004-05-24 Richard Williamson <rjw@apple.com>
Changed RuntimeArrayImp to inherit from ArrayInstanceImp and
fixed ClassInfo to correctly reflect inheritance. This is required
because of the runtime checks in JSC for arrays, i.e. in
the Function objects apply method.
Reviewed by Ken.
* bindings/jni/jni_runtime.cpp:
(JavaArray::convertJObjectToArray):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime_array.cpp:
(RuntimeArrayImp::RuntimeArrayImp):
* bindings/runtime_array.h:
* bindings/testM.js: Added.
* bindings/testbindings.mm:
(+[MyFirstInterface webScriptNameForSelector:]):
(-[MyFirstInterface logMessages:]):
(-[MyFirstInterface logMessage:prefix:]):
(-[MyFirstInterface callJSObject::]):
2004-05-22 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3664260>: (JS needs to listen to timezone change notifications)
* kjs/date_object.cpp: (CopyLocalTimeZone): As per Chris Kane and Jordan Hubbard, use <notify.h>
with a hardcoded string of "com.apple.system.timezone", and do CFTimeZoneResetSystem since
CoreFoundation doesn't do this itself. Turns out this affects the default time zone as long as
it hasn't been set explicitly.
=== Safari-141 ===
2004-05-20 Richard Williamson <rjw@apple.com>
Implemented WebScriptObject/DOM wrapper voodoo. DOM wrappers
can now be referenced like any other WebScriptObject, meaning
you can do JS operations on them.
All added implementation of finalizeForWebScript.
Reviewed by Ken.
* bindings/objc/WebScriptObject.h:
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject _initializeWithObjectImp:KJS::root:Bindings::]):
(-[WebScriptObject _initWithObjectImp:KJS::root:Bindings::]):
(-[WebScriptObject KJS::]):
(-[WebScriptObject dealloc]):
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject stringRepresentation]):
* bindings/objc/WebScriptObjectPrivate.h:
* bindings/objc/objc_instance.mm:
(ObjcInstance::~ObjcInstance):
2004-05-19 Richard Williamson <rjw@apple.com>
Removed extraneous tabs that were added (by XCode?).
* bindings/objc/WebScriptObject.h:
2004-05-19 Darin Adler <darin@apple.com>
- fixed headers with licenses mangled by Xcode auto-indenting
* bindings/jni/jni_jsobject.cpp:
* bindings/jni/jni_jsobject.h:
* bindings/runtime_array.h:
* bindings/runtime_root.cpp:
* bindings/runtime_root.h:
2004-05-18 Richard Williamson <rjw@apple.com>
Added exception logging. Also check for exception and
set results as appropriate.
Reviewed by Maciej (partially reviewed).
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
2004-05-18 Richard Williamson <rjw@apple.com>
Finsished implementing support for windowScriptObject.
Had to make WebScriptObjectPrivate.h accessible from
WebCore.
Reviewed by Maciej.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/objc/WebScriptObjectPrivate.h:
2004-05-18 Richard Williamson <rjw@apple.com>
Use KVC to set/get values instead of directly accessing
ivars.
Reviewed by Maciej.
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(+[WebScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(convertValueToObjcObject):
(ObjcField::setValueToInstance):
2004-05-17 Richard Williamson <rjw@apple.com>
Implemented new API for WebScriptObject.
Fixed <rdar://problem/3657145>: (objc to javascript method calls do not cause updates.)
Fixed <rdar://problem/3654887>: (Update to JSC to refer to new JSObject LiveConnect object) (w/ help from Vicki)
Reviewed by Hyatt.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/c/c_instance.cpp:
(CInstance::invokeMethod):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_jsobject.cpp:
(JSObject::convertValueToJObject):
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJNIField):
* bindings/objc/WebScriptObject.mm:
(_didExecute):
(-[WebScriptObject _initWithObjectImp:KJS::root:Bindings::]):
(-[WebScriptObject KJS::]):
(-[WebScriptObject dealloc]):
(+[WebScriptObject throwException:]):
(listFromNSArray):
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject stringRepresentation]):
(+[WebScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
(+[WebUndefined undefined]):
(-[WebUndefined initWithCoder:]):
(-[WebUndefined encodeWithCoder:]):
(-[WebUndefined copyWithZone:]):
(-[WebUndefined retain]):
(-[WebUndefined release]):
(-[WebUndefined retainCount]):
(-[WebUndefined autorelease]):
(-[WebUndefined dealloc]):
(-[WebUndefined copy]):
(-[WebUndefined replacementObjectForPortCoder:]):
* bindings/objc/WebScriptObjectPrivate.h: Added.
* bindings/objc/objc_class.mm:
(ObjcClass::methodsNamed):
(ObjcClass::fieldNamed):
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
* bindings/objc/objc_jsobject.h:
* bindings/objc/objc_jsobject.mm:
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::JSMethodNameToObjCMethodName):
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime.cpp:
(Instance::setDidExecuteFunction):
(Instance::didExecuteFunction):
(Instance::setValueOfField):
* bindings/runtime.h:
* bindings/testbindings.mm:
(+[MyFirstInterface webScriptNameForSelector:]):
(-[MyFirstInterface callJSObject::]):
2004-05-14 Vicki Murley <vicki@apple.com>
Reviewed by mjs.
<rdar://problem/3642427>: framework marketing number should be 2.0 for DoubleBarrel release
* JavaScriptCore.pbproj/project.pbxproj: change CFBundleShortVersionString to 2.0
=== Safari-140 ===
2004-05-13 Richard Williamson <rjw@apple.com>
Fixed indentation.
Reviewed by Chris.
* ChangeLog:
* bindings/objc/WebScriptObject.h:
2004-05-13 Richard Williamson <rjw@apple.com>
Approved API changes. Currently unimplemented.
Reviewed by Chris.
* ChangeLog:
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/objc/WebScriptObject.h: Added.
* bindings/objc/WebScriptObject.mm: Added.
(+[WebScriptObject throwException:]):
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject stringRepresentation]):
(+[WebUndefined undefined]):
(-[WebUndefined initWithCoder:]):
(-[WebUndefined encodeWithCoder:]):
(-[WebUndefined copyWithZone:]):
2004-05-07 Vicki Murley <vicki@apple.com>
Reviewed by darin.
Turn off GC since it uses ppc only instructions (which breaks
the B&I build).
* kjs/value.h: set USE_CONSERVATIVE_GC to 0
=== Safari-139 ===
2004-05-07 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- add -funroll-loops=16 compiler option for approx .5% speedup on
HTML iBench and .5-1% speedup on JS iBench.
* JavaScriptCore.pbproj/project.pbxproj:
2004-04-25 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
Enable full conservative GC mode in addition to test mode. When
conservative GC is enabled, we now get an 11% speed improvement on
the iBench. Also fix some spots I missed before.
Specific noteworth changes:
* kjs/collector.cpp:
(KJS::Collector::markStackObjectsConservatively): Check possible
cell pointers for 8-byte aligment and verify they are not 0.
* kjs/protected_values.cpp:
(KJS::ProtectedValues::increaseProtectCount): Move null-tolerance from here...
(KJS::ProtectedValues::decreaseProtectCount): ...and here...
* kjs/protect.h:
(KJS::gcProtectNullTolerant): ...to here...
(KJS::gcUnprotectNullTolerant): ...and here, because not all callers need the null
tolerance, and doing the check is expensive.
* kjs/protected_values.cpp:
(KJS::ProtectedValues::computeHash): Replace hash function with a much faster one
that is still very good.
* kjs/protect.h:
(KJS::gcProtect):
(KJS::gcUnprotect):
(KJS::ProtectedValue::ProtectedValue):
(KJS::ProtectedValue::~ProtectedValue):
(KJS::ProtectedValue::operator=):
(KJS::ProtectedObject::ProtectedObject):
(KJS::ProtectedObject::~ProtectedObject):
(KJS::ProtectedObject::operator=):
(KJS::ProtectedReference::ProtectedReference):
(KJS::ProtectedReference::~ProtectedReference):
(KJS::ProtectedReference::operator=):
* kjs/protected_values.cpp:
(KJS::ProtectedValues::getProtectCount):
(KJS::ProtectedValues::increaseProtectCount):
(KJS::ProtectedValues::decreaseProtectCount):
(KJS::ProtectedValues::computeHash):
* bindings/runtime_root.cpp:
(KJS::Bindings::addNativeReference):
(KJS::Bindings::removeNativeReference):
(RootObject::removeAllNativeReferences):
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::~RootObject):
(KJS::Bindings::RootObject::setRootObjectImp):
* kjs/collector.cpp:
(KJS::Collector::allocate):
(KJS::Collector::collect):
* kjs/collector.h:
* kjs/internal.cpp:
(NumberImp::create):
(InterpreterImp::globalInit):
(InterpreterImp::globalClear):
(InterpreterImp::mark):
* kjs/list.cpp:
(KJS::List::derefValues):
(KJS::List::refValues):
(KJS::List::append):
* kjs/object.cpp:
(KJS::ObjectImp::setInternalValue):
(KJS::ObjectImp::putDirect):
* kjs/value.cpp:
(ValueImp::mark):
(ValueImp::marked):
* kjs/value.h:
(KJS::ValueImp::ValueImp):
(KJS::ValueImp::~ValueImp):
(KJS::ValueImp::):
(KJS::Value::Value):
(KJS::Value::~Value):
(KJS::Value::operator=):
2004-04-30 Richard Williamson <rjw@apple.com>
Asking an NSInvocation for it's return value when return type
is void throws an exception. Added check for void return types
to avoid this exception.
Reviewed by Ken.
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
2004-04-29 Richard Williamson <rjw@apple.com>
Fixed several bad problems with the ObjC bindings. In particular, conversion
to/from JavaScriptObject (soon to be WebScriptObject) was completely broken.
Reviewed by Chris.
* bindings/objc/objc_jsobject.h:
* bindings/objc/objc_jsobject.mm:
(-[JavaScriptObject initWithObjectImp:KJS::root:Bindings::]):
(-[JavaScriptObject KJS::]):
(+[JavaScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
(-[JavaScriptObject call:arguments:]):
(-[JavaScriptObject evaluate:]):
(-[JavaScriptObject getMember:]):
(-[JavaScriptObject getSlot:]):
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(ObjcField::setValueToInstance):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime.h:
* bindings/runtime_root.cpp:
(KJS::Bindings::rootForInterpreter):
(KJS::Bindings::addNativeReference):
(KJS::Bindings::removeNativeReference):
* bindings/runtime_root.h:
* bindings/testbindings.mm:
(-[MyFirstInterface logMessage:]):
(-[MyFirstInterface setJSObject:]):
(-[MyFirstInterface callJSObject::]):
2004-04-24 Darin Adler <darin@apple.com>
Reviewed by Dave.
* kjs/ustring.cpp: (KJS::UString::append): Fix one case that was allocating a buffer
that is 2x too big.
2004-04-23 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
Implementation of conservative GC, based partly on code from
Darin. It's turned off for now, so it shouldn't have any effect on
the normal build.
* JavaScriptCore.pbproj/project.pbxproj:
* kjs/collector.cpp:
(KJS::Collector::markStackObjectsConservatively):
(KJS::Collector::markProtectedObjects):
(KJS::Collector::collect):
* kjs/collector.h:
* kjs/protect.h:
(KJS::gcProtect):
(KJS::gcUnprotect):
* kjs/protected_values.cpp: Added.
(KJS::ProtectedValues::getProtectCount):
(KJS::ProtectedValues::increaseProtectCount):
(KJS::ProtectedValues::insert):
(KJS::ProtectedValues::decreaseProtectCount):
(KJS::ProtectedValues::expand):
(KJS::ProtectedValues::shrink):
(KJS::ProtectedValues::rehash):
(KJS::ProtectedValues::computeHash):
* kjs/protected_values.h: Added.
* kjs/value.cpp:
(ValueImp::useConservativeMark):
(ValueImp::mark):
(ValueImp::marked):
* kjs/value.h:
(KJS::ValueImp::):
=== Safari-138 ===
2004-04-22 Richard Williamson <rjw@apple.com>
Fixed build snafu (re-declaration of NPBool in npruntime.h and
npapi.h).
* bindings/npruntime.h:
2004-04-22 Richard Williamson <rjw@apple.com>
Updated plugin binding API to reflect latest revision from
working group.
Biggest change is the introduction of NPVariant used to represent
value types. NPVariant replaces the use of NPObject for the
exchange of values between scripting environment and native code.
Reviewed by John.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.cpp:
(identiferFromNPIdentifier):
(NPN_Call):
(NPN_Evaluate):
(NPN_GetProperty):
(NPN_SetProperty):
(NPN_ToString):
(NPN_GetPropertyAtIndex):
(NPN_SetPropertyAtIndex):
* bindings/c/c_class.cpp:
(CClass::methodsNamed):
(CClass::fieldNamed):
* bindings/c/c_instance.cpp:
(CInstance::invokeMethod):
(CInstance::defaultValue):
* bindings/c/c_runtime.cpp:
(CField::valueFromInstance):
(CField::setValueToInstance):
* bindings/c/c_utility.cpp:
(convertNPStringToUTF16):
(convertUTF8ToUTF16):
(coerceValueToNPVariantStringType):
(convertValueToNPVariant):
(convertNPVariantToValue):
* bindings/c/c_utility.h:
* bindings/npruntime.cpp:
(NPN_GetIdentifier):
(NPN_GetIdentifiers):
(NPN_UTF8FromIdentifier):
(NPN_VariantIsVoid):
(NPN_VariantIsNull):
(NPN_VariantIsUndefined):
(NPN_VariantIsBool):
(NPN_VariantIsInt32):
(NPN_VariantIsDouble):
(NPN_VariantIsString):
(NPN_VariantIsObject):
(NPN_VariantToBool):
(NPN_VariantToString):
(NPN_VariantToInt32):
(NPN_VariantToDouble):
(NPN_VariantToObject):
(NPN_InitializeVariantAsVoid):
(NPN_InitializeVariantAsNull):
(NPN_InitializeVariantAsUndefined):
(NPN_InitializeVariantWithBool):
(NPN_InitializeVariantWithInt32):
(NPN_InitializeVariantWithDouble):
(NPN_InitializeVariantWithString):
(NPN_InitializeVariantWithStringCopy):
(NPN_InitializeVariantWithObject):
(NPN_InitializeVariantWithVariant):
(NPN_ReleaseVariantValue):
(NPN_CreateObject):
(NPN_RetainObject):
(NPN_ReleaseObject):
(NPN_IsKindOfClass):
(NPN_SetExceptionWithUTF8):
(NPN_SetException):
* bindings/npruntime.h:
(_NPString::):
(_NPString::_NPVariant::):
* bindings/testbindings.cpp:
(logMessage):
(setDoubleValue):
(setIntValue):
(setStringValue):
(setBooleanValue):
(getDoubleValue):
(getIntValue):
(getStringValue):
(getBooleanValue):
(myGetProperty):
(mySetProperty):
(myInvoke):
(myAllocate):
2004-04-22 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3627473>: "REGRESSION (125-137): memory trasher in UString::append, causing many different crashes"
* kjs/ustring.cpp:
(KJS::UString::expandCapacity): Fix sizeof(UChar *) that should be sizeof(UChar).
Was resulting in a buffer 2x the needed size.
(KJS::UString::expandPreCapacity): Ditto.
(KJS::UString::append): Fix malloc that is missing a sizeof(UChar).
2004-04-21 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
Preliminary change for conservative GC. Create "protected"
subclasses to GC-protect objects when on heap, since we will soon
remove the built-in refcounting of the normal wrapper classes. Use
them where needed.
* JavaScriptCore.pbproj/project.pbxproj:
* kjs/context.h:
* kjs/internal.h:
(KJS::InterpreterImp::globalObject):
* kjs/interpreter.h:
* kjs/property_map.cpp:
* kjs/reference.h:
* kjs/reference_list.cpp:
2004-04-19 Maciej Stachowiak <mjs@apple.com>
Reviewed by Dave.
Optimize prepend using the shared substring optimization. Also,
limit the applicability of shared append and shared prepend. If
you overdo it, it does more harm than good, because you create a
bunch of strings that are disqualified from future shared
append/prepend, for not much immediate savings in allocate/copy
expense.
* kjs/ustring.cpp:
(KJS::):
(KJS::UString::Rep::create):
(KJS::UString::expandedSize):
(KJS::UString::usedPreCapacity):
(KJS::UString::expandCapacity):
(KJS::UString::expandPreCapacity):
(KJS::UString::UString):
(KJS::UString::append):
(KJS::UString::operator=):
* kjs/ustring.h:
(KJS::UString::Rep::data):
2004-04-16 Maciej Stachowiak <mjs@apple.com>
Reviewed by Richard.
No more need for Completion or Reference to privately inherit from
Value, none of the superclass functionality is used.
* kjs/completion.h:
* kjs/reference.h:
=== Safari-137 ===
2004-04-16 Richard Williamson <rjw@apple.com>
Added interpreter lock protection around object creation.
Reviewed by Chris.
* bindings/runtime.cpp:
(Instance::createRuntimeObject):
2004-04-16 Maciej Stachowiak <mjs@apple.com>
Reviewed by Ken.
Another JavaScript speed improvement: use the mechanism from
string append optimization to make taking a substring fast, again
sharing the buffer.
A further 22% improvement on the 24fun string speed test.
* kjs/ustring.cpp:
(KJS::):
(KJS::UString::Rep::create):
(KJS::UString::UString):
(KJS::UString::append):
(KJS::UString::operator=):
(KJS::UString::substr):
* kjs/ustring.h:
(KJS::UString::Rep::data):
2004-04-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fixed <rdar://problem/3600695>: String manipulation in JavaScript 24fun test is very slow (slow)
- fixed <rdar://problem/3600691>: Table generation test is really slow
- fixed <rdar://problem/3600661>: 24fun date test is really slow
80% speedup on the string test, lesser speedups on the other two.
Two different optimizations here:
1) Avoid large overhead of scanning strings to see if they are all
ASCII before numeric conversion.
* kjs/nodes.cpp:
(AssignNode::evaluate): Don't convert to integer until we know for
sure the operation will need it. Attempting to convert strings to
numbers is a waste when they are being appended with +=.
2) Avoid huge cost of appending strings.
This is done by allowing multiple strings to share a buffer but
actually use different ranges of it. The first time a string is
appended to, we start leaving at least 10% extra space in the
buffer, so doing N appends to the same string takes O(log N)
mallocs instead of O(N).
* kjs/identifier.cpp:
(KJS::Identifier::equal):
(KJS::Identifier::add):
* kjs/ustring.cpp:
(KJS::):
(KJS::UCharReference::operator=):
(KJS::UCharReference::ref):
(KJS::UString::Rep::create):
(KJS::UString::Rep::destroy):
(KJS::UString::expandedSize):
(KJS::UString::usedCapacity):
(KJS::UString::expandCapacity):
(KJS::UString::UString):
(KJS::UString::null):
(KJS::UString::append):
(KJS::UString::operator=):
(KJS::UString::toStrictUInt32):
(KJS::UString::detach):
(KJS::KJS::operator==):
* kjs/ustring.h:
(KJS::UString::Rep::data):
(KJS::UString::Rep::hash):
2004-04-09 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
- fix deployment build by avoiding deployment-only warning.
* kjs/scope_chain.cpp:
(KJS::ScopeChain::bottom):
2004-04-09 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
Changed things so that newly created objects get a prototype based
on the scope chain of the current function, rather than the
interpreter that started execution. This fixes the following bugs:
<rdar://problem/3368523>: ARCH: wrong prototype used to create new objects (hang on lookup.atomica.com)
<rdar://problem/3559173>: ARCH: Cannot scan using a HP Jetdirect product (JS object prototypes bind incorrectly)
* JavaScriptCore.pbproj/project.pbxproj:
* kjs/array_object.cpp:
(CompareWithCompareFunctionArguments::CompareWithCompareFunctionArguments):
(ArrayProtoFuncImp::ArrayProtoFuncImp):
(ArrayProtoFuncImp::call):
(ArrayObjectImp::construct):
* kjs/bool_object.cpp:
(BooleanObjectImp::construct):
* kjs/date_object.cpp:
(DateProtoFuncImp::DateProtoFuncImp):
(DateProtoFuncImp::call):
(DateObjectImp::construct):
* kjs/error_object.cpp:
(ErrorObjectImp::construct):
* kjs/function.cpp:
(FunctionImp::FunctionImp):
(FunctionImp::call):
(DeclaredFunctionImp::construct):
(ArgumentsImp::ArgumentsImp):
(GlobalFuncImp::call):
* kjs/function_object.cpp:
(FunctionProtoFuncImp::call):
(FunctionObjectImp::construct):
* kjs/internal.cpp:
(BooleanImp::toObject):
(StringImp::toObject):
(NumberImp::toObject):
(InterpreterImp::InterpreterImp):
(InterpreterImp::clear):
(InterpreterImp::interpreterWithGlobalObject):
* kjs/internal.h:
* kjs/interpreter.cpp:
(ExecState::lexicalInterpreter):
* kjs/interpreter.h:
(KJS::ExecState::dynamicInterpreter):
(KJS::ExecState::interpreter):
* kjs/math_object.cpp:
(MathFuncImp::MathFuncImp):
* kjs/nodes.cpp:
(StatementNode::hitStatement):
(StatementNode::abortStatement):
(RegExpNode::evaluate):
(ElementNode::evaluate):
(ArrayNode::evaluate):
(ObjectLiteralNode::evaluate):
(PropertyValueNode::evaluate):
(FunctionCallNode::evaluate):
(FuncDeclNode::processFuncDecl):
(FuncExprNode::evaluate):
* kjs/number_object.cpp:
(NumberObjectImp::construct):
* kjs/object.cpp:
(KJS::ObjectImp::defaultValue):
(KJS::Error::create):
* kjs/object_object.cpp:
(ObjectObjectImp::construct):
* kjs/reference.cpp:
(Reference::putValue):
* kjs/regexp_object.cpp:
(RegExpProtoFuncImp::call):
(RegExpObjectImp::arrayOfMatches):
(RegExpObjectImp::construct):
* kjs/scope_chain.cpp:
(KJS::ScopeChain::bottom):
* kjs/scope_chain.h:
* kjs/string_object.cpp:
(StringProtoFuncImp::StringProtoFuncImp):
(StringProtoFuncImp::call):
(StringObjectImp::construct):
=== Safari-136 ===
=== Safari-135 ===
2004-03-31 Richard Williamson <rjw@apple.com>
Tedious renames based on feedback from plugin-futures list.
NP_ functions are renamed with NPN_ prefix.
Types prefix renamed from NP_ to NP.
NPN_CreateStringWithUTF8 and NPN_SetExceptionWithUTF8 now take a length, optionally -1 if string is null terminated.
No review because this was just a renaming patch.
* bindings/NP_jsobject.cpp:
(listFromNPArray):
(jsAllocate):
(identiferFromNPIdentifier):
(NPN_Call):
(NPN_Evaluate):
(NPN_GetProperty):
(NPN_SetProperty):
(NPN_RemoveProperty):
(NPN_ToString):
(NPN_GetPropertyAtIndex):
(NPN_SetPropertyAtIndex):
* bindings/NP_jsobject.h:
* bindings/c/c_class.cpp:
(CClass::_commonInit):
(CClass::classForIsA):
(CClass::CClass):
(CClass::methodsNamed):
(CClass::fieldNamed):
* bindings/c/c_class.h:
* bindings/c/c_instance.cpp:
(CInstance::CInstance):
(CInstance::~CInstance):
(CInstance::operator=):
(CInstance::invokeMethod):
(CInstance::defaultValue):
* bindings/c/c_instance.h:
(KJS::Bindings::CInstance::getObject):
* bindings/c/c_runtime.cpp:
(CField::valueFromInstance):
(CField::setValueToInstance):
* bindings/c/c_runtime.h:
(KJS::Bindings::CField::CField):
(KJS::Bindings::CField::name):
(KJS::Bindings::CMethod::CMethod):
(KJS::Bindings::CMethod::name):
* bindings/c/c_utility.cpp:
(coerceValueToNPString):
(convertValueToNPValueType):
(convertNPValueTypeToValue):
* bindings/c/c_utility.h:
* bindings/npruntime.cpp:
(NPN_IdentifierFromUTF8):
(NPN_IsValidIdentifier):
(NPN_GetIdentifiers):
(NPN_UTF8FromIdentifier):
(NPN_CreateObject):
(NPN_RetainObject):
(NPN_ReleaseObject):
(NPN_IsKindOfClass):
(NPN_SetExceptionWithUTF8):
(NPN_SetException):
(numberAllocate):
(NPN_CreateNumberWithInt):
(NPN_CreateNumberWithFloat):
(NPN_CreateNumberWithDouble):
(NPN_IntFromNumber):
(NPN_FloatFromNumber):
(NPN_DoubleFromNumber):
(stringAllocate):
(NPN_CreateStringWithUTF8):
(NPN_CreateStringWithUTF16):
(NPN_DeallocateUTF8):
(NPN_UTF8FromString):
(NPN_UTF16FromString):
(NPN_StringLength):
(booleanAllocate):
(NPN_CreateBoolean):
(NPN_BoolFromBoolean):
(nullAllocate):
(NPN_GetNull):
(undefinedAllocate):
(NPN_GetUndefined):
(arrayAllocate):
(arrayDeallocate):
(NPN_CreateArray):
(NPN_CreateArrayV):
(NPN_ObjectAtIndex):
* bindings/npruntime.h:
* bindings/runtime.cpp:
(Instance::createBindingForLanguageInstance):
* bindings/testbindings.cpp:
(initializeIdentifiers):
(myHasProperty):
(myHasMethod):
(myGetProperty):
(mySetProperty):
(logMessage):
(setDoubleValue):
(setIntValue):
(setStringValue):
(setBooleanValue):
(getDoubleValue):
(getIntValue):
(getStringValue):
(getBooleanValue):
(myInvoke):
(myAllocate):
(myInvalidate):
(myDeallocate):
(main):
2004-03-31 Richard Williamson <rjw@apple.com>
Changed references to NP_runtime.h to npruntime.h
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.h:
* bindings/c/c_class.h:
* bindings/c/c_instance.h:
* bindings/c/c_runtime.h:
* bindings/c/c_utility.h:
* bindings/npruntime.cpp:
2004-03-31 Richard Williamson <rjw@apple.com>
Renamed NP_runtime.h to npruntime.h to match Netscape SDK.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.h:
* bindings/npruntime.cpp:
=== Safari-134 ===
2004-03-23 Richard Williamson <rjw@apple.com>
Added implementation of KJS::Value <-> NP_Object conversion functions.
Augmented test program for 'C' bindings.
Added asserts and parameter checking to all public API.
Reviewed by Ken.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.cpp:
(NP_ToString):
* bindings/NP_jsobject.h: Added.
* bindings/NP_runtime.cpp:
(NP_IdentifierFromUTF8):
(NP_IsValidIdentifier):
(NP_GetIdentifiers):
(NP_CreateObject):
(NP_RetainObject):
(NP_ReleaseObject):
(NP_IsKindOfClass):
(NP_SetExceptionWithUTF8):
(NP_SetException):
(NP_IntFromNumber):
(NP_FloatFromNumber):
(NP_DoubleFromNumber):
(NP_CreateStringWithUTF8):
(NP_CreateStringWithUTF16):
(NP_DeallocateUTF8):
(NP_UTF8FromString):
(NP_UTF16FromString):
(NP_StringLength):
(NP_BoolFromBoolean):
* bindings/NP_runtime.h:
* bindings/c/c_instance.cpp:
(CInstance::invokeMethod):
* bindings/c/c_utility.cpp:
(coerceValueToNPString):
(convertValueToNPValueType):
(convertNPValueTypeToValue):
* bindings/c/c_utility.h:
* bindings/test.js:
* bindings/testC.js: Added.
* bindings/testbindings.cpp:
(logMessage):
(setDoubleValue):
(setIntValue):
(setStringValue):
(setBooleanValue):
(getDoubleValue):
(getIntValue):
(getStringValue):
(getBooleanValue):
(myInterfaceInvoke):
(myInterfaceAllocate):
=== Safari-133 ===
2004-03-19 Darin Adler <darin@apple.com>
Reviewed by Ken.
- fixed problem with methods like setUTCHour
* kjs/date_object.cpp: (DateProtoFuncImp::call): Fix conversion back to time_t to use the appropriate
GMT vs. local time function based on the utc flag.
2004-03-17 Richard Williamson <rjw@apple.com>
Added a context parameter to result callbacks use by JavaScriptObject functions. This was a change requested by Eric Carlson on the QT plugin team.
Reviewed by Ken.
* bindings/NP_jsobject.cpp:
(NP_Call):
(NP_Evaluate):
(NP_GetProperty):
(NP_ToString):
(NP_GetPropertyAtIndex):
* bindings/NP_runtime.h:
2004-03-16 Richard Williamson <rjw@apple.com>
Fixed 3590169. Regression (crash) caused by the switch to MethodLists. Crash when attempting to invoke a method from JavaScript to Java that is not implemented.
Reviewed by John.
* bindings/jni/jni_class.cpp:
(JavaClass::methodsNamed):
2004-03-15 Richard Williamson <rjw@apple.com>
Fixed 3570854. Don't attempt to convert Null to strings. We
were incorrectly converting to "Null".
Actually fixed by Scott Kovatch.
Reviewed by Richard.
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::convertValueToJValue):
=== Safari-132 ===
2004-03-11 Richard Williamson <rjw@apple.com>
Stitched together the NP stuff to our language independent
JavaScript binding stuff. Very close to being done.
Added program to test C bindings (and NP stuff). Just tests
properties. Will add methods and JavaScript access, etc.
Updated Makefile.am to account for new bindings/c directory.
Change NP_UTF8 from "const char *" to "char" to allow for
declarations like "const NP_UTF8 *" and "NP_UTF8 *". Ditto
for NP_UTF16.
Added NP_IsValidIdentifier().
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* Makefile.am:
* bindings/NP_jsobject.cpp:
(identiferFromNPIdentifier):
(NP_Evaluate):
* bindings/NP_runtime.cpp:
(NP_IdentifierFromUTF8):
(NP_IsValidIdentifier):
(NP_GetIdentifiers):
(NP_UTF8FromIdentifier):
(NP_SetExceptionWithUTF8):
(NP_SetException):
(NP_CreateStringWithUTF8):
(NP_CreateStringWithUTF16):
(NP_UTF8FromString):
(NP_UTF16FromString):
* bindings/NP_runtime.h:
* bindings/c/c_class.cpp: Added.
(CClass::_commonDelete):
(CClass::_commonCopy):
(CClass::_commonInit):
(_createClassesByIsAIfNecessary):
(CClass::classForIsA):
(CClass::CClass):
(CClass::name):
(CClass::methodsNamed):
(CClass::fieldNamed):
* bindings/c/c_class.h: Added.
(KJS::Bindings::CClass::~CClass):
(KJS::Bindings::CClass::CClass):
(KJS::Bindings::CClass::operator=):
(KJS::Bindings::CClass::constructorAt):
(KJS::Bindings::CClass::numConstructors):
* bindings/c/c_instance.cpp: Added.
(CInstance::CInstance):
(CInstance::~CInstance):
(CInstance::operator=):
(CInstance::getClass):
(CInstance::begin):
(CInstance::end):
(CInstance::invokeMethod):
(CInstance::defaultValue):
(CInstance::stringValue):
(CInstance::numberValue):
(CInstance::booleanValue):
(CInstance::valueOf):
* bindings/c/c_instance.h: Added.
(KJS::Bindings::CInstance::getObject):
* bindings/c/c_runtime.cpp: Added.
(CField::valueFromInstance):
(CField::setValueToInstance):
* bindings/c/c_runtime.h: Added.
(KJS::Bindings::CField::CField):
(KJS::Bindings::CField::name):
(KJS::Bindings::CField::type):
(KJS::Bindings::CMethod::CMethod):
(KJS::Bindings::CMethod::name):
(KJS::Bindings::CMethod::numParameters):
* bindings/c/c_utility.cpp: Added.
(coerceValueToNPValueType):
(convertValueToNPValueType):
(convertNPValueTypeToValue):
* bindings/c/c_utility.h: Added.
* bindings/make_testbindings:
* bindings/runtime.cpp:
(Instance::createBindingForLanguageInstance):
* bindings/runtime.h:
(KJS::Bindings::Instance::):
* bindings/testbindings.cpp: Added.
(initializeIdentifiers):
(myInterfaceHasProperty):
(myInterfaceHasMethod):
(myInterfaceGetProperty):
(myInterfaceSetProperty):
(myInterfaceInvoke):
(myInterfaceAllocate):
(myInterfaceInvalidate):
(myInterfaceDeallocate):
(GlobalImp::className):
(readJavaScriptFromFile):
(main):
2004-03-10 Richard Williamson <rjw@apple.com>
Made changes to support new asychronous approach to calls from
plugin to JavaScript
Reviewed by Chris.
* bindings/NP_jsobject.cpp:
(NP_Call):
(NP_Evaluate):
(NP_GetProperty):
(NP_ToString):
(NP_GetPropertyAtIndex):
* bindings/NP_runtime.h:
* bindings/make_testbindings:
* bindings/runtime.cpp:
(Instance::createBindingForLanguageInstance):
2004-03-10 Richard Williamson <rjw@apple.com>
Updated header to include proposed changes from
plugin-futures list. Calls from plugin to JavaScript
are now asynchronous.
Reviewed by Chris.
* bindings/NP_runtime.h:
=== Safari-131 ===
2004-03-04 Richard Williamson <rjw@apple.com>
Implementation of NP_JavaScriptObject. This is the 'C' class
that wraps a JavaScript object.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_jsobject.cpp: Added.
(coerceValueToNPValueType):
(convertValueToNPValueType):
(convertNPValueTypeToValue):
(listFromNPArray):
(jsAllocate):
(jsDeallocate):
(identiferFromNPIdentifier):
(NP_Call):
(NP_Evaluate):
(NP_GetProperty):
(NP_SetProperty):
(NP_RemoveProperty):
(NP_ToString):
(NP_GetPropertyAtIndex):
(NP_SetPropertyAtIndex):
* bindings/NP_runtime.cpp:
(NP_ObjectAtIndex):
* bindings/NP_runtime.h:
* bindings/runtime_object.h:
2004-03-04 Richard Williamson <rjw@apple.com>
Added NP_Array implementation.
Changed NP_Boolean to just depend on two static instances, no
space is required for values.
Reviewed by Chris.
* bindings/NP_runtime.cpp:
(NP_CreateBoolean):
(NP_BoolFromBoolean):
(arrayAllocate):
(arrayDeallocate):
(NP_CreateArray):
(NP_CreateArrayV):
(NP_ObjectAtIndex):
* bindings/NP_runtime.h:
2004-03-03 Darin Adler <darin@apple.com>
Reviewed by Vicki.
* English.lproj/InfoPlist.strings: Removed. No need to localize the version and
copyright string, and that's all that was in here.
* JavaScriptCore.pbproj/project.pbxproj: Removed InfoPlist.strings from build.
2004-03-03 Richard Williamson <rjw@apple.com>
More 'C' binding implementation. Fleshed out all the
'primitive' data types.
Reviewed by Chris.
* bindings/NP_runtime.cpp:
(NP_ReleaseObject):
(numberAllocate):
(stringAllocate):
(stringDeallocate):
(NP_CreateStringWithUTF8):
(NP_CreateStringWithUTF16):
(NP_UTF8FromString):
(NP_UTF16FromString):
(NP_StringLength):
(booleanAllocate):
(booleanDeallocate):
(NP_CreateBoolean):
(NP_BoolFromBoolean):
(nullAllocate):
(nullDeallocate):
(NP_GetNull):
(undefinedAllocate):
(undefinedDeallocate):
(NP_GetUndefined):
* bindings/NP_runtime.h:
2004-03-03 Richard Williamson <rjw@apple.com>
More 'C' binding implementation.
Reviewed by Chris.
* bindings/NP_runtime.cpp:
(identifierEqual):
(identifierHash):
(getIdentifierDictionary):
(NP_IdentifierFromUTF8):
(NP_UTF8FromIdentifier):
(NP_CreateObject):
(NP_ReleaseObject):
(NP_IsKindOfClass):
(numberCreate):
(NP_CreateNumberWithInt):
(NP_CreateNumberWithFloat):
(NP_CreateNumberWithDouble):
(NP_IntFromNumber):
(NP_FloatFromNumber):
(NP_DoubleFromNumber):
* bindings/NP_runtime.h:
2004-03-02 Richard Williamson <rjw@apple.com>
Removed retain/release from NP_Class. Classes will not be allowed to implement their
own customer retain/release scheme.
Reviewed by Chris.
* bindings/NP_runtime.cpp:
(NP_RetainObject):
(NP_ReleaseObject):
* bindings/NP_runtime.h:
2004-03-02 Richard Williamson <rjw@apple.com>
C binding API. Partial implementation.
Completed ObjectiveC bindings (not based on the C API). These will re-implemented over the C binding API, but I wanted to get this code in the tree.
Factored root object reference counting scheme. It is now useful independent
of LiveConnect.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/NP_runtime.cpp: Added.
(NP_IdentifierFromUTF8):
(NP_GetIdentifiers):
(NP_UTF8FromIdentifier):
(NP_CreateObject):
(NP_RetainObject):
(NP_ReleaseObject):
(NP_IsKindOfClass):
(NP_SetException):
(NP_Call):
(NP_Evaluate):
(NP_GetProperty):
(NP_SetProperty):
(NP_RemoveProperty):
(NP_ToString):
(NP_GetPropertyAtIndex):
(NP_SetPropertyAtIndex):
(NP_CreateNumberWithInt):
(NP_CreateNumberWithFloat):
(NP_CreateNumberWithDouble):
(NP_IntFromNumber):
(NP_FloatFromNumber):
(NP_DoubleFromNumber):
(NP_CreateStringWithUTF8):
(NP_CreateStringWithUTF16):
(NP_UTF8FromString):
(NP_UTF16FromString):
(NP_CreateBoolean):
(NP_BoolFromBoolean):
(NP_GetNull):
(NP_GetUndefined):
(NP_CreateArray):
(NP_CreateArrayV):
(NP_ObjectAtIndex):
* bindings/NP_runtime.h: Added.
* bindings/jni/jni_jsobject.cpp:
(JSObject::invoke):
(JSObject::finalize):
(JSObject::createNative):
(JSObject::convertValueToJObject):
* bindings/jni/jni_jsobject.h:
* bindings/objc/objc_jsobject.h:
* bindings/objc/objc_jsobject.mm:
(rootForView):
(windowJavaScriptObject):
(-[JavaScriptObject initWithObjectImp:KJS::root:Bindings::]):
(-[JavaScriptObject dealloc]):
(-[JavaScriptObject _convertValueToObjcValue:KJS::]):
(-[JavaScriptObject call:arguments:]):
(-[JavaScriptObject evaluate:]):
(-[JavaScriptObject getMember:]):
(-[JavaScriptObject setMember:value:]):
(-[JavaScriptObject removeMember:]):
(-[JavaScriptObject toString]):
(-[JavaScriptObject getSlot:]):
(-[JavaScriptObject setSlot:value:]):
* bindings/objc/objc_utility.h:
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
* bindings/runtime_root.cpp: Added.
(getReferencesByRootDictionary):
(getReferencesDictionary):
(KJS::Bindings::findReferenceDictionary):
(KJS::Bindings::rootForImp):
(KJS::Bindings::addNativeReference):
(KJS::Bindings::removeNativeReference):
(completedJavaScriptAccess):
(initializeJavaScriptAccessLock):
(lockJavaScriptAccess):
(unlockJavaScriptAccess):
(RootObject::dispatchToJavaScriptThread):
(performJavaScriptAccess):
(RootObject::setFindRootObjectForNativeHandleFunction):
(RootObject::removeAllNativeReferences):
* bindings/runtime_root.h: Added.
(KJS::Bindings::RootObject::RootObject):
(KJS::Bindings::RootObject::~RootObject):
(KJS::Bindings::RootObject::setRootObjectImp):
(KJS::Bindings::RootObject::rootObjectImp):
(KJS::Bindings::RootObject::setInterpreter):
(KJS::Bindings::RootObject::interpreter):
(KJS::Bindings::RootObject::findRootObjectForNativeHandleFunction):
(KJS::Bindings::RootObject::runLoop):
(KJS::Bindings::RootObject::performJavaScriptSource):
=== Safari-130 ===
=== Safari-129 ===
2004-02-18 Richard Williamson <rjw@apple.com>
Added NSNumber/Number conversion.
Removed some unnecessary KJS:: namespace specifiers.
Reviewed by Ken.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime_array.h:
2004-02-18 Richard Williamson <rjw@apple.com>
Added support for export NSArrays.
Updated valueAt() to take an ExecState so we can throw
JS exceptions.
Implemented excludeSelectorFromJavaScript: in ObjcClass. This allows
ObjectiveC classes to control the visibility of their methods in
JavaScript.
Reviewed by Ken.
* bindings/jni/jni_runtime.cpp:
(JavaField::valueFromInstance):
(JavaArray::valueAt):
* bindings/jni/jni_runtime.h:
* bindings/objc/objc_class.mm:
(ObjcClass::methodsNamed):
* bindings/objc/objc_runtime.h:
(KJS::Bindings::ObjcArray::getObjcArray):
* bindings/objc/objc_runtime.mm:
(ObjcField::valueFromInstance):
(ObjcField::setValueToInstance):
(ObjcArray::ObjcArray):
(ObjcArray::~ObjcArray):
(ObjcArray::operator=):
(ObjcArray::setValueAt):
(ObjcArray::valueAt):
(ObjcArray::getLength):
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
* bindings/runtime.cpp:
(Instance::getValueOfField):
* bindings/runtime.h:
* bindings/runtime_array.cpp:
(RuntimeArrayImp::get):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
2004-02-17 Richard Williamson <rjw@apple.com>
Added String <-> NSString conversion.
Added tests of String <-> NSString conversion to test program.
Reviewed by Chris.
* bindings/objc/objc_utility.mm:
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
* bindings/test.js:
* bindings/testbindings.mm:
(-[MyFirstInterface getString]):
2004-02-15 Darin Adler <darin@apple.com>
Reviewed by Dave.
* JavaScriptCore.pbproj/project.pbxproj: Tweak build styles a bit, fixing OptimizedWithSymbols,
and removing redundant settings of things that match defaults in other build styles.
2004-02-13 Richard Williamson <rjw@apple.com>
Work towards the JavaScript ObjC bindings. The bindings now work for
simple scalar types. testbindings.mm is an illustration of how the
bindings work.
Reviewed by Ken.
* JavaScriptCore.pbproj/project.pbxproj:
* Makefile.am:
* bindings/jni/jni_class.cpp:
(JavaClass::methodsNamed):
* bindings/jni/jni_class.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaMethod::returnType):
* bindings/make_testbindings: Added.
* bindings/objc/objc_class.h: Added.
(KJS::Bindings::ObjcClass::~ObjcClass):
(KJS::Bindings::ObjcClass::ObjcClass):
(KJS::Bindings::ObjcClass::operator=):
(KJS::Bindings::ObjcClass::constructorAt):
(KJS::Bindings::ObjcClass::numConstructors):
* bindings/objc/objc_class.mm: Added.
(ObjcClass::_commonDelete):
(ObjcClass::_commonCopy):
(ObjcClass::_commonInit):
(_createClassesByIsAIfNecessary):
(ObjcClass::classForIsA):
(ObjcClass::ObjcClass):
(ObjcClass::name):
(ObjcClass::methodsNamed):
(ObjcClass::fieldNamed):
* bindings/objc/objc_header.h: Added.
* bindings/objc/objc_instance.h: Added.
(KJS::Bindings::ObjcInstance::getObject):
* bindings/objc/objc_instance.mm: Added.
(ObjcInstance::ObjcInstance):
(ObjcInstance::~ObjcInstance):
(ObjcInstance::operator=):
(ObjcInstance::begin):
(ObjcInstance::end):
(ObjcInstance::getClass):
(ObjcInstance::invokeMethod):
(ObjcInstance::defaultValue):
(ObjcInstance::stringValue):
(ObjcInstance::numberValue):
(ObjcInstance::booleanValue):
(ObjcInstance::valueOf):
* bindings/objc/objc_jsobject.h: Added.
* bindings/objc/objc_jsobject.mm: Added.
* bindings/objc/objc_runtime.h:
(KJS::Bindings::ObjcField::~ObjcField):
(KJS::Bindings::ObjcField::ObjcField):
(KJS::Bindings::ObjcField::operator=):
(KJS::Bindings::ObjcMethod::ObjcMethod):
(KJS::Bindings::ObjcMethod::~ObjcMethod):
(KJS::Bindings::ObjcMethod::operator=):
* bindings/objc/objc_runtime.mm: Added.
(ObjcMethod::ObjcMethod):
(ObjcMethod::name):
(ObjcMethod::numParameters):
(ObjcMethod::getMethodSignature):
(ObjcField::ObjcField):
(ObjcField::name):
(ObjcField::type):
(ObjcField::valueFromInstance):
(ObjcField::setValueToInstance):
* bindings/objc/objc_utility.h: Added.
(KJS::Bindings::):
* bindings/objc/objc_utility.mm: Added.
(KJS::Bindings::JSMethodNameToObjCMethodName):
(KJS::Bindings::convertValueToObjcValue):
(KJS::Bindings::convertObjcValueToValue):
(KJS::Bindings::objcValueTypeForType):
* bindings/runtime.cpp:
(MethodList::MethodList):
(MethodList::operator=):
(Instance::setValueOfField):
(Instance::createBindingForLanguageInstance):
(Instance::createRuntimeObject):
* bindings/runtime.h:
* bindings/runtime_method.cpp:
(RuntimeMethodImp::RuntimeMethodImp):
(RuntimeMethodImp::get):
(RuntimeMethodImp::call):
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::hasProperty):
* bindings/test.js: Added.
* bindings/testbindings.mm: Added.
(-[MySecondInterface init]):
(-[MyFirstInterface init]):
(-[MyFirstInterface dealloc]):
(+[MyFirstInterface JavaScriptNameForSelector:]):
(-[MyFirstInterface getInt]):
(-[MyFirstInterface setInt:]):
(-[MyFirstInterface getMySecondInterface]):
(-[MyFirstInterface logMessage:]):
(GlobalImp::className):
(readJavaScriptFromFile):
(main):
=== Safari-128 ===
2004-02-08 Darin Adler <darin@apple.com>
Reviewed by Dave.
- fixed things seen in the profile, for a total speedup of 4% on cvs-base (including changes across all projects)
* JavaScriptCorePrefix.h: Add a workaround for a bug in our system headers that prevents the <ctype.h>
macros from working right in C++ code that uses the <cctype> header.
* kjs/ustring.cpp:
(KJS::inlineUTF8SequenceLengthNonASCII): Added.
(KJS::UTF8SequenceLengthNonASCII): Added.
(KJS::inlineUTF8SequenceLength): Added.
(KJS::UTF8SequenceLength): Calls inlineUTF8SequenceLengthNonASCII now.
(KJS::decodeUTF8Sequence): Use new inlineUTF8SequenceLengthNonASCII; faster for ASCII.
(KJS::createSortedOffsetsArray): Add special case for 1, 2, and 3 offsets, so we don't do qsort for those.
(KJS::convertUTF16OffsetsToUTF8Offsets): Use new inlineUTF8SequenceLengthNonASCII; faster for ASCII.
(KJS::convertUTF8OffsetsToUTF16Offsets): Use new inlineUTF8SequenceLengthNonASCII; faster for ASCII.
- fixed the test program so it won't hit the interpreter lock assertion
* kjs/testkjs.cpp: (main): Just lock around the whole thing, since the test is singly threaded.
=== Safari-127 ===
2004-02-06 Richard Williamson <rjw@apple.com>
Fixed 3550242 and 3546977. The first diff prevents an assert from firing. The second diff prevents a JavaScript exception, caused be an invalid conversion, which has a downstream consequence of preventing a valid conversion.
Reviewed by John.
* bindings/jni/jni_jsobject.cpp:
(JSObject::toString):
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::convertValueToJValue):
2004-02-02 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3546613>: array of negative size leads to crash (test page at oscar.the-rileys.net)
* kjs/array_object.cpp:
(ArrayInstanceImp::ArrayInstanceImp): If the length is greater than 10,000, don't allocate an array until
we start putting values in. This prevents new Array(2147483647) from causing trouble.
(ArrayObjectImp::construct): Check number as described in specification, and raise a range error if the
number is out of range. This prevents new Array(-1) from causing trouble.
- fixed <rdar://problem/3545756>: Math.round screws up on numbers bigger than 2^31 (incorrect results on HP-35 calculator page)
* kjs/math_object.cpp: (MathFuncImp::call): Change implementation to be much simpler and not involve
casting to int. Results now match those in other browsers.
2004-02-02 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/3519285>: integer operations on large negative numbers yield bad results (discovered with "HTMLCrypt")
- fixed other related overflow issues
* kjs/value.h: Changed return types of toInteger, toInt32, toUInt32, and toUInt16.
* kjs/value.cpp:
(ValueImp::toInteger): Change to return a double, since this operation, from the ECMA specification,
must not restrict values to the range of a particular integer type.
(ValueImp::toInt32): Used a sized integer type for the result of this function, and also added
proper handling for negative results from fmod.
(ValueImp::toUInt32): Ditto.
(ValueImp::toUInt16): Ditto.
(ValueImp::dispatchToUInt32): Changed result type from unsigned to uint32_t.
* kjs/array_object.cpp: (ArrayProtoFuncImp::call): Use a double instead of an int to handle
out-of-integer-range values better in the slice function.
* kjs/internal.cpp: (KJS::roundValue): Streamline the function, handling NAN and infinity properly.
* kjs/number_object.cpp: (NumberProtoFuncImp::call): Use a double instead of an int to handle
out-of-integer-range values better in the toString function.
* kjs/string_object.cpp: (StringProtoFuncImp::call): Use a double instead of an int to handle
out-of-integer-range values better in the charAt, charCodeAt, indexOf, lastIndexOf, slice,
and substr functions.
=== Safari-126 ===
2004-01-30 Richard Williamson <rjw@apple.com>
Fixed 3542044. Create KJS::String using UString constructor instead of passing UTF8 string to char* constructor.
Reviewed by Darin.
* bindings/jni/jni_instance.cpp:
(JavaInstance::stringValue):
2004-01-26 Darin Adler <darin@apple.com>
* Makefile.am: Switch from pbxbuild to xcodebuild.
2004-01-22 Richard Williamson <rjw@apple.com>
Added stubs for ObjC language binding to JavaScript.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/jni/jni_runtime.h:
* bindings/objc/objc_runtime.h: Added.
(KJS::Bindings::ObjcParameter::ObjcParameter):
(KJS::Bindings::ObjcParameter::~ObjcParameter):
(KJS::Bindings::ObjcParameter::operator=):
(KJS::Bindings::ObjcParameter::type):
(KJS::Bindings::ObjcConstructor::ObjcConstructor):
(KJS::Bindings::ObjcConstructor::~ObjcConstructor):
(KJS::Bindings::ObjcConstructor::_commonCopy):
(KJS::Bindings::ObjcConstructor::operator=):
(KJS::Bindings::ObjcConstructor::value):
(KJS::Bindings::ObjcConstructor::parameterAt):
(KJS::Bindings::ObjcConstructor::numParameters):
(KJS::Bindings::ObjcField::ObjcField):
(KJS::Bindings::ObjcField::~ObjcField):
* bindings/runtime.h:
2004-01-22 Richard Williamson <rjw@apple.com>
Simplified JavaString by using UString as backing store. This
revealed a bug in CString's assignment operator which I fixed.
Removed some dead code.
Reviewed by John.
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaString::JavaString):
(KJS::Bindings::JavaString::_commonInit):
(KJS::Bindings::JavaString::UTF8String):
(KJS::Bindings::JavaString::uchars):
(KJS::Bindings::JavaString::length):
(KJS::Bindings::JavaString::ustring):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::RuntimeObjectImp):
* bindings/runtime_object.h:
* kjs/ustring.cpp:
(KJS::CString::CString):
(KJS::CString::operator=):
=== Safari-125 ===
=== Safari-124 ===
2004-01-16 Richard Williamson <rjw@apple.com>
Fixed 3525853. We weren't handling mapping to overloaded Java
methods very well. Even though this is undefined the other
browsers support it. Also fixed a bug with returning arrays
from Java functions.
Reviewed by John.
* bindings/jni/jni_class.cpp:
(JavaClass::_commonInit):
(JavaClass::methodsNamed):
* bindings/jni/jni_class.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaArray::convertJObjectToArray):
(JavaField::valueFromInstance):
(JavaMethod::signature):
(JavaArray::valueAt):
* bindings/jni/jni_runtime.h:
* bindings/jni_jsobject.cpp:
(JSObject::call):
(JSObject::convertJObjectToValue):
* bindings/runtime.cpp:
(MethodList::addMethod):
(MethodList::length):
(MethodList::methodAt):
(MethodList::~MethodList):
* bindings/runtime.h:
(KJS::Bindings::MethodList::MethodList):
* bindings/runtime_method.cpp:
(RuntimeMethodImp::RuntimeMethodImp):
(RuntimeMethodImp::get):
(RuntimeMethodImp::call):
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::hasProperty):
2004-01-16 Richard Williamson <rjw@apple.com>
Fixed 3531229. Another place that needs the Push/PopLocalFrame
protection implemented for 3530401.
Reviewed by John.
* bindings/runtime_method.cpp:
(RuntimeMethodImp::call):
2004-01-15 Richard Williamson <rjw@apple.com>
Fixed 3530401. JNI doesn't cleanup local refs created on the
main thread. IMO this is a bad bug in our JMI implementation.
To work-around the problem I explicitly delete all local refs.
Further, I've added Push/PopLocalFrame calls to catch any refs
that I may have missed. This will guarantee that we don't leak
any Java references.
Reviewed by John.
* bindings/jni/jni_class.cpp:
(JavaClass::_commonInit):
(JavaClass::JavaClass):
* bindings/jni/jni_instance.cpp:
(JavaInstance::begin):
(JavaInstance::end):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaConstructor::JavaConstructor):
(JavaMethod::JavaMethod):
* bindings/jni_jsobject.cpp:
(JSObject::listFromJArray):
* bindings/runtime.h:
(KJS::Bindings::Instance::begin):
(KJS::Bindings::Instance::end):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::hasProperty):
(RuntimeObjectImp::defaultValue):
2004-01-15 Vicki Murley <vicki@apple.com>
Reviewed by Darin.
* JavaScriptCore.pbproj/project.pbxproj: Update copyright date to 2004.
2004-01-14 Richard Williamson <rjw@apple.com>
Fixed 3529466. With recent changes to Java plugin we must no
longer call DeleteLocalRef(). Not a problem, it was an optimization anyway.
Reviewed by John.
* bindings/jni/jni_instance.cpp:
(JObjectWrapper::JObjectWrapper):
=== Safari-122 ===
2004-01-14 Richard Williamson <rjw@apple.com>
Fixed 3529010.
Finalize may be called on an JSObject after we've already remove all our references. The assert in this case is firing because we've received a finalize call from Java for an instance that we no longer know about. The fix is to check in finalize that we're getting a call on an instance that we still care about.
Reviewed by John.
* bindings/jni_jsobject.cpp:
(addJavaReference):
(removeJavaReference):
(RootObject::removeAllJavaReferencesForRoot):
(JSObject::invoke):
2004-01-13 Richard Williamson <rjw@apple.com>
Fixed 3528324.
The run loop that is used to execute JavaScript (in practice, always the main run loop) is held in a class variable. It is set and retained once and should not be released. Unfortunately is it being released when the 'root' object on a LiveConnect applet is released. This has the symptom of eventually causing an deallocation of the main run loop! Usually after about 5 instantiations/destructions of a LiveConnect applet. The CFRelease of the run loop was removed.
Reviewed by Hyatt.
* bindings/jni_jsobject.h:
(KJS::Bindings::RootObject::~RootObject):
=== Safari-121 ===
=== Safari-120 ===
2004-01-06 Richard Williamson <rjw@apple.com>
Fixed 3521814. Finalize messages weren't being dispatched!
Reviewed by John.
* bindings/jni_jsobject.cpp:
(JSObject::invoke):
2004-01-05 Richard Williamson <rjw@apple.com>
Added cache of JNI method IDs to minimize allocations. This mitigates the problem
described by 3515579.
Also cleanup up logging of Java exceptions.
Reviewed by John.
* bindings/jni/jni_class.cpp:
(JavaClass::classForInstance):
* bindings/jni/jni_instance.cpp:
(JavaInstance::JavaInstance):
(JavaInstance::getClass):
(JavaInstance::invokeMethod):
(JObjectWrapper::JObjectWrapper):
(JObjectWrapper::~JObjectWrapper):
* bindings/jni/jni_instance.h:
(KJS::Bindings::JavaInstance::operator=):
* bindings/jni/jni_runtime.cpp:
(JavaMethod::JavaMethod):
(JavaMethod::methodID):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaMethod::JavaMethod):
* bindings/jni/jni_utility.cpp:
(callJNIMethod):
(callJNIMethodIDA):
(callJNIMethodA):
(KJS::Bindings::getMethodID):
(KJS::Bindings::callJNIVoidMethodIDA):
(KJS::Bindings::callJNIObjectMethodIDA):
(KJS::Bindings::callJNIByteMethodIDA):
(KJS::Bindings::callJNICharMethodIDA):
(KJS::Bindings::callJNIShortMethodIDA):
(KJS::Bindings::callJNIIntMethodIDA):
(KJS::Bindings::callJNILongMethodIDA):
(KJS::Bindings::callJNIFloatMethodIDA):
(KJS::Bindings::callJNIDoubleMethodIDA):
(KJS::Bindings::callJNIBooleanMethodIDA):
(KJS::Bindings::getCharactersFromJStringInEnv):
(KJS::Bindings::getUCharactersFromJStringInEnv):
(KJS::Bindings::getJNIField):
* bindings/jni/jni_utility.h:
l2003-12-23 John Sullivan <sullivan@apple.com>
* JavaScriptCore.pbproj/project.pbxproj:
Xcode version wars, harmless
2003-12-23 Darin Adler <darin@apple.com>
Reviewed by John (concept, not code, which is just the old code coming back).
- fixed 3518092: REGRESSION (100-119): getting NaN instead of HH:MM times
* kjs/date_object.cpp: Added back our CF-based implementations of gmtime, localtime,
mktime, timegm, and time, because mktime, at least, won't handle a year of 0.
2003-12-19 Richard Williamson <rjw@apple.com>
Fixed 3515597. When an error occurs we need
to make sure result values are zeroed.
Cleaned up logs by adding a newline.
Reviewed by John.
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJavaVM):
(KJS::Bindings::getJNIEnv):
(callJNIMethod):
(callJNIMethodA):
(KJS::Bindings::getJNIField):
* bindings/jni_jsobject.cpp:
(JSObject::convertValueToJObject):
=== Safari-119 ===
2003-12-17 Richard Williamson <rjw@apple.com>
Ensure that all the symbols we export are in the KJS
namespace (3512245).
Also renamed JavaString.characters() to JavaString.UTF8String()
for enhanced clarity.
Added some sanity checking to constructor of JObjectWrapper.
Reviewed by Dave.
* ChangeLog:
* bindings/jni/jni_class.cpp:
* bindings/jni/jni_class.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
(JObjectWrapper::JObjectWrapper):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaParameter::JavaParameter):
(JavaField::JavaField):
(JavaMethod::JavaMethod):
(JavaMethod::signature):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaString::ascii):
(KJS::Bindings::JavaString::UTF8String):
(KJS::Bindings::JavaString::JavaString):
(KJS::Bindings::JavaString::_commonInit):
(KJS::Bindings::JavaString::uchars):
(KJS::Bindings::JavaString::length):
(KJS::Bindings::JavaString::ustring):
(KJS::Bindings::JavaParameter::type):
(KJS::Bindings::JavaField::name):
(KJS::Bindings::JavaField::type):
(KJS::Bindings::JavaMethod::name):
(KJS::Bindings::JavaMethod::returnType):
* bindings/jni/jni_utility.cpp:
(KJS::Bindings::getJavaVM):
(KJS::Bindings::getJNIEnv):
(KJS::Bindings::callJNIVoidMethod):
(KJS::Bindings::callJNIObjectMethod):
(KJS::Bindings::callJNIBooleanMethod):
(KJS::Bindings::callJNIByteMethod):
(KJS::Bindings::callJNICharMethod):
(KJS::Bindings::callJNIShortMethod):
(KJS::Bindings::callJNIIntMethod):
(KJS::Bindings::callJNILongMethod):
(KJS::Bindings::callJNIFloatMethod):
(KJS::Bindings::callJNIDoubleMethod):
(KJS::Bindings::callJNIVoidMethodA):
(KJS::Bindings::callJNIObjectMethodA):
(KJS::Bindings::callJNIByteMethodA):
(KJS::Bindings::callJNICharMethodA):
(KJS::Bindings::callJNIShortMethodA):
(KJS::Bindings::callJNIIntMethodA):
(KJS::Bindings::callJNILongMethodA):
(KJS::Bindings::callJNIFloatMethodA):
(KJS::Bindings::callJNIDoubleMethodA):
(KJS::Bindings::callJNIBooleanMethodA):
(KJS::Bindings::getCharactersFromJString):
(KJS::Bindings::releaseCharactersForJString):
(KJS::Bindings::getCharactersFromJStringInEnv):
(KJS::Bindings::releaseCharactersForJStringInEnv):
(KJS::Bindings::getUCharactersFromJStringInEnv):
(KJS::Bindings::releaseUCharactersForJStringInEnv):
(KJS::Bindings::JNITypeFromClassName):
(KJS::Bindings::signatureFromPrimitiveType):
(KJS::Bindings::JNITypeFromPrimitiveType):
(KJS::Bindings::getJNIField):
(KJS::Bindings::convertValueToJValue):
* bindings/jni/jni_utility.h:
* bindings/jni_jsobject.cpp:
(KJS::Bindings::JSObject::invoke):
(KJS::Bindings::JSObject::JSObject):
(KJS::Bindings::JSObject::call):
(KJS::Bindings::JSObject::eval):
(KJS::Bindings::JSObject::getMember):
(KJS::Bindings::JSObject::setMember):
(KJS::Bindings::JSObject::removeMember):
(KJS::Bindings::JSObject::getSlot):
(KJS::Bindings::JSObject::setSlot):
(KJS::Bindings::JSObject::toString):
(KJS::Bindings::JSObject::finalize):
(KJS::Bindings::JSObject::createNative):
(KJS::Bindings::JSObject::convertValueToJObject):
(KJS::Bindings::JSObject::convertJObjectToValue):
(KJS::Bindings::JSObject::listFromJArray):
* bindings/jni_jsobject.h:
* bindings/runtime.cpp:
* bindings/runtime.h:
* bindings/runtime_method.cpp:
* bindings/runtime_method.h:
=== Safari-118 ===
2003-12-16 Richard Williamson <rjw@apple.com>
Ack! More assertions. Lock ALL entry points into the interpreter!
(3511733).
Reviewed by Ken.
* bindings/jni_jsobject.cpp:
(Bindings::JSObject::call):
(Bindings::JSObject::eval):
(Bindings::JSObject::getMember):
(Bindings::JSObject::setMember):
(Bindings::JSObject::removeMember):
(Bindings::JSObject::getSlot):
(Bindings::JSObject::setSlot):
(Bindings::JSObject::convertJObjectToValue):
2003-12-15 Richard Williamson <rjw@apple.com>
Fixed a couple of snafus and removed some logging.
Reviewed by Maciej.
* bindings/jni_jsobject.cpp:
(Bindings::performJavaScriptAccess):
(Bindings::completedJavaScriptAccess):
(Bindings::dispatchToJavaScriptThread):
Removed some annoying JS_LOG clutter.
(Bindings::RootObject::removeAllJavaReferencesForRoot):
Fixed allocation of key buffer that was called after it was needed.
(Bindings::JSObject::invoke):
(Bindings::JSObject::JSObject):
(Bindings::JSObject::getMember):
(Bindings::JSObject::getSlot):
Added additional interpreter locks around getMember and getSlot.
These functions may cause allocation of JS impls.
2003-12-15 Richard Williamson <rjw@apple.com>
args weren't passed to 'call' invocation. d'oh.
lock interpreter when we create instances of JS impls.
Reviewed by Maciej.
* bindings/jni_jsobject.cpp:
(Bindings::JSObject::call):
(Bindings::JSObject::eval):
(Bindings::JSObject::getMember):
(Bindings::JSObject::setMember):
(Bindings::JSObject::getSlot):
(Bindings::JSObject::convertValueToJObject):
(Bindings::JSObject::convertJObjectToValue):
(Bindings::JSObject::listFromJArray):
* bindings/jni_jsobject.h:
2003-12-15 Richard Williamson <rjw@apple.com>
Last piece of LiveConnect! This checkin adds implementation
of the Java to JavaScript object conversion functions.
Reviewed by John.
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_utility.cpp:
* bindings/jni/jni_utility.h:
* bindings/jni_jsobject.cpp:
(Bindings::JSObject::invoke):
(Bindings::JSObject::call):
(Bindings::JSObject::eval):
(Bindings::JSObject::getMember):
(Bindings::JSObject::setMember):
(Bindings::JSObject::getSlot):
(Bindings::JSObject::setSlot):
(Bindings::JSObject::createNative):
(Bindings::JSObject::convertValueToJObject):
(Bindings::JSObject::convertJObjectToValue):
(Bindings::JSObject::listFromJArray):
* bindings/jni_jsobject.h:
(Bindings::):
* bindings/runtime_method.cpp:
(RuntimeMethodImp::get):
(RuntimeMethodImp::codeType):
(RuntimeMethodImp::execute):
2003-12-12 Richard Williamson <rjw@apple.com>
Added implementation of stubs in JSObject. All that
remains is a couple of simple conversion functions stubs and
we're done with LiveConnect. Also, changed string passing to
JS to use uchars instead of chars.
Reviewed by Maciej.
* bindings/jni/jni_runtime.h:
(Bindings::JavaString::JavaString):
(Bindings::JavaString::_commonInit):
(Bindings::JavaString::_commonCopy):
(Bindings::JavaString::_commonDelete):
(Bindings::JavaString::~JavaString):
(Bindings::JavaString::operator=):
(Bindings::JavaString::uchars):
(Bindings::JavaString::length):
(Bindings::JavaString::ustring):
* bindings/jni/jni_utility.cpp:
(getUCharactersFromJStringInEnv):
(releaseUCharactersForJStringInEnv):
(convertValueToJObject):
(convertJObjectToValue):
* bindings/jni/jni_utility.h:
* bindings/jni_jsobject.cpp:
(Bindings::JSObject::invoke):
(Bindings::JSObject::call):
(Bindings::JSObject::eval):
(Bindings::JSObject::getMember):
(Bindings::JSObject::setMember):
(Bindings::JSObject::removeMember):
(Bindings::JSObject::getSlot):
(Bindings::JSObject::setSlot):
* bindings/jni_jsobject.h:
2003-12-12 Richard Williamson <rjw@apple.com>
Ensure that all calls from Java into JavaScript are
performed on a designated thread (the main thread).
Reviewed by Ken.
* bindings/jni_jsobject.cpp:
(isJavaScriptThread):
(rootForImp):
(Bindings::performJavaScriptAccess):
(Bindings::completedJavaScriptAccess):
(Bindings::initializeJavaScriptAccessLock):
(Bindings::lockJavaScriptAccess):
(Bindings::unlockJavaScriptAccess):
(Bindings::dispatchToJavaScriptThread):
(Bindings::RootObject::setFindRootObjectForNativeHandleFunction):
(Bindings::RootObject::removeAllJavaReferencesForRoot):
(Bindings::JSObject::invoke):
(Bindings::JSObject::JSObject):
(Bindings::JSObject::call):
(Bindings::JSObject::eval):
(Bindings::JSObject::getMember):
(Bindings::JSObject::setMember):
(Bindings::JSObject::removeMember):
(Bindings::JSObject::getSlot):
(Bindings::JSObject::setSlot):
(Bindings::JSObject::toString):
(Bindings::JSObject::finalize):
(Bindings::JSObject::getWindow):
* bindings/jni_jsobject.h:
(Bindings::RootObject::~RootObject):
(Bindings::RootObject::findRootObjectForNativeHandleFunction):
(Bindings::RootObject::runLoop):
(Bindings::RootObject::performJavaScriptSource):
(Bindings::):
2003-12-11 Richard Williamson <rjw@apple.com>
Added support for calling a JavaScript function from
Java. Right now this only works for void func(void)
functions, but the conversion of args and return values
will come shortly.
Cleaned up and verified reference counting scheme, and
dereferencing of vended JavaScript objects when applet is
destroyed (actually when part is destroyed).
Removed link hack for testkjs now that the Java folks think
they have a solution for the 1.4.2 JavaVM link problem. Although
Greg B. thinks his solution may cause problems for the 1.3.1
version of the VM!?!
Reviewed by Ken.
* Makefile.am:
* bindings/jni/jni_runtime.h:
(Bindings::JavaString::JavaString):
* bindings/jni/jni_utility.cpp:
(convertValueToJValue):
(convertValueToJObject):
(listFromJArray):
* bindings/jni/jni_utility.h:
* bindings/jni_jsobject.cpp:
(KJS_setFindRootObjectForNativeHandleFunction):
(KJS_findRootObjectForNativeHandleFunction):
(getReferencesByRootDictionary):
(getReferencesDictionary):
(findReferenceDictionary):
(rootForImp):
(addJavaReference):
(removeJavaReference):
* bindings/jni_jsobject.h:
(Bindings::RootObject::RootObject):
(Bindings::RootObject::~RootObject):
(Bindings::RootObject::setRootObjectImp):
(Bindings::RootObject::rootObjectImp):
(Bindings::RootObject::setInterpreter):
(Bindings::RootObject::interpreter):
=== Safari-117 ===
2003-12-10 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed regression in JavaScript tests reported by the KDE guys
- fixed 3506345: REGRESSION (115-116): VIP: chordfind.com no longer displays chords
* kjs/ustring.h: Add tolerateEmptyString parameter to toDouble and toULong.
* kjs/ustring.cpp:
(KJS::UString::toDouble): Separate the "tolerant" parameter into two separate ones:
tolerateTrailingJunk and tolerateEmptyString. Add new overloads; better for code size
and binary compatibility than default parameter values.
(KJS::UString::toULong): Pass tolerateEmptyString down to toDouble. Add new overload.
* kjs/string_object.cpp: (StringProtoFuncImp::call): Pass false for the new
"tolerate empty string" parameter.
2003-12-10 Richard Williamson <rjw@apple.com>
Added code to manage reference counting of JavaScript
objects passed to Java. Also added implementation of
KJS_JSCreateNativeJSObject. This is the function that
provides the root object to Java (KJS::Window).
Reviewed by Hyatt.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/jni_jsobject.cpp:
(KJS_setFindObjectForNativeHandleFunction):
(KJS_findObjectForNativeHandleFunction):
(getReferencesByOwnerDictionary):
(getReferencesDictionary):
(findReferenceDictionary):
(addJavaReference):
(removeJavaReference):
(removeAllJavaReferencesForOwner):
* bindings/jni_jsobject.h:
2003-12-09 Richard Williamson <rjw@apple.com>
LiveConnect stubs that correspond to the native methods
on JSObject. These will be called from the new Java plugin
when an instance of JSObject is instantiated and messaged.
When these are implemented the Java will be able to originate
calls into JavaScript.
Also a temporary work-around added to Makefile.am to solve
a link problem. The 1.4.2 JavaVM accidentally links against
libobjc. This call a failure linking testkjs. Mike Hay is
working with someone to fix the problem (3505587).
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* Makefile.am:
* bindings/jni_jsobject.cpp: Added.
(KJS_JSCreateNativeJSObject):
(KJS_JSObject_JSFinalize):
(KJS_JSObject_JSObjectCall):
(KJS_JSObject_JSObjectEval):
(KJS_JSObject_JSObjectGetMember):
(KJS_JSObject_JSObjectSetMember):
(KJS_JSObject_JSObjectRemoveMember):
(KJS_JSObject_JSObjectGetSlot):
(KJS_JSObject_JSObjectSetSlot):
(KJS_JSObject_JSObjectToString):
* bindings/jni_jsobject.h: Added.
2003-12-09 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
<rdar://problem/3505183>: JavaScriptCore should assert that interpreter is locked in collector
* kjs/collector.cpp:
(KJS::Collector::allocate): Assert that interpreter lock count is not 0.
(KJS::Collector::collect): likewise
2003-12-08 Richard Williamson <rjw@apple.com>
LiveConnect: The last piece of the JavaScript side of the
LiveConnect implementation. This change adds support for
setting/getting values from Java arrays in JavaScript.
Reviewed by John.
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaField::JavaField):
(convertJObjectToArray):
(JavaArray::JavaArray):
(JavaArray::~JavaArray):
(JavaArray::setValueAt):
(JavaArray::valueAt):
(JavaArray::getLength):
* bindings/jni/jni_runtime.h:
(Bindings::JavaArray::operator=):
(Bindings::JavaArray::javaArray):
* bindings/jni/jni_utility.cpp:
(JNITypeFromPrimitiveType):
(convertValueToJValue):
* bindings/jni/jni_utility.h:
* bindings/runtime.h:
* bindings/runtime_array.cpp:
(RuntimeArrayImp::RuntimeArrayImp):
(RuntimeArrayImp::~RuntimeArrayImp):
(RuntimeArrayImp::get):
(RuntimeArrayImp::put):
(RuntimeArrayImp::hasProperty):
* bindings/runtime_array.h:
(KJS::RuntimeArrayImp::getLength):
(KJS::RuntimeArrayImp::getConcreteArray):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::hasProperty):
2003-12-05 Richard Williamson <rjw@apple.com>
LiveConnect: Part 1 of supporting JS bindings to
native language arrays.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/jni/jni_runtime.cpp:
(JavaField::JavaField):
(convertJObjectToArray):
(JavaField::valueFromInstance):
(JavaField::setValueToInstance):
* bindings/jni/jni_runtime.h:
* bindings/runtime.cpp:
(Instance::setValueOfField):
* bindings/runtime.h:
(Bindings::Array::~Array):
2003-12-04 Richard Williamson <rjw@apple.com>
LiveConnect: Moved defaultValue into concrete implementation because
more intelligent conversion can be perform with knowledge
of the class of the original instance.
Reviewed by Chris.
* bindings/jni/jni_class.cpp:
(JavaClass::isNumberClass):
(JavaClass::isBooleanClass):
(JavaClass::isStringClass):
* bindings/jni/jni_class.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::defaultValue):
(JavaInstance::valueOf):
* bindings/jni/jni_instance.h:
(Bindings::JavaInstance::javaInstance):
* bindings/runtime.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::defaultValue):
2003-12-04 Richard Williamson <rjw@apple.com>
LiveConnect: Added support for setting the value of Java
fields.
Reviewed by Chris.
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_runtime.cpp:
(JavaParameter::JavaParameter):
(JavaField::JavaField):
(JavaField::valueFromInstance):
(JavaField::setValueToInstance):
(JavaMethod::JavaMethod):
* bindings/jni/jni_runtime.h:
(Bindings::JavaField::getJNIType):
* bindings/jni/jni_utility.cpp:
(JNITypeFromClassName):
(convertValueToJValue):
* bindings/jni/jni_utility.h:
* bindings/runtime.cpp:
(Instance::setValueOfField):
* bindings/runtime.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
(RuntimeObjectImp::put):
(RuntimeObjectImp::defaultValue):
2003-12-04 Richard Williamson <rjw@apple.com>
Added support for string conversions.
Changed various JavaString member variables to be inline.
Implemented defaultValue for context relevant type coercion.
Reviewed by Chris.
* bindings/jni/jni_class.cpp:
(JavaClass::JavaClass):
(JavaClass::setClassName):
(JavaClass::classForInstance):
* bindings/jni/jni_class.h:
* bindings/jni/jni_instance.cpp:
(JavaInstance::stringValue):
(JavaInstance::numberValue):
(JavaInstance::booleanValue):
(JavaInstance::invokeMethod):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaParameter::JavaParameter):
(JavaField::JavaField):
(JavaMethod::JavaMethod):
(appendClassName):
(JavaMethod::signature):
* bindings/jni/jni_runtime.h:
(Bindings::JavaString::JavaString):
(Bindings::JavaString::~JavaString):
(Bindings::JavaString::operator=):
(Bindings::JavaString::characters):
(Bindings::JavaParameter::JavaParameter):
(Bindings::JavaParameter::~JavaParameter):
(Bindings::JavaParameter::operator=):
(Bindings::JavaParameter::type):
(Bindings::JavaField::JavaField):
(Bindings::JavaField::~JavaField):
(Bindings::JavaField::operator=):
(Bindings::JavaField::name):
(Bindings::JavaField::type):
(Bindings::JavaMethod::JavaMethod):
(Bindings::JavaMethod::_commonDelete):
(Bindings::JavaMethod::name):
(Bindings::JavaMethod::returnType):
* bindings/jni/jni_utility.cpp:
(convertValueToJValue):
* bindings/runtime.h:
(Bindings::Instance::valueOf):
* bindings/runtime_method.cpp:
(RuntimeMethodImp::call):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::get):
(RuntimeObjectImp::defaultValue):
* bindings/runtime_object.h:
(KJS::RuntimeObjectImp::classInfo):
=== Safari-116 ===
2003-12-03 Richard Williamson <rjw@apple.com>
LiveConnect: Added support for parameter passing to Java and conversion
of return values.
Reviewed by Chris.
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaParameter::JavaParameter):
(JavaMethod::JavaMethod):
(JavaMethod::signature):
* bindings/jni/jni_runtime.h:
(Bindings::JavaParameter::JavaParameter):
(Bindings::JavaParameter::operator=):
(Bindings::JavaParameter::getJNIType):
* bindings/jni/jni_utility.cpp:
(callJNIBooleanMethodA):
(convertValueToJValue):
* bindings/jni/jni_utility.h:
* bindings/runtime.h:
* bindings/runtime_method.cpp:
(RuntimeMethodImp::call):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
2003-12-02 Richard Williamson <rjw@apple.com>
Added support for calling simple methods in Java from JavaScript.
(void return and no parameters). Yay, LiveConnect lives.
Still need write argument and return value conversion code.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/jni/jni_instance.cpp:
(JavaInstance::getClass):
(JavaInstance::invokeMethod):
* bindings/jni/jni_instance.h:
* bindings/jni/jni_runtime.cpp:
(JavaMethod::JavaMethod):
(JavaMethod::signature):
(JavaMethod::JNIReturnType):
* bindings/jni/jni_runtime.h:
(Bindings::JavaMethod::_commonDelete):
(Bindings::JavaMethod::_commonCopy):
(Bindings::JavaMethod::name):
* bindings/jni/jni_utility.cpp:
(signatureFromPrimitiveType):
* bindings/jni/jni_utility.h:
* bindings/runtime.h:
* bindings/runtime_method.cpp: Added.
(RuntimeMethodImp::RuntimeMethodImp):
(RuntimeMethodImp::~RuntimeMethodImp):
(RuntimeMethodImp::get):
(RuntimeMethodImp::implementsCall):
(RuntimeMethodImp::call):
(RuntimeMethodImp::codeType):
(RuntimeMethodImp::execute):
* bindings/runtime_method.h: Added.
* bindings/runtime_object.cpp:
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::get):
* bindings/runtime_object.h:
* kjs/function.cpp:
(FunctionImp::FunctionImp):
* kjs/interpreter.h:
2003-12-01 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- fixed 3493799: JavaScript string.replace expands $ if it's the last character in replacement string
* kjs/ustring.cpp: (KJS::UString::toDouble): Fix backwards handling of the "tolerant" boolean.
This indirectly caused the string.replace bug.
2003-12-02 Maciej Stachowiak <mjs@apple.com>
Merged patches from Harri Porten and David Faure to fix:
<rdar://problem/3497643>: reproducible crash printing self-referential array
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call): Break out of the loop if an exception was thrown.
* kjs/nodes.cpp:
(FunctionCallNode::evaluate): Move function call depth check from here...
* kjs/object.cpp:
(KJS::Object::call): ...to here.
* kjs/object.h: Un-inline Object::call now that it does more.
2003-12-01 Richard Williamson <rjw@apple.com>
Fixed mistake in method signatures used to get boolean and integer fields.
Reviewed by Chris.
* bindings/jni/jni_runtime.cpp:
(JavaField::valueFromInstance):
2003-12-01 Richard Williamson <rjw@apple.com>
Fixed parameter passing to applet. Child elements are NOT valid in setStyle(). So we now create the widget before needed with createWidgetIfNecessary. This either happens when doing the first layout, or when JavaScript first references the applet element.
Fixed early delete of the the main applet instance. When the JS collector cleaned up the last JS object referring to the applet instance we were deleting the java instance. This caused the applet instance cached on the applet element to be invalid. The applet instance is the only Java object not to be cleaned up by the JS collector.
Added support for getting at Java object fields.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* Makefile.am:
* bindings/jni/jni_instance.cpp:
(JObjectWrapper::JObjectWrapper):
* bindings/jni/jni_instance.h:
(Bindings::JObjectWrapper::~JObjectWrapper):
* bindings/jni/jni_runtime.cpp:
(JavaField::valueFromInstance):
* bindings/runtime_object.cpp:
(RuntimeObjectImp::~RuntimeObjectImp):
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::get):
(RuntimeObjectImp::deleteProperty):
* bindings/runtime_object.h:
=== Safari-115 ===
2003-11-21 Maciej Stachowiak <mjs@apple.com>
Patch from Harri Porten, reviewed by me.
- fixed 3491712 - String slice with negative arguments does not offset from end of string
* kjs/string_object.cpp:
(StringProtoFuncImp::call): Handle negative arguments as offsets from end by
adding length and clamping to [0,length-1].
2003-11-21 Maciej Stachowiak <mjs@apple.com>
Patch from Harri Porten, reviewed by me.
- fixed 3491709 - using Function.apply with a primitive type as the arg list causes crash
* kjs/function_object.cpp:
(FunctionProtoFuncImp::call): Nest parentheses properly.
2003-11-20 Richard Williamson <rjw@apple.com>
More LiveConnect stuff. Primitive Java fields are now
accessible from JavaScript! Yay!
Reviewed by Maciej.
* bindings/jni/jni_class.cpp:
(JavaClass::methodNamed):
(JavaClass::fieldNamed):
* bindings/jni/jni_class.h:
(Bindings::JavaClass::_commonDelete):
* bindings/jni/jni_instance.cpp:
(JavaInstance::JavaInstance):
(JavaInstance::~JavaInstance):
(JavaInstance::getClass):
* bindings/jni/jni_instance.h:
(Bindings::JavaInstance::javaInstance):
* bindings/jni/jni_runtime.cpp:
(JavaField::JavaField):
(JavaField::valueFromInstance):
* bindings/jni/jni_runtime.h:
(Bindings::JavaField::JavaField):
(Bindings::JavaField::~JavaField):
(Bindings::JavaField::operator=):
* bindings/jni/jni_utility.cpp:
(callJNIMethod):
(callJNIMethodA):
(callJNIVoidMethod):
(callJNIObjectMethod):
(callJNIBooleanMethod):
(callJNIByteMethod):
(callJNICharMethod):
(callJNIShortMethod):
(callJNIIntMethod):
(callJNILongMethod):
(callJNIFloatMethod):
(callJNIDoubleMethod):
(callJNIVoidMethodA):
(callJNIObjectMethodA):
(callJNIByteMethodA):
(callJNICharMethodA):
(callJNIShortMethodA):
(callJNIIntMethodA):
(callJNILongMethodA):
(callJNIFloatMethodA):
(callJNIDoubleMethodA):
(releaseCharactersForJStringInEnv):
(primitiveTypeFromClassName):
(getJNIField):
* bindings/jni/jni_utility.h:
* bindings/runtime.cpp:
(Instance::createBindingForLanguageInstance):
(Instance::getValueOfField):
* bindings/runtime.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::get):
2003-11-20 Richard Williamson <rjw@apple.com>
More LiveConnect stuff.
Reviewed by Chris.
* bindings/jni/jni_class.cpp:
(JavaClass::classForName):
(JavaClass::classForInstance):
* bindings/jni/jni_instance.cpp:
(JavaInstance::getValueOfField):
* bindings/jni/jni_instance.h:
(Bindings::JObjectWrapper::JObjectWrapper):
* bindings/jni/jni_runtime.h:
(Bindings::JavaConstructor::~JavaConstructor):
(Bindings::JavaConstructor::operator=):
(Bindings::JavaMethod::JavaMethod):
(Bindings::JavaMethod::_commonDelete):
(Bindings::JavaMethod::signature):
* bindings/jni/jni_utility.cpp:
(getJNIEnv):
(attachToJavaVM):
* bindings/jni/jni_utility.h:
* bindings/runtime.h:
* bindings/runtime_object.cpp:
(RuntimeObjectImp::~RuntimeObjectImp):
(RuntimeObjectImp::get):
* bindings/runtime_object.h:
2003-11-19 Richard Williamson <rjw@apple.com>
More LiveConnect stuff.
Reviewed by Ken.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/jni/jni_class.cpp: Added.
(JavaClass::_commonInit):
(JavaClass::JavaClass):
(_createClassesByNameIfNecessary):
(JavaClass::classForName):
(JavaClass::classForInstance):
(JavaClass::methodNamed):
(JavaClass::fieldNamed):
* bindings/jni/jni_class.h: Added.
(Bindings::JavaClass::_commonDelete):
(Bindings::JavaClass::~JavaClass):
(Bindings::JavaClass::_commonCopy):
(Bindings::JavaClass::JavaClass):
(Bindings::JavaClass::operator=):
(Bindings::JavaClass::name):
(Bindings::JavaClass::constructorAt):
(Bindings::JavaClass::numConstructors):
* bindings/jni/jni_instance.cpp: Added.
(JavaInstance::JavaInstance):
(JavaInstance::~JavaInstance):
* bindings/jni/jni_instance.h: Added.
(Bindings::JObjectWrapper::JObjectWrapper):
(Bindings::JObjectWrapper::~JObjectWrapper):
(Bindings::JObjectWrapper::ref):
(Bindings::JObjectWrapper::deref):
(Bindings::JavaInstance::getClass):
(Bindings::JavaInstance::operator=):
* bindings/jni/jni_runtime.cpp:
(JavaMethod::JavaMethod):
* bindings/jni/jni_runtime.h:
(Bindings::JavaString::JavaString):
(Bindings::JavaString::~JavaString):
(Bindings::JavaString::operator=):
* bindings/jni/jni_utility.cpp:
(getJavaVM):
(getJNIEnv):
(getCharactersFromJString):
(releaseCharactersForJString):
(getCharactersFromJStringInEnv):
(releaseCharactersForJStringInEnv):
* bindings/jni/jni_utility.h:
* bindings/runtime.cpp:
(Instance::createBindingForLanguageInstance):
* bindings/runtime.h:
(Bindings::Instance::):
2003-11-18 Richard Williamson <rjw@apple.com>
More live connect stubs. We're getting close.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/jni/jni_runtime.cpp:
(JavaClass::JavaClass):
(JavaInstance::JavaInstance):
(JavaInstance::~JavaInstance):
* bindings/jni/jni_runtime.h:
(Bindings::JavaConstructor::value):
(Bindings::JavaField::value):
(Bindings::JavaMethod::value):
(Bindings::JavaClass::_commonDelete):
(Bindings::JavaClass::_commonCopy):
(Bindings::JavaClass::methodNamed):
(Bindings::JavaClass::fieldNamed):
(Bindings::JavaInstance::getClass):
* bindings/runtime.cpp: Added.
* bindings/runtime.h:
(Bindings::Instance::~Instance):
* bindings/runtime_object.cpp: Added.
(RuntimeObjectImp::classInfo):
(RuntimeObjectImp::RuntimeObjectImp):
(RuntimeObjectImp::get):
(RuntimeObjectImp::put):
(RuntimeObjectImp::canPut):
(RuntimeObjectImp::hasProperty):
(RuntimeObjectImp::deleteProperty):
(RuntimeObjectImp::defaultValue):
(RuntimeObjectImp::_initializeClassInfoFromInstance):
* bindings/runtime_object.h: Added.
(KJS::RuntimeObjectImp::setInternalInstance):
(KJS::RuntimeObjectImp::getInternalInstance):
* kjs/object.cpp:
(KJS::ObjectImp::get):
(KJS::ObjectImp::hasProperty):
* kjs/value.h:
(KJS::):
2003-11-17 Maciej Stachowiak <mjs@apple.com>
Patch from Harri, reviewed by me.
- fixed 3487375 - backwards array slice causes infinite loop
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call):
2003-11-17 Maciej Stachowiak <mjs@apple.com>
Patch from Harri Porten reviewed by me.
- fixed 3487371 - operator precedence for bitwise or, xor and and is wrong
* kjs/grammar.y: Correct the precedence.
2003-11-16 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
- fixed 3483829 - JavaScriptCore needs workaround to compile on Merlot
* JavaScriptCore.pbproj/project.pbxproj: Add -Wno-long-double to
warning flags.
=== Safari-114 ===
2003-11-13 Richard Williamson <rjw@apple.com>
Factored common code between copy constructor and assignment operator.
Reviewed by Chris.
* ChangeLog:
* bindings/jni/jni_runtime.h:
(Bindings::JavaConstructor::_commonCopy):
(Bindings::JavaConstructor::JavaConstructor):
(Bindings::JavaConstructor::operator=):
(Bindings::JavaField::type):
* bindings/runtime.h:
2003-11-13 Richard Williamson <rjw@apple.com>
More LiveConnect stuff. This checkin adds abstract classes to model
language runtimes and a JNI based set of concrete implementations for
Java.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* Makefile.am:
* bindings/Makefile.am: Removed.
* bindings/jni/Makefile.am: Removed.
* bindings/jni/jni_runtime.cpp: Added.
(JavaField::JavaField):
(JavaConstructor::JavaConstructor):
(JavaMethod::JavaMethod):
(JavaClass::JavaClass):
* bindings/jni/jni_runtime.h: Added.
(Bindings::JavaString::JavaString):
(Bindings::JavaString::~JavaString):
(Bindings::JavaString::operator=):
(Bindings::JavaString::characters):
(Bindings::JavaParameter::JavaParameter):
(Bindings::JavaParameter::~JavaParameter):
(Bindings::JavaParameter::operator=):
(Bindings::JavaParameter::type):
(Bindings::JavaConstructor::JavaConstructor):
(Bindings::JavaConstructor::~JavaConstructor):
(Bindings::JavaConstructor::operator=):
(Bindings::JavaConstructor::parameterAt):
(Bindings::JavaConstructor::numParameters):
(Bindings::JavaField::JavaField):
(Bindings::JavaField::~JavaField):
(Bindings::JavaField::operator=):
(Bindings::JavaField::name):
(Bindings::JavaField::type):
(Bindings::JavaMethod::JavaMethod):
(Bindings::JavaMethod::_commonDelete):
(Bindings::JavaMethod::~JavaMethod):
(Bindings::JavaMethod::_commonCopy):
(Bindings::JavaMethod::operator=):
(Bindings::JavaMethod::name):
(Bindings::JavaMethod::returnType):
(Bindings::JavaMethod::parameterAt):
(Bindings::JavaMethod::numParameters):
(Bindings::JavaClass::_commonDelete):
(Bindings::JavaClass::~JavaClass):
(Bindings::JavaClass::_commonCopy):
(Bindings::JavaClass::JavaClass):
(Bindings::JavaClass::operator=):
(Bindings::JavaClass::name):
(Bindings::JavaClass::methodAt):
(Bindings::JavaClass::numMethods):
(Bindings::JavaClass::constructorAt):
(Bindings::JavaClass::numConstructors):
(Bindings::JavaClass::fieldAt):
(Bindings::JavaClass::numFields):
* bindings/jni/jni_utility.cpp:
(callJNIMethod):
(callJNIMethodA):
(callJNIObjectMethod):
(callJNIByteMethod):
(callJNICharMethod):
(callJNIShortMethod):
(callJNIIntMethod):
(callJNILongMethod):
(callJNIFloatMethod):
(callJNIDoubleMethod):
(callJNIVoidMethodA):
(callJNIObjectMethodA):
(callJNIByteMethodA):
(callJNICharMethodA):
(callJNIShortMethodA):
(callJNIIntMethodA):
(callJNILongMethodA):
(callJNIFloatMethodA):
(callJNIDoubleMethodA):
(getCharactersFromJString):
(releaseCharactersForJString):
* bindings/jni/jni_utility.h:
* bindings/objc/Makefile.am: Removed.
* bindings/runtime.h: Added.
(Bindings::Parameter::~Parameter):
(Bindings::Constructor::~Constructor):
(Bindings::Field::~Field):
(Bindings::Method::~Method):
(Bindings::Class::~Class):
2003-11-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by John.
- fixed 3472562 - Null or Undefined variables passed to IN operator cause javascript exceptions
* kjs/nodes.cpp:
(ForInNode::execute): If the in value is null or undefined, bail
out early, since attempting to iterate its properties will throw
an exception.
2003-11-12 Darin Adler <darin@apple.com>
- fixed the build
* Makefile.am: Fix the build by removing the bindings directory from SUBDIRS.
Later, we can either add this back and add the Makefile.am files to the top
level configure.in or leave it out and remove the Makefile.am files.
2003-11-12 Richard Williamson <rjw@apple.com>
Added utility functions for calling JNI methods.
Reviewed by Chris.
* JavaScriptCore.pbproj/project.pbxproj:
* Makefile.am:
* bindings/Makefile.am: Added.
* bindings/jni/Makefile.am: Added.
* bindings/jni/jni_utility.cpp: Added.
(attachToJavaVM):
(callJNIMethod):
(callJNIVoidMethod):
(callJNIObjectMethod):
(callJNIByteMethod):
(callJNICharMethod):
(callJNIShortMethod):
(callJNIIntMethod):
(callJNILongMethod):
(callJNIFloatMethod):
(callJNIDoubleMethod):
* bindings/jni/jni_utility.h: Added.
* bindings/objc/Makefile.am: Added.
2003-11-08 Darin Adler <darin@apple.com>
Reviewed by John.
- fixed 3477528 -- array.sort(function) fails if the function returns a non-zero value that rounds to zero
* kjs/array_object.cpp:
(compareByStringForQSort): Added checks for undefined values to match what the specification calls for.
(compareWithCompareFunctionForQSort): Added checks for undefined values as above, and also changed the
code that looks at the compare function result to look at the number returned without rounding to an integer.
(ArrayProtoFuncImp::call): Changed the code that looks at the compare function result to look at the number
returned without rounding to an integer.
=== Safari-113 ===
2003-11-03 Vicki Murley <vicki@apple.com>
Reviewed by kocienda.
- fixed <rdar://problem/3471096>: non-B&I builds should not use order files, because they cause false "regressions" in perf.
* JavaScriptCore.pbproj/project.pbxproj: added empty SECTORDER_FLAGS variables to the Development and Deployment build styles
2003-11-02 Darin Adler <darin@apple.com>
Reviewed by Maciej.
- changed list manipulation to use Harri Porten's idea of a circular
linked list that is built from head to tail rather than building the
list backwards and reversing the list when done
* kjs/grammar.y: Handle CatchNode and FinallyNode in a type-safe way.
Change many places that passed 0L to pass nothing at all, or to pass 0.
* kjs/nodes.h:
(KJS::ElementNode::ElementNode): Build a circular list instead of a 0-terminated
backwards list.
(KJS::ArrayNode::ArrayNode): Break the circular list instead of reversing the list.
(KJS::PropertyValueNode::PropertyValueNode): Moved before ObjectLiteralNode so the
inline code in ObjectLiteralNode works. Build a circular list instead of a 0-terminated
backwards list. Made the case for the first node separate so we don't need a nil check.
(KJS::ObjectLiteralNode::ObjectLiteralNode): Break the circular list instead of
reversing the list.
(KJS::ArgumentListNode::ArgumentListNode): Build a circular list instead of a 0-terminated
backwards list. Also, made the constructors inline (moved here from .cpp file).
(KJS::ArgumentsNode::ArgumentsNode): Break the circular list instead of
reversing the list.
(KJS::NewExprNode::NewExprNode): Changed a 0L to 0.
(KJS::StatListNode::StatListNode): Make this constructor no longer inline (moved into
.cpp file). The one in the .cpp file builds a circular list instead of a 0-terminated
backwards list.
(KJS::VarDeclListNode::VarDeclListNode): Build a circular list instead of a 0-terminated
backwards list.
(KJS::VarStatementNode::VarStatementNode): Break the circular list instead of reversing
the list.
(KJS::BlockNode::BlockNode): Make this constructor no longer inline (moved into .cpp file).
The one in the .cpp file breaks the list instead of reversing it.
(KJS::ForNode::ForNode): Break the circular list instead of reversing the list.
(KJS::CaseClauseNode::CaseClauseNode): Break the circular list instead of reversing the
list.
(KJS::ClauseListNode::ClauseListNode): Build a circular list instead of a 0-terminated
backwards list.
(KJS::CaseBlockNode::CaseBlockNode): Make this constructor no longer inline (moved into
.cpp file). The one in the .cpp file breaks the list instead of reversing it.
(KJS::TryNode::TryNode): Changed constructor to take typed parameters for the catch and
finally nodes rather than just Node.
(KJS::ParameterNode::ParameterNode): Build a circular list instead of a 0-terminated
backwards list.
(KJS::FuncDeclNode::FuncDeclNode): Break the circular list instead of reversing the
list.
(KJS::FuncExprNode::FuncExprNode): Break the circular list instead of reversing the
list.
* kjs/nodes.cpp:
(StatListNode::StatListNode): Moved this constructor here, no longer inline.
Did the "break circular list" thing instead of the "reverse list" thing.
Added setLoc calls to match KJS in the KDE tree; since we don't currently
use the JavaScript debugging support, it's unclear whether there's any benefit, but
later we might be using it and it's good to be as close as possible.
(BlockNode::BlockNode): Moved this constructor here, no longer inline.
Did the "break circular list" thing instead of the "reverse list" thing.
Added setLoc calls.
(CaseBlockNode::CaseBlockNode): Moved this constructor here, no longer inline.
Did the "break circular list" thing instead of the "reverse list" thing.
(SourceElementsNode::SourceElementsNode): Moved this constructor here, no longer inline.
Did the "break circular list" thing instead of the "reverse list" thing.
Added setLoc calls.
* kjs/grammar.cpp: Regenerated.
* kjs/grammar.cpp.h: Regenerated.
* kjs/grammar.h: Regenerated.
=== Safari-112 ===
2003-10-30 Maciej Stachowiak <mjs@apple.com>
Reviewed by Ken.
- fixed 3427069 - browsing mp3.com causes leaks (KJS)
* kjs/string_object.cpp:
(StringProtoFuncImp::call): Don't do an early return, since that
could leak a temporary regexp.
2003-10-29 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
- fixed 3426076 - Leak of JS lexer data visiting http://www.ebay.com
* kjs/grammar.cpp:
(yyerror): Updated the commented code.
* kjs/grammar.y: Don't delete string and identifier tokens when done
with them any more, they'll get cleaned up by the lexer now.
* kjs/internal.cpp:
(Parser::parse): Tell lexer when done parsing.
* kjs/lexer.cpp:
(Lexer::Lexer): Initialize new data members.
(Lexer::lex): Use new methods to make strings and identifiers, and
save them.
(Lexer::makeIdentifier): Make a new Identifier and save it in an
auto-growing array.
(Lexer::makeUString): Likewise for UStrings.
(Lexer::doneParsing): Clean up arrays of Ifentifiers and UStrings.
* kjs/lexer.h:
2003-10-28 Maciej Stachowiak <mjs@apple.com>
Reviewed by Ken.
- fixed 3413962 - malicious web pages can kill all future JavaScript execution by breaking recursion limit check
* kjs/nodes.cpp:
(FunctionCallNode::evaluate): If we're going to return early due
to breaking the recursion limit, make sure to lower it again, or
it will creep up by one each time it's exceeded.
2003-10-26 Darin Adler <darin@apple.com>
* JavaScriptCorePrefix.h: Added a C case to the NULL definition since we use C as well
as C++ in this project.
2003-10-26 Darin Adler <darin@apple.com>
- rolled in some CString changes Harri Porten did on the KDE side
* kjs/ustring.cpp:
(KJS::CString::CString): Use memcpy instead of strcpy for speed. Fix an off by one error
in the copy constructor.
(KJS::CString::operator=): Use memcpy instead of strcpy for speed.
* JavaScriptCorePrefix.h: Add a definition of NULL here that takes advantage of the GNU
__null feature even if the system C library doesn't.
== Rolled over to ChangeLog-2003-10-25 ==
|