diff options
| author | Araq <rumpf_a@web.de> | 2015-09-10 08:53:58 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2015-09-10 10:50:29 +0200 |
| commit | d7a472743b6d3e7c0062621d0b861d20edf89663 (patch) | |
| tree | 931e0ac1d5197e7bced1677e6633f48c803a027b /doc | |
| parent | ffe51966b9a424a55a0a6c5ccac37fe0ced3709f (diff) | |
| download | Nim-d7a472743b6d3e7c0062621d0b861d20edf89663.tar.gz | |
fixes #2559
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/filelist.txt | 4 | ||||
| -rw-r--r-- | doc/filters.txt | 13 | ||||
| -rw-r--r-- | doc/manual/syntax.txt | 8 |
3 files changed, 13 insertions, 12 deletions
diff --git a/doc/filelist.txt b/doc/filelist.txt index beff8f6c8..71379b40d 100644 --- a/doc/filelist.txt +++ b/doc/filelist.txt @@ -4,12 +4,12 @@ Short description of Nim's modules ============== ========================================================== Module Description ============== ========================================================== -nim main module: parses the command line and calls +nim main module: parses the command line and calls ``main.MainCommand`` main implements the top-level command dispatching nimconf implements the config file reader syntaxes dispatcher for the different parsers and filters -filter_tmpl standard template filter (``#! stdtempl``) +filter_tmpl standard template filter (``#? stdtempl``) lexbase buffer handling of the lexical analyser lexer lexical analyser parser Nim's parser diff --git a/doc/filters.txt b/doc/filters.txt index afbd61e3c..46bc6c3e5 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -8,9 +8,9 @@ A `Source Code Filter` transforms the input character stream to an in-memory output stream before parsing. A filter can be used to provide templating systems or preprocessors. -To use a filter for a source file the *shebang* notation is used:: +To use a filter for a source file the ``#?`` notation is used:: - #! stdtmpl(subsChar = '$', metaChar = '#') + #? stdtmpl(subsChar = '$', metaChar = '#') #proc generateXML(name, age: string): string = # result = "" <xml> @@ -20,7 +20,8 @@ To use a filter for a source file the *shebang* notation is used:: As the example shows, passing arguments to a filter can be done just like an ordinary procedure call with named or positional arguments. The -available parameters depend on the invoked filter. +available parameters depend on the invoked filter. Before version 0.12.0 of +the language ``#!`` was used instead of ``#?``. Pipe operator @@ -28,7 +29,7 @@ Pipe operator Filters can be combined with the ``|`` pipe operator:: - #! strip(startswith="<") | stdtmpl + #? strip(startswith="<") | stdtmpl #proc generateXML(name, age: string): string = # result = "" <xml> @@ -104,7 +105,7 @@ Parameters and their defaults: Example:: - #! stdtmpl | standard + #? stdtmpl | standard #proc generateHTMLPage(title, currentTab, content: string, # tabs: openArray[string]): string = # result = "" @@ -172,7 +173,7 @@ produces ``$``. The template engine is quite flexible. It is easy to produce a procedure that writes the template code directly to a file:: - #! stdtmpl(emit="f.write") | standard + #? stdtmpl(emit="f.write") | standard #proc writeHTMLPage(f: File, title, currentTab, content: string, # tabs: openArray[string]) = <head><title>$title</title></head> diff --git a/doc/manual/syntax.txt b/doc/manual/syntax.txt index 99af15948..c444a3995 100644 --- a/doc/manual/syntax.txt +++ b/doc/manual/syntax.txt @@ -68,13 +68,13 @@ Strong spaces ------------- The number of spaces preceding a non-keyword operator affects precedence -if the experimental parser directive ``#!strongSpaces`` is used. Indentation +if the experimental parser directive ``#?strongSpaces`` is used. Indentation is not used to determine the number of spaces. If 2 or more operators have the same number of preceding spaces the precedence table applies, so ``1 + 3 * 4`` is still parsed as ``1 + (3 * 4)``, but ``1+3 * 4`` is parsed as ``(1+3) * 4``: .. code-block:: nim - #! strongSpaces + #? strongSpaces if foo+4 * 4 == 8 and b&c | 9 ++ bar: echo "" @@ -86,7 +86,7 @@ Furthermore whether an operator is used a prefix operator is affected by the number of spaces: .. code-block:: nim - #! strongSpaces + #? strongSpaces echo $foo # is parsed as echo($foo) @@ -95,7 +95,7 @@ This also affects whether ``[]``, ``{}``, ``()`` are parsed as constructors or as accessors: .. code-block:: nim - #! strongSpaces + #? strongSpaces echo (1,2) # is parsed as echo((1,2)) |