Merge pull request JuliaLang#8420 from JuliaLang/jb/checked_int_trunc

WIP: checked integer conversions

base/Makefile

@@ -16,9 +16,9 @@ all: pcre_h.jl errno_h.jl build_h.jl.phony fenv_constants.jl file_constants.jl u
 
 pcre_h.jl:
 ifeq ($(USE_SYSTEM_PCRE), 1)
- @$(call PRINT_PERL, $(CPP) -dM $(shell $(PCRE_CONFIG) --prefix)/include/pcre.h | perl -nle '/^\s*#define\s+PCRE_(\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "const $$1 = uint32($$2)"' | sort > $@)
+ @$(call PRINT_PERL, $(CPP) -dM $(shell $(PCRE_CONFIG) --prefix)/include/pcre.h | perl -nle '/^\s*#define\s+PCRE_(\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "const $$1 = int32($$2)"' | sort > $@)
 else
- @$(call PRINT_PERL, $(CPP) -dM $(build_includedir)/pcre.h | perl -nle '/^\s*#define\s+PCRE_(\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "const $$1 = uint32($$2)"' | sort > $@)
+ @$(call PRINT_PERL, $(CPP) -dM $(build_includedir)/pcre.h | perl -nle '/^\s*#define\s+PCRE_(\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "const $$1 = int32($$2)"' | sort > $@)
 endif
 
 errno_h.jl:

base/boot.jl

@@ -153,7 +153,7 @@ export
  #ccall, cglobal, llvmcall, abs_float, add_float, add_int, and_int, ashr_int,
  #box, bswap_int, checked_fptosi, checked_fptoui, checked_sadd,
  #checked_smul, checked_ssub, checked_uadd, checked_umul, checked_usub,
- #checked_trunc_sint, checked_trunc_uint,
+ #checked_trunc_sint, checked_trunc_uint, check_top_bit,
  #nan_dom_err, copysign_float, ctlz_int, ctpop_int, cttz_int,
  #div_float, eq_float, eq_int, eqfsi64, eqfui64, flipsign_int, select_value,
  #sqrt_llvm, powi_llvm,

base/char.jl

@@ -3,12 +3,16 @@ char(x::FloatingPoint) = char(iround(x))
 
 integer(x::Char) = int(x)
 
+convert(::Type{Char}, x::Float16) = char(convert(Uint32, x))
+convert(::Type{Char}, x::Float32) = char(convert(Uint32, x))
+convert(::Type{Char}, x::Float64) = char(convert(Uint32, x))
+
 ## char promotions ##
 
 promote_rule(::Type{Char}, ::Type{Int8}) = Int32
-promote_rule(::Type{Char}, ::Type{Uint8}) = Int32
+promote_rule(::Type{Char}, ::Type{Uint8}) = Uint32
 promote_rule(::Type{Char}, ::Type{Int16}) = Int32
-promote_rule(::Type{Char}, ::Type{Uint16}) = Int32
+promote_rule(::Type{Char}, ::Type{Uint16}) = Uint32
 promote_rule(::Type{Char}, ::Type{Int32}) = Int32
 promote_rule(::Type{Char}, ::Type{Uint32}) = Uint32
 promote_rule(::Type{Char}, ::Type{Int64}) = Int64

base/datafmt.jl

@@ -338,7 +338,7 @@ function dlm_parse{T,D}(dbuff::T, eol::D, dlm::D, qchar::D, cchar::D, ign_adj_dl
  all_ascii = (D <: Uint8) || (isascii(eol) && isascii(dlm) && (!allow_quote || isascii(qchar)) && (!allow_comments || isascii(cchar)))
  (T <: UTF8String) && all_ascii && (return dlm_parse(dbuff.data, uint8(eol), uint8(dlm), uint8(qchar), uint8(cchar), ign_adj_dlm, allow_quote, allow_comments, skipstart, skipblanks, dh))
  ncols = nrows = col = 0
- is_default_dlm = (dlm == convert(D, invalid_dlm))
+ is_default_dlm = (dlm == itrunc(D, invalid_dlm))
  error_str = ""
  # 0: begin field, 1: quoted field, 2: unquoted field, 3: second quote (could either be end of field or escape character), 4: comment, 5: skipstart
  state = (skipstart > 0) ? 5 : 0

base/dates/types.jl

@@ -160,4 +160,4 @@ Base.promote_rule(::Type{Date},x::Type{DateTime}) = DateTime
 Base.isless(x::Date,y::Date) = isless(value(x),value(y))
 Base.isless(x::DateTime,y::DateTime) = isless(value(x),value(y))
 Base.isless(x::TimeType,y::TimeType) = isless(promote(x,y)...)
-==(x::TimeType,y::TimeType) = ===(promote(x,y)...)
+==(x::TimeType,y::TimeType) = ===(promote(x,y)...)

base/dict.jl

@@ -288,7 +288,7 @@ end
 
 empty!(t::ObjectIdDict) = (t.ht = cell(length(t.ht)); t)
 
-_oidd_nextind(a, i) = int(ccall(:jl_eqtable_nextind, Csize_t, (Any, Csize_t), a, i))
+_oidd_nextind(a, i) = reinterpret(Int,ccall(:jl_eqtable_nextind, Csize_t, (Any, Csize_t), a, i))
 
 start(t::ObjectIdDict) = _oidd_nextind(t.ht, 0)
 done(t::ObjectIdDict, i) = (i == -1)
@@ -385,7 +385,7 @@ function deserialize{K,V}(s, T::Type{Dict{K,V}})
  return t
 end
 
-hashindex(key, sz) = (int(hash(key)) & (sz-1)) + 1
+hashindex(key, sz) = (reinterpret(Int,hash(key)) & (sz-1)) + 1
 
 isslotempty(h::Dict, i::Int) = h.slots[i] == 0x0
 isslotfilled(h::Dict, i::Int) = h.slots[i] == 0x1

base/float.jl

@@ -1,16 +1,16 @@
 ## conversions to floating-point ##
 
-convert(::Type{Float32}, x::Int128) = float32(uint128(abs(x)))*(1-2(x<0))
-convert(::Type{Float32}, x::Uint128) = float32(uint64(x)) + ldexp(float32(uint64(x>>>64)),64)
+convert(::Type{Float32}, x::Int128) = float32(reinterpret(Uint128,abs(x)))*(1-2(x<0))
+convert(::Type{Float32}, x::Uint128) = float32(uint64(x&0xffffffffffffffff)) + ldexp(float32(uint64(x>>>64)),64)
 promote_rule(::Type{Float32}, ::Type{Int128} ) = Float32
 promote_rule(::Type{Float32}, ::Type{Uint128}) = Float32
 
-convert(::Type{Float64}, x::Int128) = float64(uint128(abs(x)))*(1-2(x<0))
-convert(::Type{Float64}, x::Uint128) = float64(uint64(x)) + ldexp(float64(uint64(x>>>64)),64)
+convert(::Type{Float64}, x::Int128) = float64(reinterpret(Uint128,abs(x)))*(1-2(x<0))
+convert(::Type{Float64}, x::Uint128) = float64(uint64(x&0xffffffffffffffff)) + ldexp(float64(uint64(x>>>64)),64)
 promote_rule(::Type{Float64}, ::Type{Int128} ) = Float64
 promote_rule(::Type{Float64}, ::Type{Uint128}) = Float64
 
-convert(::Type{Float16}, x::Union(Signed,Unsigned)) = convert(Float16, convert(Float32,x))
+convert(::Type{Float16}, x::Integer) = convert(Float16, convert(Float32,x))
 for t in (Bool,Char,Int8,Int16,Int32,Int64,Uint8,Uint16,Uint32,Uint64)
  @eval promote_rule(::Type{Float16}, ::Type{$t}) = Float32
 end

base/grisu/fastfixed.jl

@@ -110,8 +110,8 @@ function fillfractionals(fractionals, exponent,
  return len, decimal_point
 end
 
-low(x) = uint64(x)
-high(x) = uint64(x >> 64)
+low(x) = uint64(x&0xffffffffffffffff)
+high(x) = uint64(x >>> 64)
 bitat(x::Uint128,y) = y >= 64 ? (int32(high(x) >> (y-64)) & 1) : (int32(low(x) >> y) & 1)
 function divrem2(x,power)
  h = high(x)
@@ -219,4 +219,4 @@ function fastfixedtoa(v,mode,fractional_count,buffer)
  decimal_point = -fractional_count
  end
  return true, len, decimal_point, buffer
-end
+end

base/hashing2.jl

@@ -184,7 +184,7 @@ end
 function hash(s::IntSet, h::Uint)
  h += uint(0x88989f1fc7dea67d)
  h += hash(s.fill1s)
- filln = s.fill1s ? uint32(-1) : uint32(0)
+ filln = s.fill1s ? ~zero(eltype(s.bits)) : zero(eltype(s.bits))
  for x in s.bits
  if x != filln
  h = hash(x, h)