| 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 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 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 <cstdio> // NOLINT | 29 #include <cstdio> // NOLINT |
| 30 #include <readline/readline.h> // NOLINT | 30 #include <readline/readline.h> // NOLINT |
| 31 #include <readline/history.h> // NOLINT | 31 #include <readline/history.h> // NOLINT |
| 32 | 32 |
| 33 // The readline includes leaves RETURN defined which breaks V8 compilation. |
| 34 #undef RETURN |
| 33 | 35 |
| 34 #include "d8.h" | 36 #include "d8.h" |
| 35 | 37 |
| 36 | 38 |
| 37 // There are incompatibilities between different versions and different | 39 // There are incompatibilities between different versions and different |
| 38 // implementations of readline. This smooths out one known incompatibility. | 40 // implementations of readline. This smooths out one known incompatibility. |
| 39 #if RL_READLINE_VERSION >= 0x0500 | 41 #if RL_READLINE_VERSION >= 0x0500 |
| 40 #define completion_matches rl_completion_matches | 42 #define completion_matches rl_completion_matches |
| 41 #endif | 43 #endif |
| 42 | 44 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 return strdup(*str); | 121 return strdup(*str); |
| 120 } else { | 122 } else { |
| 121 current_completions.Dispose(); | 123 current_completions.Dispose(); |
| 122 current_completions.Clear(); | 124 current_completions.Clear(); |
| 123 return NULL; | 125 return NULL; |
| 124 } | 126 } |
| 125 } | 127 } |
| 126 | 128 |
| 127 | 129 |
| 128 } // namespace v8 | 130 } // namespace v8 |
| OLD | NEW |