vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

expression: set integer literals as int by default

pull/4107/head
SleepyRoy 2020-03-24 03:05:37 +08:00 committed by GitHub
parent 5c9cbae10d
commit 67ba56c65c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 788 additions and 793 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/builtin/int_test.v
View File

@ -150,8 +150,9 @@ fn test_int_decl() {
assert typeof(x3) == 'int' assert typeof(x3) == 'int'
assert typeof(x4) == 'int' assert typeof(x4) == 'int'
assert typeof(x5) == 'int' assert typeof(x5) == 'int'
// integers are always 'int' by default
x6 := 989898932113111 x6 := 989898932113111
x7 := -321314588900011 x7 := u64(-321314588900011)
assert typeof(x6) == 'u64' assert typeof(x6) == 'int'
assert typeof(x7) == 'u64' assert typeof(x7) == 'u64'
} }

8
vlib/compiler/expression.v
View File

@ -787,13 +787,7 @@ fn (p mut Parser) factor() string {
} }
.number { .number {
// Check if float (`1.0`, `1e+3`) but not if is hexa (e.g. 0xEE contains `E` but is not float) // Check if float (`1.0`, `1e+3`) but not if is hexa (e.g. 0xEE contains `E` but is not float)
if (p.lit.contains('.') || p.lit.contains('e') || p.lit.contains('E')) && !(p.lit[..2] in ['0x', '0X']) { typ = if (p.lit.contains('.') || p.lit.contains('e') || p.lit.contains('E')) && !(p.lit[..2] in ['0x', '0X']) { 'f64' } else { 'int' }
typ = 'f64'
}
else {
v_u64 := p.lit.u64()
typ = if u64(u32(v_u64)) < v_u64 { 'u64' } else { 'int' }
}
if p.expected_type != '' && !is_valid_int_const(p.lit, p.expected_type) { if p.expected_type != '' && !is_valid_int_const(p.lit, p.expected_type) {
p.error('constant `$p.lit` overflows `$p.expected_type`') p.error('constant `$p.lit` overflows `$p.expected_type`')
} }

64
vlib/crypto/sha512/sha512.v
View File

@ -28,38 +28,38 @@ pub const (
const ( const (
chunk = 128 chunk = 128
init0 = 0x6a09e667f3bcc908 init0 = u64(0x6a09e667f3bcc908)
init1 = 0xbb67ae8584caa73b init1 = u64(0xbb67ae8584caa73b)
init2 = 0x3c6ef372fe94f82b init2 = u64(0x3c6ef372fe94f82b)
init3 = 0xa54ff53a5f1d36f1 init3 = u64(0xa54ff53a5f1d36f1)
init4 = 0x510e527fade682d1 init4 = u64(0x510e527fade682d1)
init5 = 0x9b05688c2b3e6c1f init5 = u64(0x9b05688c2b3e6c1f)
init6 = 0x1f83d9abfb41bd6b init6 = u64(0x1f83d9abfb41bd6b)
init7 = 0x5be0cd19137e2179 init7 = u64(0x5be0cd19137e2179)
init0_224 = 0x8c3d37c819544da2 init0_224 = u64(0x8c3d37c819544da2)
init1_224 = 0x73e1996689dcd4d6 init1_224 = u64(0x73e1996689dcd4d6)
init2_224 = 0x1dfab7ae32ff9c82 init2_224 = u64(0x1dfab7ae32ff9c82)
init3_224 = 0x679dd514582f9fcf init3_224 = u64(0x679dd514582f9fcf)
init4_224 = 0x0f6d2b697bd44da8 init4_224 = u64(0x0f6d2b697bd44da8)
init5_224 = 0x77e36f7304c48942 init5_224 = u64(0x77e36f7304c48942)
init6_224 = 0x3f9d85a86a1d36c8 init6_224 = u64(0x3f9d85a86a1d36c8)
init7_224 = 0x1112e6ad91d692a1 init7_224 = u64(0x1112e6ad91d692a1)
init0_256 = 0x22312194fc2bf72c init0_256 = u64(0x22312194fc2bf72c)
init1_256 = 0x9f555fa3c84c64c2 init1_256 = u64(0x9f555fa3c84c64c2)
init2_256 = 0x2393b86b6f53b151 init2_256 = u64(0x2393b86b6f53b151)
init3_256 = 0x963877195940eabd init3_256 = u64(0x963877195940eabd)
init4_256 = 0x96283ee2a88effe3 init4_256 = u64(0x96283ee2a88effe3)
init5_256 = 0xbe5e1e2553863992 init5_256 = u64(0xbe5e1e2553863992)
init6_256 = 0x2b0199fc2c85b8aa init6_256 = u64(0x2b0199fc2c85b8aa)
init7_256 = 0x0eb72ddc81c52ca2 init7_256 = u64(0x0eb72ddc81c52ca2)
init0_384 = 0xcbbb9d5dc1059ed8 init0_384 = u64(0xcbbb9d5dc1059ed8)
init1_384 = 0x629a292a367cd507 init1_384 = u64(0x629a292a367cd507)
init2_384 = 0x9159015a3070dd17 init2_384 = u64(0x9159015a3070dd17)
init3_384 = 0x152fecd8f70e5939 init3_384 = u64(0x152fecd8f70e5939)
init4_384 = 0x67332667ffc00b31 init4_384 = u64(0x67332667ffc00b31)
init5_384 = 0x8eb44a8768581511 init5_384 = u64(0x8eb44a8768581511)
init6_384 = 0xdb0c2e0d64f98fa7 init6_384 = u64(0xdb0c2e0d64f98fa7)
init7_384 = 0x47b5481dbefa4fa4 init7_384 = u64(0x47b5481dbefa4fa4)
) )
// digest represents the partial evaluation of a checksum. // digest represents the partial evaluation of a checksum.
struct Digest { struct Digest {

160
vlib/crypto/sha512/sha512block_generic.v
View File

@ -10,86 +10,86 @@ module sha512
import math.bits import math.bits
const ( const (
_k = [0x428a2f98d728ae22, _k = [u64(0x428a2f98d728ae22),
0x7137449123ef65cd, u64(0x7137449123ef65cd),
0xb5c0fbcfec4d3b2f, u64(0xb5c0fbcfec4d3b2f),
0xe9b5dba58189dbbc, u64(0xe9b5dba58189dbbc),
0x3956c25bf348b538, u64(0x3956c25bf348b538),
0x59f111f1b605d019, u64(0x59f111f1b605d019),
0x923f82a4af194f9b, u64(0x923f82a4af194f9b),
0xab1c5ed5da6d8118, u64(0xab1c5ed5da6d8118),
0xd807aa98a3030242, u64(0xd807aa98a3030242),
0x12835b0145706fbe, u64(0x12835b0145706fbe),
0x243185be4ee4b28c, u64(0x243185be4ee4b28c),
0x550c7dc3d5ffb4e2, u64(0x550c7dc3d5ffb4e2),
0x72be5d74f27b896f, u64(0x72be5d74f27b896f),
0x80deb1fe3b1696b1, u64(0x80deb1fe3b1696b1),
0x9bdc06a725c71235, u64(0x9bdc06a725c71235),
0xc19bf174cf692694, u64(0xc19bf174cf692694),
0xe49b69c19ef14ad2, u64(0xe49b69c19ef14ad2),
0xefbe4786384f25e3, u64(0xefbe4786384f25e3),
0x0fc19dc68b8cd5b5, u64(0x0fc19dc68b8cd5b5),
0x240ca1cc77ac9c65, u64(0x240ca1cc77ac9c65),
0x2de92c6f592b0275, u64(0x2de92c6f592b0275),
0x4a7484aa6ea6e483, u64(0x4a7484aa6ea6e483),
0x5cb0a9dcbd41fbd4, u64(0x5cb0a9dcbd41fbd4),
0x76f988da831153b5, u64(0x76f988da831153b5),
0x983e5152ee66dfab, u64(0x983e5152ee66dfab),
0xa831c66d2db43210, u64(0xa831c66d2db43210),
0xb00327c898fb213f, u64(0xb00327c898fb213f),
0xbf597fc7beef0ee4, u64(0xbf597fc7beef0ee4),
0xc6e00bf33da88fc2, u64(0xc6e00bf33da88fc2),
0xd5a79147930aa725, u64(0xd5a79147930aa725),
0x06ca6351e003826f, u64(0x06ca6351e003826f),
0x142929670a0e6e70, u64(0x142929670a0e6e70),
0x27b70a8546d22ffc, u64(0x27b70a8546d22ffc),
0x2e1b21385c26c926, u64(0x2e1b21385c26c926),
0x4d2c6dfc5ac42aed, u64(0x4d2c6dfc5ac42aed),
0x53380d139d95b3df, u64(0x53380d139d95b3df),
0x650a73548baf63de, u64(0x650a73548baf63de),
0x766a0abb3c77b2a8, u64(0x766a0abb3c77b2a8),
0x81c2c92e47edaee6, u64(0x81c2c92e47edaee6),
0x92722c851482353b, u64(0x92722c851482353b),
0xa2bfe8a14cf10364, u64(0xa2bfe8a14cf10364),
0xa81a664bbc423001, u64(0xa81a664bbc423001),
0xc24b8b70d0f89791, u64(0xc24b8b70d0f89791),
0xc76c51a30654be30, u64(0xc76c51a30654be30),
0xd192e819d6ef5218, u64(0xd192e819d6ef5218),
0xd69906245565a910, u64(0xd69906245565a910),
0xf40e35855771202a, u64(0xf40e35855771202a),
0x106aa07032bbd1b8, u64(0x106aa07032bbd1b8),
0x19a4c116b8d2d0c8, u64(0x19a4c116b8d2d0c8),
0x1e376c085141ab53, u64(0x1e376c085141ab53),
0x2748774cdf8eeb99, u64(0x2748774cdf8eeb99),
0x34b0bcb5e19b48a8, u64(0x34b0bcb5e19b48a8),
0x391c0cb3c5c95a63, u64(0x391c0cb3c5c95a63),
0x4ed8aa4ae3418acb, u64(0x4ed8aa4ae3418acb),
0x5b9cca4f7763e373, u64(0x5b9cca4f7763e373),
0x682e6ff3d6b2b8a3, u64(0x682e6ff3d6b2b8a3),
0x748f82ee5defb2fc, u64(0x748f82ee5defb2fc),
0x78a5636f43172f60, u64(0x78a5636f43172f60),
0x84c87814a1f0ab72, u64(0x84c87814a1f0ab72),
0x8cc702081a6439ec, u64(0x8cc702081a6439ec),
0x90befffa23631e28, u64(0x90befffa23631e28),
0xa4506cebde82bde9, u64(0xa4506cebde82bde9),
0xbef9a3f7b2c67915, u64(0xbef9a3f7b2c67915),
0xc67178f2e372532b, u64(0xc67178f2e372532b),
0xca273eceea26619c, u64(0xca273eceea26619c),
0xd186b8c721c0c207, u64(0xd186b8c721c0c207),
0xeada7dd6cde0eb1e, u64(0xeada7dd6cde0eb1e),
0xf57d4f7fee6ed178, u64(0xf57d4f7fee6ed178),
0x06f067aa72176fba, u64(0x06f067aa72176fba),
0x0a637dc5a2c898a6, u64(0x0a637dc5a2c898a6),
0x113f9804bef90dae, u64(0x113f9804bef90dae),
0x1b710b35131c471b, u64(0x1b710b35131c471b),
0x28db77f523047d84, u64(0x28db77f523047d84),
0x32caab7b40c72493, u64(0x32caab7b40c72493),
0x3c9ebe0a15c9bebc, u64(0x3c9ebe0a15c9bebc),
0x431d67c49c100d4c, u64(0x431d67c49c100d4c),
0x4cc5d4becb3e42b6, u64(0x4cc5d4becb3e42b6),
0x597f299cfc657e2a, u64(0x597f299cfc657e2a),
0x5fcb6fab3ad6faec, u64(0x5fcb6fab3ad6faec),
0x6c44198c4a475817, u64(0x6c44198c4a475817),
] ]
) )

4
vlib/hash/fnv1a/fnv1a.v
View File

@ -1,8 +1,8 @@
module fnv1a module fnv1a
const ( const (
fnv64_prime = 1099511628211 fnv64_prime = u64(1099511628211)
fnv64_offset_basis = 14695981039346656037 fnv64_offset_basis = u64(14695981039346656037)
fnv32_offset_basis = u32(2166136261) fnv32_offset_basis = u32(2166136261)
fnv32_prime = u32(16777619) fnv32_prime = u32(16777619)
) )

10
vlib/hash/wyhash/wyhash.v
View File

@ -21,11 +21,11 @@ fn C.wyhash(byteptr, u64, u64) u64
const ( const (
wyp0 = 0xa0761d6478bd642f wyp0 = u64(0xa0761d6478bd642f)
wyp1 = 0xe7037ed1a0b428db wyp1 = u64(0xe7037ed1a0b428db)
wyp2 = 0x8ebc6af09c88c6e3 wyp2 = u64(0x8ebc6af09c88c6e3)
wyp3 = 0x589965cc75374cc3 wyp3 = u64(0x589965cc75374cc3)
wyp4 = 0x1d8e4e27c47d124f wyp4 = u64(0x1d8e4e27c47d124f)
) )
[inline] [inline]

8
vlib/math/bits.v
View File

@ -4,10 +4,10 @@
module math module math
const ( const (
uvnan = 0x7FF8000000000001 uvnan = u64(0x7FF8000000000001)
uvinf = 0x7FF0000000000000 uvinf = u64(0x7FF0000000000000)
uvneginf = 0xFFF0000000000000 uvneginf = u64(0xFFF0000000000000)
uvone = 0x3FF0000000000000 uvone = u64(0x3FF0000000000000)
mask = 0x7FF mask = 0x7FF
shift = 64 - 11 - 1 shift = 64 - 11 - 1
bias = 1023 bias = 1023

18
vlib/math/bits/bits.v
View File

@ -9,7 +9,7 @@ const (
de_bruijn32tab = [byte(0), 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, de_bruijn32tab = [byte(0), 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9, 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9,
] ]
de_bruijn64 = (0x03f79d71b4ca8b09) de_bruijn64 = u64(0x03f79d71b4ca8b09)
de_bruijn64tab = [byte(0), 1, 56, 2, 57, 49, 28, 3, 61, 58, 42, 50, 38, 29, 17, 4, de_bruijn64tab = [byte(0), 1, 56, 2, 57, 49, 28, 3, 61, 58, 42, 50, 38, 29, 17, 4,
62, 47, 59, 36, 45, 43, 51, 22, 53, 39, 33, 30, 24, 18, 12, 5, 62, 47, 59, 36, 45, 43, 51, 22, 53, 39, 33, 30, 24, 18, 12, 5,
63, 55, 48, 27, 60, 41, 37, 16, 46, 35, 44, 21, 52, 32, 23, 11, 63, 55, 48, 27, 60, 41, 37, 16, 46, 35, 44, 21, 52, 32, 23, 11,
@ -18,17 +18,17 @@ const (
) )
const ( const (
m0 = 0x5555555555555555 // 01010101 ... m0 = u64(0x5555555555555555) // 01010101 ...
m1 = 0x3333333333333333 // 00110011 ... m1 = u64(0x3333333333333333) // 00110011 ...
m2 = 0x0f0f0f0f0f0f0f0f // 00001111 ... m2 = u64(0x0f0f0f0f0f0f0f0f) // 00001111 ...
m3 = 0x00ff00ff00ff00ff // etc. m3 = u64(0x00ff00ff00ff00ff) // etc.
m4 = 0x0000ffff0000ffff m4 = u64(0x0000ffff0000ffff)
) )
const ( const (
// save importing math mod just for these // save importing math mod just for these
max_u32 = 4294967295 max_u32 = u32(4294967295)
max_u64 = 18446744073709551615 max_u64 = u64(18446744073709551615)
) )
// --- LeadingZeros --- // --- LeadingZeros ---
@ -371,7 +371,7 @@ pub fn sub_64(x u64, y u64, borrow u64) (u64, u64) {
// --- Full-width multiply --- // --- Full-width multiply ---
const ( const (
two32 = 0x1_0000_0000 two32 = u64(0x1_0000_0000)
mask32 = two32 - 1 mask32 = two32 - 1
overflow_error = "Overflow Error" overflow_error = "Overflow Error"
divide_error = "Divide Error" divide_error = "Divide Error"

2
vlib/math/bits/bits_test.v
View File

@ -277,7 +277,7 @@ fn test_bits(){
for x in 0..62 { for x in 0..62 {
hi := u64(i) << x hi := u64(i) << x
lo := u64(2) //hi - 1 lo := u64(2) //hi - 1
y := 0x4000_0000_0000_0000 y := u64(0x4000_0000_0000_0000)
quo, rem := div_64(hi, lo, y) quo, rem := div_64(hi, lo, y)
//C.printf("[%016llx_%016llx] %016llx (%016llx,%016llx)\n", hi, lo, y, quo, rem) //C.printf("[%016llx_%016llx] %016llx (%016llx,%016llx)\n", hi, lo, y, quo, rem)
assert quo == u64(2)<<(x+1) assert quo == u64(2)<<(x+1)

8
vlib/math/const.v
View File

@ -38,11 +38,11 @@ pub const (
// -9223372036854775808 is wrong because C compilers parse litteral values // -9223372036854775808 is wrong because C compilers parse litteral values
// without sign first, and 9223372036854775808 overflows i64, hence the // without sign first, and 9223372036854775808 overflows i64, hence the
// consecutive subtraction by 1 // consecutive subtraction by 1
min_i64 = -9223372036854775807 - 1 min_i64 = i64(-9223372036854775807 - 1)
max_i64 = 9223372036854775807 max_i64 = i64(9223372036854775807)
max_u8 = 255 max_u8 = 255
max_u16 = 65535 max_u16 = 65535
max_u32 = 4294967295 max_u32 = u32(4294967295)
max_u64 = 18446744073709551615 max_u64 = u64(18446744073709551615)
) )

6
vlib/strconv/atof.v
View File

@ -102,9 +102,9 @@ const (
// //
DIGITS = 18 DIGITS = 18
DOUBLE_PLUS_ZERO = u64(0x0000000000000000) DOUBLE_PLUS_ZERO = u64(0x0000000000000000)
DOUBLE_MINUS_ZERO = 0x8000000000000000 DOUBLE_MINUS_ZERO = u64(0x8000000000000000)
DOUBLE_PLUS_INFINITY = 0x7FF0000000000000 DOUBLE_PLUS_INFINITY = u64(0x7FF0000000000000)
DOUBLE_MINUS_INFINITY = 0xFFF0000000000000 DOUBLE_MINUS_INFINITY = u64(0xFFF0000000000000)
// //
// parser state machine states // parser state machine states
// //

10
vlib/strconv/atofq/atofq.v
View File

File diff suppressed because one or more lines are too long

2
vlib/strconv/ftoa/f64_str.v
View File

@ -157,7 +157,7 @@ fn f64_to_decimal_exact_int(i_mant u64, exp u64) (Dec64, bool) {
return d, false return d, false
} }
shift := mantbits64 - e shift := mantbits64 - e
mant := i_mant | 0x0010_0000_0000_0000 // implicit 1 mant := i_mant | u64(0x0010_0000_0000_0000) // implicit 1
//mant := i_mant | (1 << mantbits64) // implicit 1 //mant := i_mant | (1 << mantbits64) // implicit 1
d.m = mant >> shift d.m = mant >> shift
if (d.m << shift) != mant { if (d.m << shift) != mant {

1276
vlib/strconv/ftoa/tables.v
View File

File diff suppressed because it is too large Load Diff