add cmp() for arrays, remove lexcmp

rename string.jl:depth to strdepth
edit list of exports

Author: JeffBezanson

base/abstractarray.jl

@@ -754,17 +754,19 @@ function isequal(A::AbstractArray, B::AbstractArray)
     return true
 end
 
-function isless(A::AbstractArray, B::AbstractArray)
+function cmp(A::AbstractArray, B::AbstractArray)
     nA, nB = numel(A), numel(B)
     for i = 1:min(nA, nB)
         a, b = A[i], B[i]
         if !isequal(a, b)
-            return isless(a, b)
+            return isless(a, b) ? -1 : +1
         end
     end
-    return nA < nB
+    return cmp(nA, nB)
 end
 
+isless(A::AbstractArray, B::AbstractArray) = cmp(A,B)<0
+
 function (==)(A::AbstractArray, B::AbstractArray)
     if size(A) != size(B)
         return false

base/array.jl

@@ -1001,6 +1001,13 @@ for (f,scalarf) in ((:(.==),:(==)), (:.<, :<), (:.!=,:!=), (:.<=,:<=))
     end
 end
 
+# use memcmp for cmp on byte arrays
+function cmp(a::Array{Uint8,1}, b::Array{Uint8,1})
+    c = ccall(:memcmp, Int32, (Ptr{Uint8}, Ptr{Uint8}, Uint),
+              a, b, min(length(a),length(b)))
+    c < 0 ? -1 : c > 0 ? +1 : cmp(length(a),length(b))
+end
+
 ## data movement ##
 
 function slicedim(A::Array, d::Integer, i::Integer)

base/string.jl

@@ -278,7 +278,7 @@ ends_with(a::String, c::Char) = length(a) > 0 && a[thisind(a,end)] == c
 
 # faster comparisons for byte strings
 
-cmp(a::ByteString, b::ByteString)     = lexcmp(a.data, b.data)
+cmp(a::ByteString, b::ByteString)     = cmp(a.data, b.data)
 isequal(a::ByteString, b::ByteString) = length(a)==length(b) && cmp(a,b)==0
 
 # TODO: fast begins_with and ends_with
@@ -402,17 +402,17 @@ type RopeString <: String
     length::Int
 
     RopeString(h::RopeString, t::RopeString) =
-        depth(h.tail) + depth(t) < depth(h.head) ?
+        strdepth(h.tail) + strdepth(t) < strdepth(h.head) ?
             RopeString(h.head, RopeString(h.tail, t)) :
             new(h, t, max(h.depth,t.depth)+1, length(h)+length(t))
 
     RopeString(h::RopeString, t::String) =
-        depth(h.tail) < depth(h.head) ?
+        strdepth(h.tail) < strdepth(h.head) ?
             RopeString(h.head, RopeString(h.tail, t)) :
             new(h, t, h.depth+1, length(h)+length(t))
 
     RopeString(h::String, t::RopeString) =
-        depth(t.head) < depth(t.tail) ?
+        strdepth(t.head) < strdepth(t.tail) ?
             RopeString(RopeString(h, t.head), t.tail) :
             new(h, t, t.depth+1, length(h)+length(t))
 
@@ -421,8 +421,8 @@ type RopeString <: String
 end
 RopeString(s::String) = RopeString(s,"")
 
-depth(s::String) = 0
-depth(s::RopeString) = s.depth
+strdepth(s::String) = 0
+strdepth(s::RopeString) = s.depth
 
 function next(s::RopeString, i::Int)
     if i <= length(s.head)
@@ -1147,14 +1147,6 @@ for conv in (:float, :float32, :float64,
     @eval ($conv){S<:String}(a::AbstractArray{S}) = map($conv, a)
 end
 
-# lexicographically compare byte arrays (used by Latin-1 and UTF-8)
-
-function lexcmp(a::Array{Uint8,1}, b::Array{Uint8,1})
-    c = ccall(:memcmp, Int32, (Ptr{Uint8}, Ptr{Uint8}, Uint),
-              a, b, min(length(a),length(b)))
-    c < 0 ? -1 : c > 0 ? +1 : cmp(length(a),length(b))
-end
-
 # find the index of the first occurrence of a value in a byte array
 
 function memchr(a::Array{Uint8,1}, b::Integer, i::Integer)

base/sysimg.jl

@@ -48,8 +48,8 @@ export
     At_mul_B,At_mul_Bt,At_rdiv_B,At_rdiv_Bt,
     # Functions
     _c_free,abs,abs2,acos,acosd,acosh,acot,acotd,acoth,acsc,acscd,acsch,add,
-    add_cmds,add_each,add_fd_handler,add_ports,add_weak_key,add_weak_value,
-    addprocs_local,addprocs_sge,addprocs_ssh,alignment,all,allp,
+    add_each,add_fd_handler,add_weak_key,add_weak_value,
+    addprocs_local,addprocs_sge,addprocs_ssh,all,allp,
     amap,and!,angle,ans,any,anyp,append,append!,apropos,areduce,
     ascii,asec,asecd,asech,asin,asind,asinh,assert,assign,at_each,atan,atan2,
     atand,atanh,basename,begins_with,betarnd,bfft,bfftn,bin,binomial,bitmix,bits,bool,
@@ -64,12 +64,11 @@ export
     cov,cov_pearson,cov_spearman,cross,csc,cscd,csch,cstring,csvread,csvwrite,
     ctranspose,cumprod,cumsum,current_task,cwd,darray,dcell,dec,decile,deconv,
     defaultdist,degrees2radians,del,del_all,del_each,del_fd_handler,
-    den,depth,deserialize,det,dfill,diag,diagm,diagmm,diagmm!,dict,diff,
+    den,deserialize,det,dfill,diag,diagm,diagmm,diagmm!,dict,diff,
     dist,distdim,distribute,div,dlmread,dlmwrite,dlopen,dlsym,done,dones,dot,
     drand,drandn,dump,dup2,dzeros,each_col,each_col!,each_line,each_match,
     each_row,each_row!,each_search,each_vec,each_vec!,
-    eatwspace,eatwspace_comment,
-    edit,eig,elements,eltype,
+    eatwspace,eatwspace_comment,edit,eig,elements,eltype,
     ends_with,enq_work,enqueue,enumerate,eof,eps,erf,erfc,errno,error,
     esc,escape_string,exec,exit,exp,exp2,expand,expm1,expr,exprnd,eye,
     factor,factorial,falses,fd,fdio,fetch,fft,fft2,fft3,fft_num_threads,
@@ -78,10 +77,10 @@ export
     find,find_in_path,findmax,findmin,findn,findn_nzs,finfer,first,
     first_utf8_byte,fld,flipdim,fliplr,flipsign,flipud,float,float32,
     float32_isvalid,float64,float64_isvalid,float64_valued,floor,flush,
-    force,foreach,fork,fpart,fprintf,frexp,full,fullfile,function_loc,gamma,gc,
+    force,fork,fpart,fprintf,frexp,full,fullfile,function_loc,gamma,gc,
     gc_disable,gc_enable,gcd,gcdx,gen_cartesian_map,gensym,get,getenv,
     gethostname,getipaddr,getmethods,getpid,gradient,
-    grow,has,hasenv,hash,hcat,help,help_for,hex,hex2num,hist,histc,
+    grow,has,hasenv,hash,hcat,help,hex,hex2num,hist,histc,
     htol,hton,hvcat,hypot,iceil,identity,ifft,ifft2,ifft3,ifftn,ifftshift,
     ifloor,ignorestatus,ilogb,imag,in,include_string,ind2chr,ind2sub,inf,
     insert,int,int128,int16,int2str,int32,int64,int8,integer,integer_partitions,
@@ -95,7 +94,7 @@ export
     istaskdone,istril,istriu,isvalid,iswalnum,iswalpha,iswascii,iswblank,
     iswcntrl,iswdigit,iswgraph,iswlower,iswprint,iswpunct,iswspace,iswupper,
     iswxdigit,itrunc,join,key,keys,kron,last,lc,lcfirst,lcm,ldexp,leading_ones,
-    leading_zeros,length,less,lexcmp,lfact,lgamma,linreg,linspace,load,localize,
+    leading_zeros,length,less,lfact,lgamma,linreg,linspace,load,localize,
     localize_copy,locate,log,log10,log1p,log2,logb,logspace,lowercase,lpad,ls,
     lstrip,ltoh,lu,lu!,mad,make_pipe,make_scheduled,map,map_to,map_to2,
     map_vectorized,mapreduce,match,matches,matmul2x2,matmul3x3,max,maxdim,
@@ -108,7 +107,7 @@ export
     other,out,output,owner,pairs,parse,parse_bin,parse_float,parse_hex,
     parse_input_line,parse_int,parse_oct,parseatom,partitions,pascal,
     peakflops,permute,pfor,pieceindex,pieceindexes,pipeline_error,pmap,
-    pmap_static,pointer,pointer_to_array,pop,position,pow,power_by_squaring,
+    pointer,pointer_to_array,pop,position,pow,power_by_squaring,
     powermod,preduce,prevfloat,prevind,print,print_escaped,print_joined,
     print_matrix,print_quoted,print_quoted_literal,print_shortest,
     print_unescaped,print_unescaped_chars,printf,println,process_exit_status,
@@ -138,7 +137,7 @@ export
     tril,triu,trues,trunc,truncate,tty_cols,tty_rows,typemax,typemin,uc,ucfirst,
     uint,uint128,uint16,uint32,uint64,uint8,
     unescape_chars,unescape_string,union,
-    union!,unique_name,unsetenv,unshift,unsigned,uppercase,utf8,values,var,vcat,
+    union!,unsetenv,unshift,unsigned,uppercase,utf8,values,var,vcat,
     vec,wait,wait_nohang,weighted_mean,which,whicht,whos,with_output_to_string,
     write,write_to,xcorr,xor!,yield,zero,zeros,zip, nextprod,
     prevprod, base, findfirst, qrp, sdd, require, ref_shape,