Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #14179, fix #14142, make CI 1.4x faster (2x faster locally) #14658

Merged
merged 7 commits into from
Jun 16, 2020
Merged

fix #14179, fix #14142, make CI 1.4x faster (2x faster locally) #14658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05ae505
Revert "fixes the regression #12860 caused; hotfix"
timotheecour Jun 14, 2020
7f5ca0e
Revert "Undefine `paramCount` & `paramStr` in nimscript.nim for *.nim…
timotheecour Jun 14, 2020
d7ee4e7
fix #14142: no more clash with: import os + use of existsDir/dirExist…
timotheecour Apr 28, 2020
d734ce5
remove a comment
timotheecour Apr 29, 2020
353798e
fixup
timotheecour Jun 14, 2020
5c01d4a
fixup
timotheecour Jun 15, 2020
5ea332b
noNimScript => noWeirdTarget + noNimJs
timotheecour Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion changelog.md
View file
Open in desktop
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
View file
Open in desktop
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