From 8bdb98539570fdf3c41ee5509d5b90913ac1803e Mon Sep 17 00:00:00 2001
From: flywind <xzsflywind@gmail.com>
Date: Sat, 25 Sep 2021 19:22:00 +0800
Subject: [PATCH] fix wrong name (rnimsyn => renderer; pnimsyn => parser;
 scanner => lexer) (#18895)

* fix wrong module name

* rephrase more word
---
 compiler/filter_tmpl.nim | 2 +-
 compiler/lexer.nim       | 4 ++--
 compiler/nimconf.nim     | 2 +-
 compiler/renderer.nim    | 4 ++--
 doc/manual.rst           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/filter_tmpl.nim b/compiler/filter_tmpl.nim
index 6165ff2f32..84ed991645 100644
--- a/compiler/filter_tmpl.nim
+++ b/compiler/filter_tmpl.nim
@@ -22,7 +22,7 @@ type
     info: TLineInfo
     indent, emitPar: int
     x: string                # the current input line
-    outp: PLLStream          # the output will be parsed by pnimsyn
+    outp: PLLStream          # the output will be parsed by parser
     subsChar, nimDirective: char
     emit, conc, toStr: string
     curly, bracket, par: int
diff --git a/compiler/lexer.nim b/compiler/lexer.nim
index ede16fdf10..506b0e9242 100644
--- a/compiler/lexer.nim
+++ b/compiler/lexer.nim
@@ -7,12 +7,12 @@
 #    distribution, for details about the copyright.
 #
 
-# This scanner is handwritten for efficiency. I used an elegant buffering
+# This lexer is handwritten for efficiency. I used an elegant buffering
 # scheme which I have not seen anywhere else:
 # We guarantee that a whole line is in the buffer. Thus only when scanning
 # the \n or \r character we have to check whether we need to read in the next
 # chunk. (\n or \r already need special handling for incrementing the line
-# counter; choosing both \n and \r allows the scanner to properly read Unix,
+# counter; choosing both \n and \r allows the lexer to properly read Unix,
 # DOS or Macintosh text files, even when it is not the native format.
 
 import
diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim
index 94c93a2838..1cf22e20a9 100644
--- a/compiler/nimconf.nim
+++ b/compiler/nimconf.nim
@@ -14,7 +14,7 @@ import
   options, idents, wordrecg, strtabs, lineinfos, pathutils, scriptconfig
 
 # ---------------- configuration file parser -----------------------------
-# we use Nim's scanner here to save space and work
+# we use Nim's lexer here to save space and work
 
 proc ppGetTok(L: var Lexer, tok: var Token) =
   # simple filter
diff --git a/compiler/renderer.nim b/compiler/renderer.nim
index 393f35289c..22a2d4cbdb 100644
--- a/compiler/renderer.nim
+++ b/compiler/renderer.nim
@@ -410,7 +410,7 @@ proc atom(g: TSrcGen; n: PNode): string =
     if (n.typ != nil) and (n.typ.sym != nil): result = n.typ.sym.name.s
     else: result = "[type node]"
   else:
-    internalError(g.config, "rnimsyn.atom " & $n.kind)
+    internalError(g.config, "renderer.atom " & $n.kind)
     result = ""
 
 proc lcomma(g: TSrcGen; n: PNode, start: int = 0, theEnd: int = - 1): int =
@@ -1699,7 +1699,7 @@ proc gsub(g: var TSrcGen, n: PNode, c: TContext, fromStmtList = false) =
     gsub(g, n[0], c)
   else:
     #nkNone, nkExplicitTypeListCall:
-    internalError(g.config, n.info, "rnimsyn.gsub(" & $n.kind & ')')
+    internalError(g.config, n.info, "renderer.gsub(" & $n.kind & ')')
 
 proc renderTree*(n: PNode, renderFlags: TRenderFlags = {}): string =
   if n == nil: return "<nil tree>"
diff --git a/doc/manual.rst b/doc/manual.rst
index 09826441c2..dfcf0ba54f 100644
--- a/doc/manual.rst
+++ b/doc/manual.rst
@@ -216,7 +216,7 @@ comment:
 
 .. code-block:: nim
   i = 0     # This is a single comment over multiple lines.
-    # The scanner merges these two pieces.
+    # The lexer merges these two pieces.
     # The comment continues here.