Mercurial > mxe-octave
view src/of-strings-1-fixes.patch @ 3929:6cb1bf4d1ab4
osmesa: update path to package
* src/osmesa.mk: update package urk
author | John Donoghue |
---|---|
date | Tue, 05 May 2015 15:08:30 -0400 |
parents | cc946e55afb3 |
children | 76247f439f51 |
line wrap: on
line source
diff -urN strings.orig/inst/strjoin.m strings/inst/strjoin.m --- strings.orig/inst/strjoin.m 2015-04-13 21:40:26.000000000 -0400 +++ strings/inst/strjoin.m 1969-12-31 19:00:00.000000000 -0500 @@ -1,54 +0,0 @@ -## Copyright (C) 2007 Muthiah Annamalai <muthiah.annamalai@uta.edu> -## -## This program 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. -## -## This program 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 -## this program; if not, see <http://www.gnu.org/licenses/>. - -## -*- texinfo -*- -## @deftypefn {Function File} {@var{rval} =} strjoin (@var{prefixstr}, @var{stringcell}) -## @deftypefnx {Function File} {@var{rval} =} strjoin (@var{prefixstr}, @var{varargs}) -## Joins the strings in @var{stringcell} with the @var{prefixstr} like the list-join -## function in Python; the second version allows usage with variable number of arguments. -## Note that, if using cell-array as a second argument, only 2 arguments are accepted. -## Also note that, both the arguments are strings or containers of strings (cells). -## -## @example -## @group -## strjoin(' loves-> ','marie','amy','beth') -## ##returns 'marie loves-> amy loves-> beth' -## -## strjoin('*',@{'Octave','Scilab','Lush','Yorick'@}) -## ##returns 'Octave*Scilab*Lush*Yorick' -## @end group -## @end example -## @seealso {strcmp} -## @end deftypefn - -function rval = strjoin (spacer, varargin) - if (nargin < 2) || (nargin > 2 && iscell(varargin{1}) ) - print_usage(); - end - - if iscell(varargin{1}) - varargin=varargin{1}; - end - - rval=""; - L=length(varargin); - for idx=1:(L-1) - rval=strcat(rval,sprintf('%s%s',varargin{idx},spacer)); - end - rval=strcat(rval,varargin{L}); -endfunction - -%!assert(strjoin("-","hello"),"hello") -%!assert(strjoin('*',{'Octave','Scilab','Lush','Yorick'}),'Octave*Scilab*Lush*Yorick') diff -urN strings.orig/src/Makefile strings/src/Makefile --- strings.orig/src/Makefile 2015-04-13 21:40:26.000000000 -0400 +++ strings/src/Makefile 2015-04-13 21:40:48.000000000 -0400 @@ -1,9 +1,10 @@ MKOCTFILE = mkoctfile -Wall +PCRE_LIBS := $(shell pcre-config --libs) all: pcregexp.oct %.oct: %.cc - $(MKOCTFILE) $< + $(MKOCTFILE) $< $(PCRE_LIBS) clean: rm -f *.o octave-core core *.oct *~