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

Merge pull request #1186 from ppelleti/typos

Browse source 
fix some typos
This commit is contained in:
Simon Hafner 2014-05-08 13:17:22 -05:00
commit 4d5ad91775
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/lib.txt
View file

@ -535,7 +535,7 @@ Database support
* `odbcsql <odbcsql.html>`_ * `odbcsql <odbcsql.html>`_
interface to the ODBC driver. interface to the ODBC driver.
* `sphinx <sphinx.html>`_ * `sphinx <sphinx.html>`_
Nimrod wrapper for ``shpinx``. Nimrod wrapper for ``sphinx``.
XML Processing XML Processing

12
doc/manual.txt
View file

@ -123,7 +123,7 @@ This means that all the control structures are recognized by indentation.
Indentation consists only of spaces; tabulators are not allowed. Indentation consists only of spaces; tabulators are not allowed.
The indentation handling is implemented as follows: The lexer annotates the The indentation handling is implemented as follows: The lexer annotates the
following token with the preceeding number of spaces; indentation is not following token with the preceding number of spaces; indentation is not
a separate token. This trick allows parsing of Nimrod with only 1 token of a separate token. This trick allows parsing of Nimrod with only 1 token of
lookahead. lookahead.
@ -617,7 +617,7 @@ Ordinal types
Integers, bool, characters and enumeration types (and subranges of these Integers, bool, characters and enumeration types (and subranges of these
types) belong to ordinal types. For reasons of simplicity of implementation types) belong to ordinal types. For reasons of simplicity of implementation
the types ``uint`` and ``uint64`` are no ordinal types. the types ``uint`` and ``uint64`` are not ordinal types.
Pre-defined integer types Pre-defined integer types
@ -686,7 +686,7 @@ kinds of integer types are used: the smaller type is converted to the larger.
A `narrowing type conversion`:idx: converts a larger to a smaller type (for A `narrowing type conversion`:idx: converts a larger to a smaller type (for
example ``int32 -> int16``. A `widening type conversion`:idx: converts a example ``int32 -> int16``. A `widening type conversion`:idx: converts a
smaller type to a larger type (for example ``int16 -> int32``). In Nimrod only smaller type to a larger type (for example ``int16 -> int32``). In Nimrod only
widening type conversion are *implicit*: widening type conversions are *implicit*:
.. code-block:: nimrod .. code-block:: nimrod
var myInt16 = 5i16 var myInt16 = 5i16
@ -1519,7 +1519,7 @@ Most calling conventions exist only for the Windows 32-bit platform.
Assigning/passing a procedure to a procedural variable is only allowed if one Assigning/passing a procedure to a procedural variable is only allowed if one
of the following conditions hold: of the following conditions hold:
1) The procedure that is accessed resists in the current module. 1) The procedure that is accessed resides in the current module.
2) The procedure is marked with the ``procvar`` pragma (see `procvar pragma`_). 2) The procedure is marked with the ``procvar`` pragma (see `procvar pragma`_).
3) The procedure has a calling convention that differs from ``nimcall``. 3) The procedure has a calling convention that differs from ``nimcall``.
4) The procedure is anonymous. 4) The procedure is anonymous.
@ -1527,8 +1527,8 @@ of the following conditions hold:
The rules' purpose is to prevent the case that extending a non-``procvar`` The rules' purpose is to prevent the case that extending a non-``procvar``
procedure with default parameters breaks client code. procedure with default parameters breaks client code.
The default calling convention is ``nimcall``, unless it is an inner proc ( The default calling convention is ``nimcall``, unless it is an inner proc (a
a proc inside of a proc). For an inner proc an analysis is performed whether it proc inside of a proc). For an inner proc an analysis is performed whether it
accesses its environment. If it does so, it has the calling convention accesses its environment. If it does so, it has the calling convention
``closure``, otherwise it has the calling convention ``nimcall``. ``closure``, otherwise it has the calling convention ``nimcall``.

2
doc/nimrodc.txt
View file

@ -167,7 +167,7 @@ might contain some cruft even when dead code elimination is turned on. So
the final release build should be done with ``--symbolFiles:off``. the final release build should be done with ``--symbolFiles:off``.
Due to the aggregation of C code it is also recommended that each project Due to the aggregation of C code it is also recommended that each project
resists in its own directory so that the generated ``nimcache`` directory resides in its own directory so that the generated ``nimcache`` directory
is not shared between different projects. is not shared between different projects.