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

Merge branch 'more_concurrency' into devel

Browse source 
Conflicts:
	doc/tut1.txt
	lib/core/locks.nim
	lib/pure/collections/tables.nim
	lib/pure/selectors.nim
This commit is contained in:
Araq 2015-06-30 12:50:24 +02:00
commit 28de800d61
13 changed files with 584 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/types.txt
View file

@ -592,7 +592,7 @@ the ``of`` operator can be used to determine the object's type.
.. code-block:: nim
type
Person {.inheritable.} = object
Person = object of RootObj
name*: string # the * means that `name` is accessible from other modules
age: int # no * means that the field is hidden

6
doc/tut1.txt
View file

@ -1334,11 +1334,11 @@ define operators which accept Slice objects to define ranges.
b = "Slices are useless."
echo a[7..12] # --> 'a prog'
b[11.. ^2] = "useful"
b[11..^2] = "useful"
echo b # --> 'Slices are useful.'
In the previous example slices are used to modify a part of a string, and even
a negative index is used. The slice's bounds can hold any value supported by
In the previous example slices are used to modify a part of a string. The
slice's bounds can hold any value supported by
their type, but it is the proc using the slice object which defines what values
are accepted.