source: webkit/trunk/JavaScriptCore/API/minidom.c@ 34361

Last change on this file since 34361 was 34273, checked in by [email protected], 17 years ago

Made the starting line number of scripts be 1-based throughout the engine.

JavaScriptCore:

2008-05-30 Timothy Hatcher <[email protected]>

Made the starting line number of scripts be 1-based throughout the engine.
This cleans up script line numbers so they are all consistent now and fixes
some cases where script execution was shown as off by one line in the debugger.

No change in SunSpider.

Reviewed by Oliver Hunt.

  • API/minidom.c: (main): Pass a line number of 1 instead of 0 to parser().parse().
  • API/testapi.c: (main): Ditto. And removes a FIXME and changed an assertEqualsAsNumber to use 1 instead of 2 for the line number.
  • VM/Machine.cpp: (KJS::callEval): Pass a line number of 1 instead of 0. (KJS::Machine::debug): Use firstLine for WillExecuteProgram instead of lastLine. Use lastLine for DidExecuteProgram instead of firstLine.
  • kjs/DebuggerCallFrame.cpp: (KJS::DebuggerCallFrame::evaluate): Pass a line number of 1 instead of 0 to parser().parse().
  • kjs/Parser.cpp: (KJS::Parser::parse): ASSERT startingLineNumber is greatter than 0. Change the startingLineNumber to be 1 if it was less than or equal to 0. This is needed for release builds to maintain compatibility with the JavaScriptCore API.
  • kjs/function.cpp: (KJS::globalFuncEval): Pass a line number of 1 instead of 0 to parser().parse().
  • kjs/function_object.cpp: (FunctionObjectImp::construct): Pass a line number of 1 instead of 0 to construct().
  • kjs/lexer.cpp: (Lexer::setCode): Made yylineno = startingLineNumber instead of adding 1.
  • kjs/testkjs.cpp: (functionRun): Pass a line number of 1 instead of 0 to Interpreter::evaluate(). (functionLoad): Ditto. (prettyPrintScript): Ditto. (runWithScripts): Ditto.
  • profiler/Profiler.cpp: (WebCore::createCallIdentifier): Removed a plus 1 of startingLineNumber.

WebCore:

2008-05-30 Timothy Hatcher <[email protected]>

Made the starting line number of scripts be 1-based throughout the engine.
This cleans up script line numbers so they are all consistent now and fixes
some cases where script execution was shown as off by one line in the debugger.

Doing this also exposed a bug where JSLazyEventListener created in XHML or SVG
documents would always have a line number of 0. So this change fixed that bug
to pass all the SVG and XHTML tests.

All layout tests pass.

Reviewed by Oliver Hunt.

  • bindings/js/kjs_events.cpp: (WebCore::JSLazyEventListener::JSLazyEventListener): Set the line number to 1 if it was passed in as 0. This can happen when listeners are created with a setAttribute call from JavaScript. (WebCore::JSLazyEventListener::parseCode): Add a FIXME about the URL being incorrect when listeners are created with a setAttribute call from JavaScript.
  • bindings/js/kjs_events.h: Remove the default value for lineNumber, since no callers need it.
  • bindings/objc/WebScriptObject.mm: (-[WebScriptObject evaluateWebScript:]): Pass a line number of 1 instead of 0 to Interpreter::evaluate().
  • bridge/NP_jsobject.cpp: (_NPN_Evaluate): Ditto.
  • bridge/jni/jni_jsobject.mm: (JavaJSObject::eval): Ditto.
  • dom/XMLTokenizer.cpp: (WebCore::XMLTokenizer::startElementNs): Call KJSProxy::setEventHandlerLineno() around the call to handleElementAttributes, so any JSLazyEventListener created from those attributes have line numbers. (WebCore::XMLTokenizer::endElementNs): Remove a minus 1 of the line number. (WebCore::XMLTokenizer::notifyFinished): Pass a line number of 1 instead of 0. (WebCore::XMLTokenizer::parseEndElement): Remove a minus 1 of the line number.
  • html/HTMLScriptElement.cpp: (WebCore::HTMLScriptElement::evaluateScript): Add a FIXME about the starting line number being incorrect in some cases when this function is called.
  • html/HTMLTokenizer.cpp: (WebCore::HTMLTokenizer::parseSpecial): Add a plus 1 to the line number when setting scriptStartLineno so it is 1-based. Same for calling setEventHandlerLineno(). (WebCore::HTMLTokenizer::processToken): Ditto.
  • html/HTMLTokenizer.h: Change the default line number on scriptExecution() to 1 from 0.
  • loader/FrameLoader.cpp: (FrameLoader::executeIfJavaScriptURL): Pass a line number of 1 instead of 0 to executeScript().

WebKitTools:

2008-05-30 Timothy Hatcher <[email protected]>

Made the starting line number of scripts be 1-based throughout the engine.
This cleans up script line numbers so they are all consistent now.

Reviewed by Oliver Hunt.

  • DumpRenderTree/mac/ObjCController.m: (runJavaScriptThread): Pass a line number of 1 instead of 0 to JSEvaluateScript.
  • DumpRenderTree/pthreads/JavaScriptThreadingPthreads.cpp: (runJavaScriptThread): Ditto.
  • DumpRenderTree/win/DumpRenderTree.cpp: (runJavaScriptThread): Ditto.
  • Property svn:eol-style set to native
File size: 5.0 KB
Line 
1// -*- mode: c++; c-basic-offset: 4 -*-
2/*
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
4 * Copyright (C) 2007 Alp Toker <[email protected]>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
14 *
15 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28#include "JSContextRef.h"
29#include "JSNode.h"
30#include "JSObjectRef.h"
31#include "JSStringRef.h"
32#include <stdio.h>
33#include <stdlib.h>
34#include <wtf/Assertions.h>
35#include <wtf/UnusedParam.h>
36
37static char* createStringWithContentsOfFile(const char* fileName);
38static JSValueRef print(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
39
40int main(int argc, char* argv[])
41{
42 const char *scriptPath = "minidom.js";
43 if (argc > 1) {
44 scriptPath = argv[1];
45 }
46
47 JSGlobalContextRef context = JSGlobalContextCreate(NULL);
48 JSObjectRef globalObject = JSContextGetGlobalObject(context);
49
50 JSStringRef printIString = JSStringCreateWithUTF8CString("print");
51 JSObjectSetProperty(context, globalObject, printIString, JSObjectMakeFunctionWithCallback(context, printIString, print), kJSPropertyAttributeNone, NULL);
52 JSStringRelease(printIString);
53
54 JSStringRef node = JSStringCreateWithUTF8CString("Node");
55 JSObjectSetProperty(context, globalObject, node, JSObjectMakeConstructor(context, JSNode_class(context), JSNode_construct), kJSPropertyAttributeNone, NULL);
56 JSStringRelease(node);
57
58 char* scriptUTF8 = createStringWithContentsOfFile(scriptPath);
59 JSStringRef script = JSStringCreateWithUTF8CString(scriptUTF8);
60 JSValueRef exception;
61 JSValueRef result = JSEvaluateScript(context, script, NULL, NULL, 1, &exception);
62 if (result)
63 printf("PASS: Test script executed successfully.\n");
64 else {
65 printf("FAIL: Test script threw exception:\n");
66 JSStringRef exceptionIString = JSValueToStringCopy(context, exception, NULL);
67 size_t exceptionUTF8Size = JSStringGetMaximumUTF8CStringSize(exceptionIString);
68 char* exceptionUTF8 = (char*)malloc(exceptionUTF8Size);
69 JSStringGetUTF8CString(exceptionIString, exceptionUTF8, exceptionUTF8Size);
70 printf("%s\n", exceptionUTF8);
71 free(exceptionUTF8);
72 JSStringRelease(exceptionIString);
73 }
74 JSStringRelease(script);
75 free(scriptUTF8);
76
77 globalObject = 0;
78 JSGlobalContextRelease(context);
79 JSGarbageCollect(context);
80 printf("PASS: Program exited normally.\n");
81 return 0;
82}
83
84static JSValueRef print(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
85{
86 UNUSED_PARAM(object);
87 UNUSED_PARAM(thisObject);
88
89 if (argumentCount > 0) {
90 JSStringRef string = JSValueToStringCopy(context, arguments[0], exception);
91 size_t numChars = JSStringGetMaximumUTF8CStringSize(string);
92 char stringUTF8[numChars];
93 JSStringGetUTF8CString(string, stringUTF8, numChars);
94 printf("%s\n", stringUTF8);
95 }
96
97 return JSValueMakeUndefined(context);
98}
99
100static char* createStringWithContentsOfFile(const char* fileName)
101{
102 char* buffer;
103
104 size_t buffer_size = 0;
105 size_t buffer_capacity = 1024;
106 buffer = (char*)malloc(buffer_capacity);
107
108 FILE* f = fopen(fileName, "r");
109 if (!f) {
110 fprintf(stderr, "Could not open file: %s\n", fileName);
111 return 0;
112 }
113
114 while (!feof(f) && !ferror(f)) {
115 buffer_size += fread(buffer + buffer_size, 1, buffer_capacity - buffer_size, f);
116 if (buffer_size == buffer_capacity) { // guarantees space for trailing '\0'
117 buffer_capacity *= 2;
118 buffer = (char*)realloc(buffer, buffer_capacity);
119 ASSERT(buffer);
120 }
121
122 ASSERT(buffer_size < buffer_capacity);
123 }
124 fclose(f);
125 buffer[buffer_size] = '\0';
126
127 return buffer;
128}
Note: See TracBrowser for help on using the repository browser.