Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2008 the V8 project authors. All rights reserved. | 1 // Copyright 2008 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| 11 // with the distribution. | 11 // with the distribution. |
| 12 // * Neither the name of Google Inc. nor the names of its | 12 // * Neither the name of Google Inc. nor the names of its |
| 13 // contributors may be used to endorse or promote products derived | 13 // contributors may be used to endorse or promote products derived |
| 14 // from this software without specific prior written permission. | 14 // from this software without specific prior written permission. |
| 15 // | 15 // |
| 16 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 16 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 17 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 17 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 18 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 18 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 19 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 19 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 20 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 20 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | 27 |
| 28 | 28 |
| 29 #include <stdlib.h> | |
| 30 | |
| 29 #include "d8.h" | 31 #include "d8.h" |
| 30 #include "debug.h" | 32 #include "debug.h" |
| 31 #include "api.h" | 33 #include "api.h" |
| 32 #include "natives.h" | 34 #include "natives.h" |
| 33 | 35 |
| 34 | 36 |
| 35 namespace v8 { | 37 namespace v8 { |
| 36 | 38 |
| 37 | 39 |
| 38 const char* Shell::kHistoryFileName = ".d8_history"; | 40 const char* Shell::kHistoryFileName = ".d8_history"; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 | 72 |
| 71 | 73 |
| 72 static DumbLineEditor dumb_line_editor; | 74 static DumbLineEditor dumb_line_editor; |
| 73 | 75 |
| 74 | 76 |
| 75 i::SmartPointer<char> DumbLineEditor::Prompt(const char* prompt) { | 77 i::SmartPointer<char> DumbLineEditor::Prompt(const char* prompt) { |
| 76 static const int kBufferSize = 256; | 78 static const int kBufferSize = 256; |
| 77 char buffer[kBufferSize]; | 79 char buffer[kBufferSize]; |
| 78 printf("%s", prompt); | 80 printf("%s", prompt); |
| 79 char* str = fgets(buffer, kBufferSize, stdin); | 81 char* str = fgets(buffer, kBufferSize, stdin); |
| 80 return i::SmartPointer<char>(str ? i::OS::StrDup(str) : str); | 82 return i::SmartPointer<char>(str ? i::StrDup(str) : str); |
|
Feng Qian
2008/11/20 23:33:28
The fix looks good to me, but it does not resolve
| |
| 81 } | 83 } |
| 82 | 84 |
| 83 | 85 |
| 84 Shell::CounterMap Shell::counter_map_; | 86 Shell::CounterMap Shell::counter_map_; |
| 85 Persistent<Context> Shell::utility_context_; | 87 Persistent<Context> Shell::utility_context_; |
| 86 Persistent<Context> Shell::evaluation_context_; | 88 Persistent<Context> Shell::evaluation_context_; |
| 87 | 89 |
| 88 | 90 |
| 89 // Executes a string within the current v8 context. | 91 // Executes a string within the current v8 context. |
| 90 bool Shell::ExecuteString(Handle<String> source, | 92 bool Shell::ExecuteString(Handle<String> source, |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 355 return 0; | 357 return 0; |
| 356 } | 358 } |
| 357 | 359 |
| 358 | 360 |
| 359 } // namespace v8 | 361 } // namespace v8 |
| 360 | 362 |
| 361 | 363 |
| 362 int main(int argc, char* argv[]) { | 364 int main(int argc, char* argv[]) { |
| 363 return v8::Shell::Main(argc, argv); | 365 return v8::Shell::Main(argc, argv); |
| 364 } | 366 } |
| OLD | NEW |