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

miscellaneous bug fixes (#13291)

Browse source 
* fix for emscripten etc

* add testcase for #13290

* replace deprecated isNilOrWhitespace
This commit is contained in:
Timothee Cour 2020-01-30 01:54:50 -08:00 • committed by GitHub
commit bf22b44b1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/includes/osenv.nim
View file

@ -68,7 +68,7 @@ when defined(windows) and not defined(nimscript):
else: else:
const const
useNSGetEnviron = (defined(macosx) and not defined(ios)) or defined(nimscript) useNSGetEnviron = (defined(macosx) and not defined(ios) and not defined(emscripten)) or defined(nimscript)
when useNSGetEnviron: when useNSGetEnviron:
# From the manual: # From the manual:

2
lib/system/timers.nim
View file

@ -31,7 +31,7 @@ when defined(windows):
result = Nanos(float64(a.int64 - b.int64) * performanceCounterRate) result = Nanos(float64(a.int64 - b.int64) * performanceCounterRate)
elif defined(macosx): elif defined(macosx) and not defined(emscripten):
type type
MachTimebaseInfoData {.pure, final, MachTimebaseInfoData {.pure, final,
importc: "mach_timebase_info_data_t", importc: "mach_timebase_info_data_t",

2
testament/htmlgen.nim
View file

@ -52,7 +52,7 @@ proc generateTestResultPanelPartial(outfile: File, testResultRow: JsonNode) =
trId, name, target, category, action, resultDescription, trId, name, target, category, action, resultDescription,
timestamp, result, resultSign, panelCtxClass, textCtxClass, bgCtxClass timestamp, result, resultSign, panelCtxClass, textCtxClass, bgCtxClass
) )
if expected.isNilOrWhitespace() and gotten.isNilOrWhitespace(): if expected.isEmptyOrWhitespace() and gotten.isEmptyOrWhitespace():
outfile.generateHtmlTestresultOutputNone() outfile.generateHtmlTestresultOutputNone()
else: else:
outfile.generateHtmlTestresultOutputDetails( outfile.generateHtmlTestresultOutputDetails(

9
tests/system/tsystem_misc.nim
View file

@ -184,3 +184,12 @@ proc testMinMax(a,b: float32) =
testMinMax(0.0, NaN) testMinMax(0.0, NaN)
testMinMax(NaN, 0.0) testMinMax(NaN, 0.0)
block:
type Foo = enum
k1, k2
var
a = {k1}
b = {k1,k2}
doAssert a < b