Mercurial > octave
view src/main-cli.cc @ 29900:da6e5914ddaf
handle all binary operators the same when detecting command syntax (bug #60882)
This change breaks Matlab compatibility when parsing things like
x += 2
Matlab will handle this as a command-style function call with two
arguments '+=' and '2'. Octave will now treat this as a computed
assignment (the variable X incremented by 2). Octave will still
handle
x +=2
as a command-style function call when parsing this statement inside a
function.
At the command line, Octave will recognize this statement as a
computed assignment expression if X is already defined to be a
variable. Note that command lines are parsed completely before
executing anything, so in
octave> clear x
octave> x = 1; x +=2
the "x +=2" statement will be parsed as a command-style function call
because the parser does not find a definition for X as a variable when
that portion of the command line is parsed.
* lex.ll (CMD_OR_COMPUTED_ASSIGN_OP): Delete macro. Change all uses
to CMD_OR_OP instead.
(base_lexer::handle_identifier): Don't call mark_may_be_command for
token if we are at the top level and the identifier has already been
recognized as a variable.
* parser.tst: Update test.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 21 Jul 2021 09:49:09 -0400 |
parents | b98ae05c6b7e |
children | 96eb9a6f868b |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2012-2021 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <cstdlib> #include <iostream> #include <string> #if defined (OCTAVE_USE_WINDOWS_API) && defined (_UNICODE) # include <vector> # include <locale> # include <codecvt> #endif #include "liboctave-build-info.h" #include "liboctinterp-build-info.h" #include "oct-env.h" #include "signal-wrappers.h" #include "octave.h" #include "octave-build-info.h" #include "sysdep.h" static void check_hg_versions (void) { bool ok = true; // Each library and executable has its own definition of the hg // id. They should always match but may be different because of a // botched installation or incorrect LD_LIBRARY_PATH or some other // unusual problem. std::string octave_id = octave_hg_id (); std::string liboctave_id = liboctave_hg_id (); std::string liboctinterp_id = liboctinterp_hg_id (); if (octave_id != liboctave_id) { std::cerr << "octave hg id (" << octave_id << ") does not match liboctave hg id (" << liboctave_id << ')' << std::endl; ok = false; } if (octave_id != liboctinterp_id) { std::cerr << "octave hg id (" << octave_id << ") does not match liboctinterp hg id (" << liboctinterp_id << ')' << std::endl; ok = false; } if (! ok) exit (1); } #if defined (OCTAVE_USE_WINDOWS_API) && defined (_UNICODE) extern "C" int wmain (int argc, wchar_t **wargv) { static char **argv = new char * [argc + 1]; std::vector<std::string> argv_str; // convert wide character strings to multibyte UTF-8 strings std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; for (int i_arg = 0; i_arg < argc; i_arg++) { argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg])); // Save the string becuase argv_str[i_arg] may return a temporary. argv[i_arg] = strsave (&argv_str[i_arg][0]); } argv[argc] = nullptr; #else int main (int argc, char **argv) { #endif check_hg_versions (); octave_block_async_signals (); octave::sys::env::set_program_name (argv[0]); octave::cli_application app (argc, argv); return app.execute (); }