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

Merge branch 'devel' of https://github.com/nim-lang/Nim into devel

Browse source
This commit is contained in:
Andreas Rumpf 2016-01-19 11:06:10 +01:00
commit b18d52dcee
8 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/msgs.nim
View file

@ -828,7 +828,7 @@ proc quit(msg: TMsgKind) =
proc log*(s: string) {.procvar.} = proc log*(s: string) {.procvar.} =
var f: File var f: File
if open(f, "nimsuggest.log", fmAppend): if open(f, "nimsuggest.log", fmAppend):
f.writeln(s) f.writeLine(s)
close(f) close(f)
proc handleError(msg: TMsgKind, eh: TErrorHandling, s: string) = proc handleError(msg: TMsgKind, eh: TErrorHandling, s: string) =

2
compiler/vm.nim
View file

@ -15,7 +15,7 @@ const debugEchoCode = false
import ast except getstr import ast except getstr
import import
strutils, astalgo, msgs, vmdef, vmgen, nimsets, types, passes, unsigned, strutils, astalgo, msgs, vmdef, vmgen, nimsets, types, passes,
parser, vmdeps, idents, trees, renderer, options, transf, parseutils, parser, vmdeps, idents, trees, renderer, options, transf, parseutils,
vmmarshal vmmarshal

2
compiler/vmgen.nim
View file

@ -28,7 +28,7 @@
# this copy depends on the involved types. # this copy depends on the involved types.
import import
unsigned, strutils, ast, astalgo, types, msgs, renderer, vmdef, strutils, ast, astalgo, types, msgs, renderer, vmdef,
trees, intsets, rodread, magicsys, options, lowerings trees, intsets, rodread, magicsys, options, lowerings
from os import splitFile from os import splitFile

2
lib/impure/rdstdin.nim
View file

@ -100,7 +100,7 @@ when defined(Windows):
stdout.write "\n" stdout.write "\n"
else: else:
import linenoise, termios, unsigned import linenoise, termios
proc readLineFromStdin*(prompt: string): TaintedString {. proc readLineFromStdin*(prompt: string): TaintedString {.
tags: [ReadIOEffect, WriteIOEffect].} = tags: [ReadIOEffect, WriteIOEffect].} =

2
lib/pure/nativesockets.nim
View file

@ -12,7 +12,7 @@
# TODO: Clean up the exports a bit and everything else in general. # TODO: Clean up the exports a bit and everything else in general.
import unsigned, os import os
when hostOS == "solaris": when hostOS == "solaris":
{.passl: "-lsocket -lnsl".} {.passl: "-lsocket -lnsl".}

2
lib/pure/net.nim
View file

@ -10,7 +10,7 @@
## This module implements a high-level cross-platform sockets interface. ## This module implements a high-level cross-platform sockets interface.
{.deadCodeElim: on.} {.deadCodeElim: on.}
import nativesockets, os, strutils, unsigned, parseutils, times import nativesockets, os, strutils, parseutils, times
export Port, `$`, `==` export Port, `$`, `==`
const useWinVersion = defined(Windows) or defined(nimdoc) const useWinVersion = defined(Windows) or defined(nimdoc)

3
lib/pure/securehash.nim
View file

@ -7,8 +7,7 @@
# distribution, for details about the copyright. # distribution, for details about the copyright.
# #
import import strutils
strutils, unsigned
const Sha1DigestSize = 20 const Sha1DigestSize = 20

7
web/community.txt
View file

@ -86,6 +86,13 @@ Nim's Community
The `G+ Nim community <https://plus.google.com/u/0/communities/106921341535068810587>`_ is another place where discussions related to the language happen. Read and follow various articles, posts and interesting links about Nim. The `G+ Nim community <https://plus.google.com/u/0/communities/106921341535068810587>`_ is another place where discussions related to the language happen. Read and follow various articles, posts and interesting links about Nim.
.. container:: standout
Meetup
------
The `Nim BR Meetup <http://www.meetup.com/pt-BR/nim-br>`_ is a brazilian user group about Nim where they are having discussions, talks or workshops about Nim programming language.
.. container:: standout .. container:: standout
How to help How to help