Merge pull request #3831 from ephja/nimrod-to-nim

nimrod -> nim

6 files changed, 9 insertions, 9 deletions

diff --git a/compiler/astalgo.nim b/compiler/astalgo.nim
index 3ba43b4c5..1a70875d4 100644
--- a/compiler/astalgo.nim
+++ b/compiler/astalgo.nim
@@ -137,7 +137,7 @@ proc sameValue*(a, b: PNode): bool =
   of nkStrLit..nkTripleStrLit:
     if b.kind in {nkStrLit..nkTripleStrLit}: result = a.strVal == b.strVal
   else:
-    # don't raise an internal error for 'nimrod check':
+    # don't raise an internal error for 'nim check':
     #InternalError(a.info, "SameValue")
     discard
 
@@ -152,7 +152,7 @@ proc leValue*(a, b: PNode): bool =
   of nkStrLit..nkTripleStrLit:
     if b.kind in {nkStrLit..nkTripleStrLit}: result = a.strVal <= b.strVal
   else:
-    # don't raise an internal error for 'nimrod check':
+    # don't raise an internal error for 'nim check':
     #InternalError(a.info, "leValue")
     discard
 
diff --git a/compiler/ccgthreadvars.nim b/compiler/ccgthreadvars.nim
index d741c47a9..ab771d240 100644
--- a/compiler/ccgthreadvars.nim
+++ b/compiler/ccgthreadvars.nim
@@ -24,7 +24,7 @@ proc accessThreadLocalVar(p: BProc, s: PSym) =
       ropecg(p.module, "\tNimTV = (NimThreadVars*) #GetThreadLocalVars();$n"))
 
 var
-  nimtv: Rope                 # nimrod thread vars; the struct body
+  nimtv: Rope                 # Nim thread vars; the struct body
   nimtvDeps: seq[PType] = @[]  # type deps: every module needs whole struct
   nimtvDeclared = initIntSet() # so that every var/field exists only once
                                # in the struct
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index 1ed9ce113..39f16ff0d 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -47,7 +47,7 @@ proc mangleName(s: PSym): Rope =
       # I need to study where these come from.
       #
       # about sfShadowed:
-      # consider the following nimrod code:
+      # consider the following Nim code:
       #   var x = 10
       #   block:
       #     var x = something(x)
@@ -64,7 +64,7 @@ proc mangleName(s: PSym): Rope =
       # use that in the inner scope.
       #
       # about isCKeyword:
-      # nimrod variable names can be C keywords.
+      # Nim variable names can be C keywords.
       # We need to avoid such names in the generated code.
       # XXX: Study whether mangleName is called just once per variable.
       # Otherwise, there might be better place to do this.
diff --git a/compiler/idgen.nim b/compiler/idgen.nim
index c07782fb2..906c16546 100644
--- a/compiler/idgen.nim
+++ b/compiler/idgen.nim
@@ -44,7 +44,7 @@ proc toGid(f: string): string =
   # we used to use ``f.addFileExt("gid")`` (aka ``$project.gid``), but this
   # will cause strange bugs if multiple projects are in the same folder, so
   # we simply use a project independent name:
-  result = options.completeGeneratedFilePath("nimrod.gid")
+  result = options.completeGeneratedFilePath("nim.gid")
 
 proc saveMaxIds*(project: string) =
   var f = open(project.toGid, fmWrite)
diff --git a/compiler/options.nim b/compiler/options.nim
index 9b587fcdb..c9e5e5b76 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -147,8 +147,8 @@ var
   gDllOverrides = newStringTable(modeCaseInsensitive)
   gPrefixDir* = "" # Overrides the default prefix dir in getPrefixDir proc.
   libpath* = ""
-  gProjectName* = "" # holds a name like 'nimrod'
-  gProjectPath* = "" # holds a path like /home/alice/projects/nimrod/compiler/
+  gProjectName* = "" # holds a name like 'nim'
+  gProjectPath* = "" # holds a path like /home/alice/projects/nim/compiler/
   gProjectFull* = "" # projectPath/projectName
   gProjectIsStdin* = false # whether we're compiling from stdin
   gProjectMainIdx*: int32 # the canonical path id of the main module
diff --git a/compiler/platform.nim b/compiler/platform.nim
index 8376c2b32..dc414bfeb 100644
--- a/compiler/platform.nim
+++ b/compiler/platform.nim
@@ -10,7 +10,7 @@
 # This module contains data about the different processors
 # and operating systems.
 # Note: Unfortunately if an OS or CPU is listed here this does not mean that
-# Nimrod has been tested on this platform or that the RTL has been ported.
+# Nim has been tested on this platform or that the RTL has been ported.
 # Feel free to test for your excentric platform!
 
 import