From 3c238df6cd4b9c1f37a9f103383e7d2bbd420c13 Mon Sep 17 00:00:00 2001 From: tersec Date: Wed, 13 Mar 2024 04:45:06 +0000 Subject: [PATCH] fix noInit to noinit; use evergreen GitHub Actions image versions (#151) --- .github/workflows/ci.yml | 4 ++-- stint/intops.nim | 2 +- stint/private/primitives/addcarry_subborrow.nim | 4 ++-- stint/uintops.nim | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18fa79e..6ee1567 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,10 +26,10 @@ jobs: include: - target: os: linux - builder: ubuntu-20.04 + builder: ubuntu-latest - target: os: macos - builder: macos-12 + builder: macos-latest - target: os: windows builder: windows-latest diff --git a/stint/intops.nim b/stint/intops.nim index 7949ffc..245d1f7 100644 --- a/stint/intops.nim +++ b/stint/intops.nim @@ -168,7 +168,7 @@ func `xor`*(a, b: StInt): StInt = ## `Bitwise xor` of numbers x and y result.impl.bitxor(a.impl, b.impl) -{.pop.} # End noInit +{.pop.} # End noinit {.push raises: [], inline, gcsafe.} diff --git a/stint/private/primitives/addcarry_subborrow.nim b/stint/private/primitives/addcarry_subborrow.nim index 0f9c807..b5e264c 100644 --- a/stint/private/primitives/addcarry_subborrow.nim +++ b/stint/private/primitives/addcarry_subborrow.nim @@ -148,7 +148,7 @@ func addC*(cOut: var Carry, sum: var uint64, a, b: uint64, cIn: Carry) {.inline. when useIntrinsics: cOut = addcarry_u64(cIn, a, b, sum) elif useInt128: - var dblPrec {.noInit.}: uint128 + var dblPrec {.noinit.}: uint128 {.emit:[dblPrec, " = (unsigned __int128)", a," + (unsigned __int128)", b, " + (unsigned __int128)",cIn,";"].} # Don't forget to dereference the var param in C mode @@ -170,7 +170,7 @@ func subB*(bOut: var Borrow, diff: var uint64, a, b: uint64, bIn: Borrow) {.inli when useIntrinsics: bOut = subborrow_u64(bIn, a, b, diff) elif useInt128: - var dblPrec {.noInit.}: uint128 + var dblPrec {.noinit.}: uint128 {.emit:[dblPrec, " = (unsigned __int128)", a," - (unsigned __int128)", b, " - (unsigned __int128)",bIn,";"].} # Don't forget to dereference the var param in C mode diff --git a/stint/uintops.nim b/stint/uintops.nim index 0c4daf0..b1bc580 100644 --- a/stint/uintops.nim +++ b/stint/uintops.nim @@ -123,7 +123,7 @@ func `xor`*(a, b: StUint): StUint = ## `Bitwise xor` of numbers x and y result.bitxor(a, b) -{.pop.} # End noInit +{.pop.} # End noinit export countOnes, @@ -270,4 +270,4 @@ func divmod*(x, y: StUint): tuple[quot, rem: StUint] = ## Division and remainder operations for multi-precision unsigned uint divRem(result.quot.limbs, result.rem.limbs, x.limbs, y.limbs) -{.pop.} \ No newline at end of file +{.pop.}