jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some more bugfixes for the integer promotion rules

Browse source
This commit is contained in:
Araq 2012-07-10 01:12:03 +02:00
commit 95faae2c0a
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/semexprs.nim
View file

@ -906,7 +906,7 @@ proc semSubscript(c: PContext, n: PNode, flags: TExprFlags): PNode =
n.sons[i] = semExprWithType(c, n.sons[i], flags) n.sons[i] = semExprWithType(c, n.sons[i], flags)
var indexType = if arr.kind == tyArray: arr.sons[0] else: getSysType(tyInt) var indexType = if arr.kind == tyArray: arr.sons[0] else: getSysType(tyInt)
var arg = IndexTypesMatch(c, indexType, n.sons[1].typ, n.sons[1]) var arg = IndexTypesMatch(c, indexType, n.sons[1].typ, n.sons[1])
if arg != nil: if arg != nil:
n.sons[1] = arg n.sons[1] = arg
result = n result = n
result.typ = elemType(arr) result.typ = elemType(arr)

9
compiler/sigmatch.nim
View file

@ -324,10 +324,11 @@ proc typeRel(mapping: var TIdTable, f, a: PType): TTypeRelation =
of tyBool, tyChar: of tyBool, tyChar:
if a.kind == f.kind: result = isEqual if a.kind == f.kind: result = isEqual
elif skipTypes(a, {tyRange}).kind == f.kind: result = isSubtype elif skipTypes(a, {tyRange}).kind == f.kind: result = isSubtype
of tyRange: of tyRange:
if a.kind == f.kind: if a.kind == f.kind:
result = typeRel(mapping, base(a), base(f)) result = typeRel(mapping, base(f), base(a))
if result < isGeneric: result = isNone # bugfix: accept integer conversions here
#if result < isGeneric: result = isNone
elif skipTypes(f, {tyRange}).kind == a.kind: elif skipTypes(f, {tyRange}).kind == a.kind:
result = isIntConv result = isIntConv
elif isConvertibleToRange(skipTypes(f, {tyRange}), a): elif isConvertibleToRange(skipTypes(f, {tyRange}), a):

4
lib/pure/encodings.nim
View file

@ -368,7 +368,7 @@ when defined(windows):
lpWideCharStr = cstring(result), lpWideCharStr = cstring(result),
cchWideChar = cint(result.len div 2), cchWideChar = cint(result.len div 2),
lpMultiByteStr = cstring(res), lpMultiByteStr = cstring(res),
cbMultiByte = cap) cbMultiByte = cap.cint)
if m == 0: if m == 0:
# try again; ask for capacity: # try again; ask for capacity:
cap = WideCharToMultiByte( cap = WideCharToMultiByte(
@ -386,7 +386,7 @@ when defined(windows):
lpWideCharStr = cstring(result), lpWideCharStr = cstring(result),
cchWideChar = cint(result.len div 2), cchWideChar = cint(result.len div 2),
lpMultiByteStr = cstring(res), lpMultiByteStr = cstring(res),
cbMultiByte = cap) cbMultiByte = cap.cint)
if m == 0: OSError() if m == 0: OSError()
setLen(res, m) setLen(res, m)
result = res result = res

2
tests/compile/tnewlibs.nim
View file

@ -10,7 +10,7 @@ import
osproc, osproc,
cairowin32, cairoxlib, cairowin32, cairoxlib,
gl, glut, glu, glx, glext, wingl, gl, glut, glu, glx, glext, wingl,
lua, lualib, lauxlib, mysql, sqlite3, db_mongo, osproc lua, lualib, lauxlib, mysql, sqlite3, db_mongo, md5
writeln(stdout, "test compilation of binding modules") writeln(stdout, "test compilation of binding modules")