diff options
| -rw-r--r-- | compiler/sigmatch.nim | 13 | ||||
| -rw-r--r-- | lib/pure/json.nim | 58 | ||||
| -rw-r--r-- | tests/range/trange.nim | 13 |
3 files changed, 68 insertions, 16 deletions
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim index cb71c1c81..71302e6bc 100644 --- a/compiler/sigmatch.nim +++ b/compiler/sigmatch.nim @@ -385,18 +385,19 @@ proc handleRange(f, a: PType, min, max: TTypeKind): TTypeRelation = result = isFromIntLit elif f.kind == tyInt and k in {tyInt8..tyInt32}: result = isIntConv + elif f.kind == tyUInt and k in {tyUInt8..tyUInt32}: + result = isIntConv elif k >= min and k <= max: result = isConvertible - elif a.kind == tyRange and a.sons[0].kind in {tyInt..tyInt64, - tyUInt8..tyUInt32} and - a.n[0].intVal >= firstOrd(nil, f) and - a.n[1].intVal <= lastOrd(nil, f): + elif a.kind == tyRange and + # Make sure the conversion happens between types w/ same signedness + (f.kind in {tyInt..tyInt64} and a[0].kind in {tyInt..tyInt64} or + f.kind in {tyUInt8..tyUInt32} and a[0].kind in {tyUInt8..tyInt32}) and + a.n[0].intVal >= firstOrd(nil, f) and a.n[1].intVal <= lastOrd(nil, f): # passing 'nil' to firstOrd/lastOrd here as type checking rules should # not depent on the target integer size configurations! result = isConvertible else: result = isNone - #elif f.kind == tyInt and k in {tyInt..tyInt32}: result = isIntConv - #elif f.kind == tyUInt and k in {tyUInt..tyUInt32}: result = isIntConv proc isConvertibleToRange(f, a: PType): bool = # be less picky for tyRange, as that it is used for array indexing: diff --git a/lib/pure/json.nim b/lib/pure/json.nim index e387c516b..bebeaf084 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -313,6 +313,24 @@ proc `%`*(s: string): JsonNode = result.kind = JString result.str = s +proc `%`*(n: uint): JsonNode = + ## Generic constructor for JSON data. Creates a new `JInt JsonNode`. + new(result) + result.kind = JInt + result.num = BiggestInt(n) + +proc `%`*(n: int): JsonNode = + ## Generic constructor for JSON data. Creates a new `JInt JsonNode`. + new(result) + result.kind = JInt + result.num = n + +proc `%`*(n: BiggestUInt): JsonNode = + ## Generic constructor for JSON data. Creates a new `JInt JsonNode`. + new(result) + result.kind = JInt + result.num = BiggestInt(n) + proc `%`*(n: BiggestInt): JsonNode = ## Generic constructor for JSON data. Creates a new `JInt JsonNode`. new(result) @@ -1757,17 +1775,37 @@ when isMainModule: # Generate constructors for range[T] types block: type - Q1 = range[0..10] - Q2 = range[0'i8..10'i8] - Q3 = range[0'u16..10'u16] + Q1 = range[0'u8 .. 50'u8] + Q2 = range[0'u16 .. 50'u16] + Q3 = range[0'u32 .. 50'u32] + Q4 = range[0'i8 .. 50'i8] + Q5 = range[0'i16 .. 50'i16] + Q6 = range[0'i32 .. 50'i32] + Q7 = range[0'f32 .. 50'f32] + Q8 = range[0'f64 .. 50'f64] + Q9 = range[0 .. 50] + X = object m1: Q1 m2: Q2 m3: Q3 - - let - obj = X(m1: 1, m2: 2'i8, m3: 3'u16) - jsonObj = %obj - desObj = to(jsonObj, type(obj)) - - doAssert(desObj == obj) + m4: Q4 + m5: Q5 + m6: Q6 + m7: Q7 + m8: Q8 + m9: Q9 + + let obj = X( + m1: Q1(42), + m2: Q2(42), + m3: Q3(42), + m4: Q4(42), + m5: Q5(42), + m6: Q6(42), + m7: Q7(42), + m8: Q8(42), + m9: Q9(42) + ) + + doAssert(obj == to(%obj, type(obj))) diff --git a/tests/range/trange.nim b/tests/range/trange.nim index bc48e9566..41804d0f2 100644 --- a/tests/range/trange.nim +++ b/tests/range/trange.nim @@ -105,3 +105,16 @@ block tcolors: return rgb(red(a) +! red(b), green(a) +! green(b), blue(a) +! blue(b)) rgb(34, 55, 255) + +block: + type + R8 = range[0'u8 .. 10'u8] + R16 = range[0'u16 .. 10'u16] + R32 = range[0'u32 .. 10'u32] + + var + x1 = R8(4) + x2 = R16(4) + x3 = R32(4) + + doAssert $x1 & $x2 & $x3 == "444" |