Skip to content

Commit

Permalink
preserve old code for NimInAction in nim c mode
Browse files Browse the repository at this point in the history
  • Loading branch information
timotheecour committed Jan 15, 2019
1 parent 9000cc2 commit 45841ec
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
4 changes: 2 additions & 2 deletions testament/categories.nim
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,13 @@ proc testNimInAction(r: var TResults, cat: Category, options: string) =
"8b5d28e985c0542163927d253a3e4fc9",
"783299b98179cc725f9c46b5e3b5381f",
"1a2b3fba1187c68d6a9bfa66854f3318",
"6746c84dac11d30decc6edd6a4442098"
"391ff57b38d9ea6f3eeb3fe69ab539d3"
]

for i, test in tests:
let filename = testsDir / test.addFileExt("nim")
let testHash = getMD5(readFile(filename).string)
doAssert testHash == refHashes[i], "Nim in Action test " & filename & " was changed."
doAssert testHash == refHashes[i], "Nim in Action test " & filename & " was changed: " & $(i: i, testHash: testHash, refHash: refHashes[i])
# Run the tests.
for testfile in tests:
test "tests/" & testfile & ".nim"
Expand Down
23 changes: 17 additions & 6 deletions tests/niminaction/Chapter8/sdl/sdl_test.nim
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,23 @@ discard pollEvent(nil)
renderer.setDrawColor 29, 64, 153, 255
renderer.clear
renderer.setDrawColor 255, 255, 255, 255
var points = [
(260.cint, 320.cint),
(260.cint, 110.cint),
(360.cint, 320.cint),
(360.cint, 110.cint)
]

when defined(c):
# just to ensure code from NimInAction still works, but
# the `else` branch would work as well in C mode
var points = [
(260'i32, 320'i32),
(260'i32, 110'i32),
(360'i32, 320'i32),
(360'i32, 110'i32)
]
else:
var points = [
(260.cint, 320.cint),
(260.cint, 110.cint),
(360.cint, 320.cint),
(360.cint, 110.cint)
]

renderer.drawLines(addr points[0], points.len.cint)

Expand Down

0 comments on commit 45841ec

Please sign in to comment.