Mercurial > hg > octave-nkf
view scripts/set/union.m @ 16195:b52d2f9294b6
use class for reading lexer input
* input.h, input.cc (octave_base_input_reader, octave_terminal_reader,
octave_file_reader, octave_eval_string_reader): New classes.
(octave_gets): Now a member function of octave_base_reader.
(get_user_input): Delete function. Move actions to
octave_terminal_reader::get_input and
octave_eval_string_reader::get_input.
function. Call from octave_file_reader::get_input. Don't check
whether reading an eval string.
(current_eval_string, get_input_from_eval_string): Delete global
variables.
(get_debug_input): Check CURR_LEXER->input_from_eval_string instead of
global get_input_from_eval_string variable. Don't protect
get_input_from_eval_string.
* lex.h (octave_lexer::input_reader): New data member.
(octave_lexer::octave_lexer (void)): Initialize it.
(octave_lexer::octave_lexer (const std::string&),
octave_lexer::octave_lexer (FILE *)): New constructors.
* lex.h, lex.cc (octave_lexer::input_buffer::fill): New function.
(octave_lexer::input_buffer::read): Delete.
(octave_lexer::read): Rename from octave_read. Call reader to get
input, and then hand it to the input_buffer instead of asking the
input buffer to read input. Change all callers.
(octave_lexer::input_source, octave_lexer::input_from_eval_string):
New functions. Call octave_lexer::input_from_eval_string instead of
using get_input_from_eval_string.
* oct-parse.in.yy (octave_parser::octave_parser (FILE *),
octave_parser::octave_parser (const std::string&)): New constructors.
(parse_fcn_file): Pass FILE pointer to octave_parser constructor.
(eval_string): Pass string to octave_parser constructor instead of
setting global current_eval_string variable.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 05 Mar 2013 10:19:51 -0500 |
parents | c2dbdeaa25df |
children | 36dba9be680b |
line wrap: on
line source
## Copyright (C) 1994-2012 John W. Eaton ## Copyright (C) 2008-2009 Jaroslav Hajek ## ## 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 ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} union (@var{a}, @var{b}) ## @deftypefnx {Function File} {} union (@var{a}, @var{b}, "rows") ## Return the set of elements that are in either of the sets @var{a} and ## @var{b}. @var{a}, @var{b} may be cell arrays of string(s). ## For example: ## ## @example ## @group ## union ([1, 2, 4], [2, 3, 5]) ## @result{} [1, 2, 3, 4, 5] ## @end group ## @end example ## ## If the optional third input argument is the string "rows" each row of ## the matrices @var{a} and @var{b} will be considered an element of sets. ## For example: ## ## @example ## @group ## union ([1, 2; 2, 3], [1, 2; 3, 4], "rows") ## @result{} 1 2 ## 2 3 ## 3 4 ## @end group ## @end example ## ## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b}) ## ## Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and ## @code{b(ib)} are disjoint sets whose union is @var{c}. ## ## @seealso{intersect, setdiff, unique} ## @end deftypefn ## Author: jwe function [y, ia, ib] = union (a, b, varargin) if (nargin < 2 || nargin > 3) print_usage (); endif [a, b] = validargs ("union", a, b, varargin{:}); if (nargin == 2) y = [a(:); b(:)]; na = numel (a); nb = numel (b); if (rows (a) == 1 || rows (b) == 1) y = y.'; endif else y = [a; b]; na = rows (a); nb = rows (b); endif if (nargout == 1) y = unique (y, varargin{:}); else [y, i] = unique (y, varargin{:}); ia = i(i <= na); ib = i(i > na) - na; endif endfunction %!assert (union ([1, 2, 4], [2, 3, 5]), [1, 2, 3, 4, 5]); %!assert (union ([1; 2; 4], [2, 3, 5]), [1, 2, 3, 4, 5]); %!assert (union ([1, 2, 3], [5; 7; 9]), [1, 2, 3, 5, 7, 9]); %!test %! a = [3, 1, 4, 1, 5]; b = [1, 2, 3, 4]; %! [y, ia, ib] = union (a, b.'); %! assert (y, [1, 2, 3, 4, 5]); %! assert (y, sort ([a(ia), b(ib)])); %!error union (1) %!error union (1, 2, 3)