Skip to content

Commit

Permalink
fix nim-lang#14179, fix nim-lang#14142, make CI 1.4x faster (2x faste…
Browse files Browse the repository at this point in the history
…r locally) (nim-lang#14658)

* fix nim-lang#14142: no more clash with: import os + use of existsDir/dirExists/existsFile/fileExists/findExe in config.nims

* remove a comment

* Revert "fixes the regression nim-lang#12860 caused; hotfix"

This reverts commit 3d2459b.

* Revert "Undefine `paramCount` & `paramStr` in nimscript.nim for *.nims (nim-lang#12860)"

This reverts commit d38853c.

* noNimScript => noWeirdTarget + noNimJs
  • Loading branch information
timotheecour authored Jun 16, 2020
1 parent 7b12f13 commit 45cac4a
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 79 deletions.
1 change: 0 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@

- Added high-level `asyncnet.sendTo` and `asyncnet.recvFrom`. UDP functionality.

- `paramCount` & `paramStr` are now defined in os.nim instead of nimscript.nim for nimscript/nimble.
- `dollars.$` now works for unsigned ints with `nim js`

- Improvements to the `bitops` module, including bitslices, non-mutating versions
Expand Down
10 changes: 4 additions & 6 deletions compiler/scriptconfig.nim
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,10 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
setResult(a, options.existsConfigVar(conf, a.getString 0))
cbconf nimcacheDir:
setResult(a, options.getNimcacheDir(conf).string)
result.registerCallback "stdlib.os." & astToStr(paramStr),
proc (a: VmArgs) =
setResult(a, os.paramStr(int a.getInt 0))
result.registerCallback "stdlib.os." & astToStr(paramCount),
proc (a: VmArgs) =
setResult(a, os.paramCount())
cbconf paramStr:
setResult(a, os.paramStr(int a.getInt 0))
cbconf paramCount:
setResult(a, os.paramCount())
cbconf cmpIgnoreStyle:
setResult(a, strutils.cmpIgnoreStyle(a.getString 0, a.getString 1))
cbconf cmpIgnoreCase:
Expand Down
Loading

0 comments on commit 45cac4a

Please sign in to comment.