Changeset 38249 in webkit for trunk/JavaScriptCore/jsc.cpp

Timestamp:

Nov 9, 2008, 5:28:10 PM (17 years ago)

Author:

Darin Adler

Message:

2008-11-09 Darin Adler <Darin Adler>

Reviewed by Tim Hatcher.

• ​https://bugs.webkit.org/show_bug.cgi?id=22149 remove unused code from the parser

• AllInOneFile.cpp: Removed nodes2string.cpp.
• GNUmakefile.am: Ditto.
• JavaScriptCore.exp: Ditto.
• JavaScriptCore.pri: Ditto.
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Ditto.
• JavaScriptCore.xcodeproj/project.pbxproj: Ditto.
• JavaScriptCoreSources.bkl: Ditto.

• VM/CodeBlock.h: Added include.

• VM/Machine.cpp: (JSC::Machine::execute): Use the types from

DeclarationStacks as DeclarationStacks

rather than Node:: since "Node" really has little to do with it.

• bytecompiler/CodeGenerator.cpp: (JSC::CodeGenerator::CodeGenerator): Ditto.

• jsc.cpp: (Options::Options): Removed prettyPrint option. (runWithScripts): Ditto. (printUsageStatement): Ditto. (parseArguments): Ditto. (jscmain): Ditto.

• parser/Grammar.y: Removed use of obsolete ImmediateNumberNode.

• parser/Nodes.cpp: (JSC::ThrowableExpressionData::emitThrowError): Use inline functions instead of direct member access for ThrowableExpressionData values. (JSC::BracketAccessorNode::emitCode): Ditto. (JSC::DotAccessorNode::emitCode): Ditto. (JSC::NewExprNode::emitCode): Ditto. (JSC::EvalFunctionCallNode::emitCode): Ditto. (JSC::FunctionCallValueNode::emitCode): Ditto. (JSC::FunctionCallResolveNode::emitCode): Ditto. (JSC::FunctionCallBracketNode::emitCode): Ditto. (JSC::FunctionCallDotNode::emitCode): Ditto. (JSC::PostfixResolveNode::emitCode): Ditto. (JSC::PostfixBracketNode::emitCode): Ditto. (JSC::PostfixDotNode::emitCode): Ditto. (JSC::DeleteResolveNode::emitCode): Ditto. (JSC::DeleteBracketNode::emitCode): Ditto. (JSC::DeleteDotNode::emitCode): Ditto. (JSC::PrefixResolveNode::emitCode): Ditto. (JSC::PrefixBracketNode::emitCode): Ditto. (JSC::PrefixDotNode::emitCode): Ditto. (JSC::ThrowableBinaryOpNode::emitCode): Ditto. (JSC::InstanceOfNode::emitCode): Ditto. (JSC::ReadModifyResolveNode::emitCode): Ditto. (JSC::AssignResolveNode::emitCode): Ditto. (JSC::AssignDotNode::emitCode): Ditto. (JSC::ReadModifyDotNode::emitCode): Ditto. (JSC::AssignBracketNode::emitCode): Ditto. (JSC::ReadModifyBracketNode::emitCode): Ditto. (JSC::statementListEmitCode): Take a const StatementVector instead of a non-const one. Also removed unused statementListPushFIFO. (JSC::ForInNode::emitCode): Inline functions instead of member access. (JSC::ThrowNode::emitCode): Ditto. (JSC::EvalNode::emitCode): Ditto. (JSC::FunctionBodyNode::emitCode): Ditto. (JSC::ProgramNode::emitCode): Ditto.

• parser/Nodes.h: Removed unused includes and forward declarations. Removed Precedence enum. Made many more members private instead of protected or public. Removed unused NodeStack typedef. Moved the VarStack and FunctionStack typedefs from Node to ScopeNode. Made Node::emitCode pure virtual and changed classes that don't emit any code to inherit from ParserRefCounted rather than Node. Moved isReturnNode from Node to StatementNode. Removed the streamTo, precedence, and needsParensIfLeftmost functions from all classes. Removed the ImmediateNumberNode class and make NumberNode::setValue nonvirtual.

• parser/nodes2string.cpp: Removed.

File:

• trunk/JavaScriptCore/jsc.cpp (modified) (7 diffs)

trunk/JavaScriptCore/jsc.cpp

@@ -79 +79 @@
     Options()
         : interactive(false)
-        , prettyPrint(false)
         , dump(false)
     {
@@ -85 +84 @@
 
     bool interactive;
-    bool prettyPrint;
     bool dump;
     Vector<UString> fileNames;
@@ -300 +298 @@
 }
 
-static bool prettyPrintScript(ExecState* exec, const UString& fileName, const Vector<char>& script)
-{
-    int errLine = 0;
-    UString errMsg;
-    RefPtr<ProgramNode> programNode = exec->globalData().parser->parse<ProgramNode>(exec, exec->dynamicGlobalObject()->debugger(), makeSource(script.data(), fileName), &errLine, &errMsg);
-    if (!programNode) {
-        fprintf(stderr, "%s:%d: %s.\n", fileName.UTF8String().c_str(), errLine, errMsg.UTF8String().c_str());
-        return false;
-    }
-
-    printf("%s\n", programNode->toString().UTF8String().c_str());
-    return true;
-}
-
-static bool runWithScripts(GlobalObject* globalObject, const Vector<UString>& fileNames, bool prettyPrint, bool dump)
+static bool runWithScripts(GlobalObject* globalObject, const Vector<UString>& fileNames, bool dump)
 {
     Vector<char> script;
@@ -333 +317 @@
             return false; // fail early so we can catch missing files
 
-        if (prettyPrint)
-            prettyPrintScript(globalObject->globalExec(), fileName, script);
-        else {
 #if ENABLE(OPCODE_SAMPLING)
-            machine->sampler()->start();
-#endif
-            Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script.data(), fileName));
-            success = success && completion.complType() != Throw;
-            if (dump) {
-                if (completion.complType() == Throw)
-                    printf("Exception: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
-                else
-                    printf("End: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
-            }
-
-            globalObject->globalExec()->clearException();
+        machine->sampler()->start();
+#endif
+        Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script.data(), fileName));
+        success = success && completion.complType() != Throw;
+        if (dump) {
+            if (completion.complType() == Throw)
+                printf("Exception: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
+            else
+                printf("End: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
+        }
+
+        globalObject->globalExec()->clearException();
 
 #if ENABLE(OPCODE_SAMPLING)
-            machine->sampler()->stop();
-#endif
-        }
+        machine->sampler()->stop();
+#endif
     }
 
@@ -404 +384 @@
     fprintf(stderr, "  -h|--help  Prints this help message\n");
     fprintf(stderr, "  -i         Enables interactive mode (default if no files are specified)\n");
-    fprintf(stderr, "  -p         Prints formatted source code\n");
     fprintf(stderr, "  -s         Installs signal handlers that exit on a crash (Unix platforms only)\n");
     exit(-1);
@@ -427 +406 @@
             continue;
         }
-        if (strcmp(arg, "-p") == 0) {
-            options.prettyPrint = true;
-            continue;
-        }
         if (strcmp(arg, "-d") == 0) {
             options.dump = true;
@@ -468 +443 @@
 
     GlobalObject* globalObject = new (globalData) GlobalObject(options.arguments);
-    bool success = runWithScripts(globalObject, options.fileNames, options.prettyPrint, options.dump);
+    bool success = runWithScripts(globalObject, options.fileNames, options.dump);
     if (options.interactive && success)
         runInteractive(globalObject);