[commands] Refactor quoted_word free function to a StringView method.

Technically a breaking change, however this interface was not
documented or guaranteed to exist.

discord/ext/commands/core.py

@@ -33,7 +33,6 @@ import discord
 
 from .errors import *
 from .cooldowns import Cooldown, BucketType, CooldownMapping
-from .view import quoted_word
 from . import converter as converters
 from ._types import _BaseCommand
 from .cog import Cog
@@ -421,7 +420,7 @@ class Command(_BaseCommand):
         if consume_rest_is_special:
             argument = view.read_rest().strip()
         else:
-            argument = quoted_word(view)
+            argument = view.get_quoted_word()
         view.previous = previous
 
         return await self.do_conversion(ctx, converter, argument, param)
@@ -434,7 +433,7 @@ class Command(_BaseCommand):
             previous = view.index
 
             view.skip_ws()
-            argument = quoted_word(view)
+            argument = view.get_quoted_word()
             try:
                 value = await self.do_conversion(ctx, converter, argument, param)
             except CommandError:
@@ -450,7 +449,7 @@ class Command(_BaseCommand):
     async def _transform_greedy_var_pos(self, ctx, param, converter):
         view = ctx.view
         previous = view.index
-        argument = quoted_word(view)
+        argument = view.get_quoted_word()
         try:
             value = await self.do_conversion(ctx, converter, argument, param)
         except CommandError:

discord/ext/commands/view.py

@@ -26,6 +26,28 @@ DEALINGS IN THE SOFTWARE.
 
 from .errors import UnexpectedQuoteError, InvalidEndOfQuotedStringError, ExpectedClosingQuoteError
 
+# map from opening quotes to closing quotes
+_quotes = {
+    '"': '"',
+    "‘": "’",
+    "‚": "‛",
+    "“": "”",
+    "„": "‟",
+    "⹂": "⹂",
+    "「": "」",
+    "『": "』",
+    "〝": "〞",
+    "﹁": "﹂",
+    "﹃": "﹄",
+    "＂": "＂",
+    "｢": "｣",
+    "«": "»",
+    "‹": "›",
+    "《": "》",
+    "〈": "〉",
+}
+_all_quotes = set(_quotes.keys()) | set(_quotes.values())
+
 class StringView:
     def __init__(self, buffer):
         self.index = 0
@@ -104,36 +126,8 @@ class StringView:
         self.index += pos
         return result
 
-    def __repr__(self):
-        return '<StringView pos: {0.index} prev: {0.previous} end: {0.end} eof: {0.eof}>'.format(self)
-
-# Parser
-
-# map from opening quotes to closing quotes
-_quotes = {
-    '"': '"',
-    "‘": "’",
-    "‚": "‛",
-    "“": "”",
-    "„": "‟",
-    "⹂": "⹂",
-    "「": "」",
-    "『": "』",
-    "〝": "〞",
-    "﹁": "﹂",
-    "﹃": "﹄",
-    "＂": "＂",
-    "｢": "｣",
-    "«": "»",
-    "‹": "›",
-    "《": "》",
-    "〈": "〉",
-}
-_all_quotes = set(_quotes.keys()) | set(_quotes.values())
-
-def quoted_word(view):
-    current = view.current
-
+    def get_quoted_word(self):
+        current = self.current
         if current is None:
             return None
 
@@ -146,8 +140,8 @@ def quoted_word(view):
             result = [current]
             _escaped_quotes = _all_quotes
 
-    while not view.eof:
-        current = view.get()
+        while not self.eof:
+            current = self.get()
             if not current:
                 if is_quoted:
                     # unexpected EOF
@@ -157,7 +151,7 @@ def quoted_word(view):
             # currently we accept strings in the format of "hello world"
             # to embed a quote inside the string you must escape it: "a \"world\""
             if current == '\\':
-            next_char = view.get()
+                next_char = self.get()
                 if not next_char:
                     # string ends with \ and no character after it
                     if is_quoted:
@@ -171,7 +165,7 @@ def quoted_word(view):
                     result.append(next_char)
                 else:
                     # different escape character, ignore it
-                view.undo()
+                    self.undo()
                     result.append(current)
                 continue
 
@@ -181,7 +175,7 @@ def quoted_word(view):
 
             # closing quote
             if is_quoted and current == close_quote:
-            next_char = view.get()
+                next_char = self.get()
                 valid_eof = not next_char or next_char.isspace()
                 if not valid_eof:
                     raise InvalidEndOfQuotedStringError(next_char)
@@ -194,3 +188,7 @@ def quoted_word(view):
                 return ''.join(result)
 
             result.append(current)
+
+
+    def __repr__(self):
+        return '<StringView pos: {0.index} prev: {0.previous} end: {0.end} eof: {0.eof}>'.format(self)