From a8cc5d1379bbf3197e3e7a040cac2f7376a4949a Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Thu, 29 Sep 2022 04:37:26 +0800
Subject: [PATCH] Unicode Operators are no longer experimental (#20444)

* Unicode Operators are no longer experimental

* fixes tests

* Update doc/manual.md

Co-authored-by: Andreas Rumpf <rumpf_a@web.de>
---
 changelog.md               |  2 +-
 compiler/lexer.nim         | 10 +++++-----
 compiler/options.nim       |  4 ++--
 doc/manual.md              | 15 +++++++++++++++
 doc/manual_experimental.md | 21 ---------------------
 tests/lexer/nim.cfg        |  1 -
 6 files changed, 23 insertions(+), 30 deletions(-)
 delete mode 100644 tests/lexer/nim.cfg

diff --git a/changelog.md b/changelog.md
index 4e6cf30b08..07ea9264f6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -70,7 +70,7 @@
 - Removed two type pragma syntaxes deprecated since 0.20, namely
   `type Foo = object {.final.}`, and `type Foo {.final.} [T] = object`.
 
-- [Overloadable enums](https://nim-lang.github.io/Nim/manual.html#types-enumeration-types)
+- [Overloadable enums](https://nim-lang.github.io/Nim/manual.html#overloadable-enum-value-names) and Unicode Operators
   are no longer experimental.
 
 - Removed the `nimIncrSeqV3` define.
diff --git a/compiler/lexer.nim b/compiler/lexer.nim
index d17300395f..dabb1c8fb0 100644
--- a/compiler/lexer.nim
+++ b/compiler/lexer.nim
@@ -907,7 +907,7 @@ proc getSymbol(L: var Lexer, tok: var Token) =
       inc(pos)
       suspicious = true
     of '\x80'..'\xFF':
-      if c in UnicodeOperatorStartChars and unicodeOperators in L.config.features and unicodeOprLen(L.buf, pos)[0] != 0:
+      if c in UnicodeOperatorStartChars and unicodeOprLen(L.buf, pos)[0] != 0:
         break
       else:
         h = h !& ord(c)
@@ -943,7 +943,7 @@ proc getOperator(L: var Lexer, tok: var Token) =
     if c in OpChars:
       h = h !& ord(c)
       inc(pos)
-    elif c in UnicodeOperatorStartChars and unicodeOperators in L.config.features:
+    elif c in UnicodeOperatorStartChars:
       let oprLen = unicodeOprLen(L.buf, pos)[0]
       if oprLen == 0: break
       for i in 0..<oprLen:
@@ -1244,7 +1244,7 @@ proc rawGetTok*(L: var Lexer, tok: var Token) =
   else:
     case c
     of UnicodeOperatorStartChars:
-      if unicodeOperators in L.config.features and unicodeOprLen(L.buf, L.bufpos)[0] != 0:
+      if unicodeOprLen(L.buf, L.bufpos)[0] != 0:
         getOperator(L, tok)
       else:
         getSymbol(L, tok)
@@ -1355,7 +1355,7 @@ proc rawGetTok*(L: var Lexer, tok: var Token) =
       getNumber(L, tok)
       let c = L.buf[L.bufpos]
       if c in SymChars+{'_'}:
-        if c in UnicodeOperatorStartChars and unicodeOperators in L.config.features and
+        if c in UnicodeOperatorStartChars and
             unicodeOprLen(L.buf, L.bufpos)[0] != 0:
           discard
         else:
@@ -1370,7 +1370,7 @@ proc rawGetTok*(L: var Lexer, tok: var Token) =
         getNumber(L, tok)
         let c = L.buf[L.bufpos]
         if c in SymChars+{'_'}:
-          if c in UnicodeOperatorStartChars and unicodeOperators in L.config.features and
+          if c in UnicodeOperatorStartChars and
               unicodeOprLen(L.buf, L.bufpos)[0] != 0:
             discard
           else:
diff --git a/compiler/options.nim b/compiler/options.nim
index a0077b46b6..d52b1cdef4 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -213,9 +213,9 @@ type
     strictFuncs,
     views,
     strictNotNil,
-    overloadableEnums, # not experimental anymore
+    overloadableEnums, # deadcode
     strictEffects,
-    unicodeOperators,
+    unicodeOperators, # deadcode
     flexibleOptionalParams
 
   LegacyFeature* = enum
diff --git a/doc/manual.md b/doc/manual.md
index 93196f6198..305e7861fe 100644
--- a/doc/manual.md
+++ b/doc/manual.md
@@ -695,6 +695,21 @@ are used for other notational purposes.
 The `not` keyword is always a unary operator, `a not b` is parsed
 as `a(not b)`, not as `(a) not (b)`.
 
+Unicode Operators
+-----------------
+
+These Unicode operators are also parsed as operators::
+
+  ∙ ∘ × ★ ⊗ ⊘ ⊙ ⊛ ⊠ ⊡ ∩ ∧ ⊓   # same priority as * (multiplication)
+  ± ⊕ ⊖ ⊞ ⊟ ∪ ∨ ⊔             # same priority as + (addition)
+
+
+Unicode operators can be combined with non-Unicode operator
+symbols. The usual precedence extensions then apply, for example, `⊠=` is an
+assignment like operator just like `*=` is.
+
+No Unicode normalization step is performed.
+
 
 Other tokens
 ------------
diff --git a/doc/manual_experimental.md b/doc/manual_experimental.md
index 9dd44ab3bd..60461cb6d5 100644
--- a/doc/manual_experimental.md
+++ b/doc/manual_experimental.md
@@ -65,27 +65,6 @@ However, a `void` type cannot be inferred in generic code:
 The `void` type is only valid for parameters and return types; other symbols
 cannot have the type `void`.
 
-
-Unicode Operators
-=================
-
-Under the `--experimental:unicodeOperators`:option: switch,
-these Unicode operators are also parsed as operators::
-
-  ∙ ∘ × ★ ⊗ ⊘ ⊙ ⊛ ⊠ ⊡ ∩ ∧ ⊓   # same priority as * (multiplication)
-  ± ⊕ ⊖ ⊞ ⊟ ∪ ∨ ⊔             # same priority as + (addition)
-
-
-If enabled, Unicode operators can be combined with non-Unicode operator
-symbols. The usual precedence extensions then apply, for example, `⊠=` is an
-assignment like operator just like `*=` is.
-
-No Unicode normalization step is performed.
-
-.. note:: Due to parser limitations one **cannot** enable this feature via a
-  pragma `{.experimental: "unicodeOperators".}` reliably.
-
-
 Top-down type inference
 =======================
 
diff --git a/tests/lexer/nim.cfg b/tests/lexer/nim.cfg
deleted file mode 100644
index f7a301a10c..0000000000
--- a/tests/lexer/nim.cfg
+++ /dev/null
@@ -1 +0,0 @@
---experimental:unicodeOperators