diff --git a/compiler/wordrecg.nim b/compiler/wordrecg.nim index 22f6cc71dee1..c819f4306388 100644 --- a/compiler/wordrecg.nim +++ b/compiler/wordrecg.nim @@ -41,7 +41,7 @@ type wImmediate = "immediate", wConstructor = "constructor", wDestructor = "destructor", wDelegator = "delegator", wOverride = "override", wImportCpp = "importcpp", wCppNonPod = "cppNonPod", - wImportObjC = "importobjc", wImportCompilerProc = "importcompilerproc", + wImportObjC = "importobjc", wImportCompilerProc = "importCompilerProc", wImportc = "importc", wImportJs = "importjs", wExportc = "exportc", wExportCpp = "exportcpp", wExportNims = "exportnims", wIncompleteStruct = "incompleteStruct", # deprecated diff --git a/lib/core/typeinfo.nim b/lib/core/typeinfo.nim index 9094462ffce7..18d2091b9fa9 100644 --- a/lib/core/typeinfo.nim +++ b/lib/core/typeinfo.nim @@ -114,19 +114,19 @@ when not defined(js): template `rawType=`(x: var Any, p: PNimType) = x.rawTypePtr = cast[pointer](p) -proc genericAssign(dest, src: pointer, mt: PNimType) {.importcompilerproc.} +proc genericAssign(dest, src: pointer, mt: PNimType) {.importCompilerProc.} when not defined(gcDestructors): - proc genericShallowAssign(dest, src: pointer, mt: PNimType) {.importcompilerproc.} - proc incrSeq(seq: PGenSeq, elemSize, elemAlign: int): PGenSeq {.importcompilerproc.} - proc newObj(typ: PNimType, size: int): pointer {.importcompilerproc.} - proc newSeq(typ: PNimType, len: int): pointer {.importcompilerproc.} - proc objectInit(dest: pointer, typ: PNimType) {.importcompilerproc.} + proc genericShallowAssign(dest, src: pointer, mt: PNimType) {.importCompilerProc.} + proc incrSeq(seq: PGenSeq, elemSize, elemAlign: int): PGenSeq {.importCompilerProc.} + proc newObj(typ: PNimType, size: int): pointer {.importCompilerProc.} + proc newSeq(typ: PNimType, len: int): pointer {.importCompilerProc.} + proc objectInit(dest: pointer, typ: PNimType) {.importCompilerProc.} else: - proc nimNewObj(size, align: int): pointer {.importcompilerproc.} - proc newSeqPayload(cap, elemSize, elemAlign: int): pointer {.importcompilerproc.} + proc nimNewObj(size, align: int): pointer {.importCompilerProc.} + proc newSeqPayload(cap, elemSize, elemAlign: int): pointer {.importCompilerProc.} proc prepareSeqAdd(len: int; p: pointer; addlen, elemSize, elemAlign: int): pointer {. - importcompilerproc.} + importCompilerProc.} template `+!!`(a, b): untyped = cast[pointer](cast[ByteAddress](a) + b)