some more bugfixes for the integer promotion rules

This commit is contained in:
Araq
2012-07-10 01:12:03 +02:00
parent a6ee0eb299
commit 95faae2c0a
4 changed files with 9 additions and 8 deletions

View File

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

View File

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

View File

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

View File

@@ -10,7 +10,7 @@ import
osproc,
cairowin32, cairoxlib,
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")