mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-13 06:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1912 from flaviut/rename-stuff

Browse Source 
s/nimrod/nim/g; s/babel/nimble/g
This commit is contained in:
reactormonk
2015-01-10 10:27:51 +05:00
parent eafbafb0e7 8b807adc08
commit 3273d32acc
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doc/backends.txt
View File

@@ -335,18 +335,18 @@ Nimcache and C like targets
The C like backends will place their temporary ``.c``, ``.cpp`` or ``.m`` files
in the ``nimcache`` directory. The naming of these files follows the pattern
``babelPackageName_`` + ``nimSource``:
``nimblePackageName_`` + ``nimSource``:
* Filenames for modules imported from `Babel packages
<https://github.com/nim-code/babel>`_ will end up with
``babelPackageName_module.c``. For example, if you import the
``argument_parser`` module from the same name Babel package you
* Filenames for modules imported from `nimble packages
<https://github.com/nim-code/nimble>`_ will end up with
``nimblePackageName_module.c``. For example, if you import the
``argument_parser`` module from the same name nimble package you
will end up with a ``argument_parser_argument_parser.c`` file
under ``nimcache``. The name of the Babel package comes from the
``proj.babel`` file, the actual contents are not read by the
under ``nimcache``. The name of the nimble package comes from the
``proj.nimble`` file, the actual contents are not read by the
compiler.
* Filenames for non babel packages (like your project) will be
* Filenames for non nimble packages (like your project) will be
renamed from ``.nim`` to have the extension of your target backend
(from now on ``.c`` for these examples), but otherwise nothing
else will change. This will quickly break if your project consists
@@ -360,13 +360,13 @@ in the ``nimcache`` directory. The naming of these files follows the pattern
module <system.html>`_ is always imported automatically. Same for
the `hashes module <hashes.html>`_ which will be named
``stdlib_hashes.c``. The ``stdlib_`` prefix comes from the *fake*
``lib/stdlib.babel`` file.
``lib/stdlib.nimble`` file.
To find the name of a Babel package the compiler searches for a ``*.babel``
To find the name of a nimble package the compiler searches for a ``*.nimble``
file in the parent directory hierarchy of whatever module you are compiling.
Even if you are in a subdirectory of your project, a parent ``*.babel`` file
Even if you are in a subdirectory of your project, a parent ``*.nimble`` file
will influence the naming of the nimcache name. This means that on Unix systems
creating the file ``~/foo.babel`` will automatically prefix all nimcache files
creating the file ``~/foo.nimble`` will automatically prefix all nimcache files
not part of another package with the string ``foo_``.

2
doc/intern.txt
View File

@@ -136,7 +136,7 @@ are also lots of procs that aid in debugging:
debug(someType)
echo symbol.name.s
debug(symbol)
# pretty prints the nimrod ast, but annotates symbol IDs:
# pretty prints the Nim ast, but annotates symbol IDs:
echo renderTree(someNode, {renderIds})
if n.info ?? "temp.nim":
# only output when it comes from "temp.nim"

2
doc/lib.txt
View File

@@ -586,7 +586,7 @@ Nimble
Nimble is a package manager for the Nim programming language.
For instructions on how to install Nimble packages see
`its README <https://github.com/nim-lang/babel#readme>`_.
`its README <https://github.com/nim-lang/nimble#readme>`_.
Official packages
-----------------

10
examples/cross_calculator/android/readme.txt
View File

@@ -1,20 +1,20 @@
In this directory you will find the Android platform cross-calculator sample.
Due to the nature of Android being java and nimrod generating C code, the build
Due to the nature of Android being java and Nim generating C code, the build
process is slightly more complex because jni code has to be written to bridge
both languages. In a distant future it may be possible for nimrod to generate
both languages. In a distant future it may be possible for Nim to generate
the whole jni bridge, but for the moment this is manual work.
For the jni bridge to work first the java code is compiled with the nimrod code
For the jni bridge to work first the java code is compiled with the Nim code
just declared as a native method which will be resolved at runtime. The scripts
nimbuild.sh and jnibuild.sh are in charge of building the nimrod code and
nimbuild.sh and jnibuild.sh are in charge of building the Nim code and
generating the jni bridge from the java code respectively. Finally, the
ndk-build command from the android ndk tools has to be run to build the binary
libary which will be installed along the final apk.
All these steps are wrapped in the ant build script through the customization
of the -post-compile rule. If you have the android ndk tools installed and you
modify scripts/nimbuild.sh to point to the directory where you have nimrod
modify scripts/nimbuild.sh to point to the directory where you have Nim
installed on your system, you can simply run "ant debug" to build everything.
Once the apk is built you can install it on your device or emulator with the

4
examples/cross_calculator/ios/readme.txt
View File

@@ -1,10 +1,10 @@
In this directory you will find the iOS platform cross-calculator sample.
The iOS version of the code builds a view controller in charge of displaying
the interface to the user. The nimrod backend code is compiled into C code and
the interface to the user. The Nim backend code is compiled into C code and
put into build/nimrod as a pre-build phase of the project.
When the calculate button is used the view controller calls the nimrod code to
When the calculate button is used the view controller calls the Nim code to
delegate the logic of the operation and puts the result in a label for display.
All interface error checks are implemented in the view controller.

6
examples/cross_calculator/ios/src/NRViewController.m
View File

@@ -40,7 +40,7 @@
// Dismiss all keyboards.
[self backgroundTouched];
// Call nimrod code, store the result and display it.
// Call Nim code, store the result and display it.
const int a = [self.aText.text intValue];
const int b = [self.bText.text intValue];
const int c = myAdd(a, b);
@@ -66,7 +66,7 @@
* was used on the xib file and slightly modified to fit the original property
* names. Which means here is a lot of garbage you would never write in real
* life. Please ignore the following "wall of code" for the purposes of
* learning Nimrod, this is all just because Apple can't be bothered to
* learning Nim, this is all just because Apple can't be bothered to
* maintain backwards compatibility properly.
*/
- (void)loadView
@@ -102,7 +102,7 @@
label4.contentStretch = CGRectFromString(@"{{0, 0}, {1, 1}}");
label4.frame = CGRectMake(0.0, 0.0, 320.0, 34.0);
label4.tag = 2;
label4.text = @"Nimrod Crossplatform Calculator";
label4.text = @"Nim Crossplatform Calculator";
label4.textAlignment = UITextAlignmentCenter;
UIButton *background_button = [UIButton buttonWithType:UIButtonTypeCustom];

6
examples/cross_calculator/lazarus/readme.txt
View File

@@ -1,8 +1,8 @@
This example demonstrates how to use Nimrod with Lazarus. The GUI is generated
with Lazarus, while the "backend" is written in Nimrod. To compile the example,
This example demonstrates how to use Nim with Lazarus. The GUI is generated
with Lazarus, while the "backend" is written in Nim. To compile the example,
use this command:
nimrod c --app:gui --no_main --no_linking backend.nim
nim c --app:gui --no_main --no_linking backend.nim
Open the ``nimlaz.lpi`` file in Lazarus and run the program.

6
examples/cross_todo/nimrod_commandline/readme.txt
View File

@@ -1,4 +1,4 @@
This directory contains the nimrod commandline version of the todo cross
This directory contains the Nim commandline version of the todo cross
platform example.
The commandline interface can be used only through switches, running the binary
@@ -14,6 +14,6 @@ generation switch can be used to fill the database with some basic todo entries
you can play with.
Compilation is fairly easy despite having the source split in different
directories. Thanks to the nimrod.cfg file, which adds the ../nimrod_backend
directories. Thanks to the Nim.cfg file, which adds the ../Nim_backend
directory as a search path, you can compile and run the example just fine from
the command line with 'nimrod c -r nimtodo.nim'.
the command line with 'nim c -r nimtodo.nim'.

4
examples/cross_todo/readme.txt
View File

@@ -1,7 +1,7 @@
The cross platform todo illustrates how to use Nimrod to create a backend
The cross platform todo illustrates how to use Nim to create a backend
called by different native user interfaces.
This example builds on the knowledge learned from the cross_calculator example.
Check it out first to learn how to set up nimrod on different platforms.
Check it out first to learn how to set up Nim on different platforms.
Additional implementations are provided at the external
https://github.com/gradha/nimrod-crossplatform-todo github repository.

2
examples/curlex.nim
View File

@@ -4,7 +4,7 @@ import
var hCurl = easy_init()
if hCurl != nil:
discard easy_setopt(hCurl, OPT_VERBOSE, true)
discard easy_setopt(hCurl, OPT_URL, "http://force7.de/nimrod")
discard easy_setopt(hCurl, OPT_URL, "http://nim-lang.org/")
discard easy_perform(hCurl)
easy_cleanup(hCurl)

6
tests/manyloc/keineschweine/README.md
View File

@@ -4,7 +4,7 @@ Just a dumb little game
### Dependencies
* Nimrod 0.8.15, Until this version is released I'm working off Nimrod HEAD: https://github.com/Araq/Nimrod
* nim 0.8.15, Until this version is released I'm working off nim HEAD: https://github.com/Araq/nim
* SFML 2.0 (git), https://github.com/LaurentGomila/SFML
* CSFML 2.0 (git), https://github.com/LaurentGomila/CSFML
* Chipmunk 6.1.1 http://chipmunk-physics.net/downloads.php
@@ -13,7 +13,7 @@ Just a dumb little game
* `git clone --recursive git://github.com/fowlmouth/keineSchweine.git somedir`
* `cd somedir`
* `nimrod c -r nakefile test` or `nimrod c -r keineschweine && ./keineschweine`
* `nim c -r nakefile test` or `nim c -r keineschweine && ./keineschweine`
### Download the game data
@@ -22,5 +22,5 @@ http://dl.dropbox.com/u/37533467/data-08-01-2012.7z
Unpack it to the root directory. You can use the nakefile to do this easily:
* `nimrod c -r nakefile`
* `nim c -r nakefile`
* `./nakefile download`

4
web/nim.ini
View File

@@ -8,8 +8,8 @@ Authors: "Andreas Rumpf and contributors"
# Underscores are replaced with a space.
# Everything after ; is the ID
Community: "community.html;link_forum"
Aporia_IDE: "https://github.com/nimrod-code/Aporia;link_aporia"
Github_Repo: "http://github.com/Araq/Nimrod;link_github"
Aporia_IDE: "https://github.com/nim-code/Aporia;link_aporia"
Github_Repo: "http://github.com/Araq/Nim;link_github"
[Tabs]

6
web/question.txt
View File

@@ -104,11 +104,11 @@ General
What about editor support?
--------------------------
- Nim IDE: https://github.com/nimrod-code/Aporia
- Nim IDE: https://github.com/nim-code/Aporia
- Emacs: https://github.com/Tass/nimrod-mode
- Vim: https://github.com/zah/nimrod.vim/
- Scite: Included
- Gedit: The `Aporia .lang file <https://github.com/nimrod-code/Aporia/blob/master/share/gtksourceview-2.0/language-specs/nimrod.lang>`_
- Gedit: The `Aporia .lang file <https://github.com/nim-code/Aporia/blob/master/share/gtksourceview-2.0/language-specs/nimrod.lang>`_
- jEdit: https://github.com/exhu/nimrod-misc/tree/master/jedit
- TextMate: Available in bundle installer (`Repository <https://github.com/textmate/nim.tmbundle>`_)
@@ -146,7 +146,7 @@ Compilation
How do I use a different C compiler than the default one?
---------------------------------------------------------
Edit the ``config/nimrod.cfg`` file.
Edit the ``config/nim.cfg`` file.
Change the value of the ``cc`` variable to one of the following:
============== ============================================