Added min/max operators a <? b which lower to a < b ? a : b, whic…

…h matches the C++ language extension.
dlang · Dec 30, 2024 · d8d5837 · d8d5837
1 parent da1b69a
commit d8d5837
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/compiler/src/dmd/lexer.d b/compiler/src/dmd/lexer.d
@@ -1148,6 +1148,11 @@ class Lexer
                     else
                         t.value = TOK.leftShift; // <<
                 }
+                else if (*p == '?')
+                {
+                    ++p;
+                    t.value = TOK.ltQuestion;   // <?
+                }
                 else if (*p == ':' && Ccompile)
                 {
                     ++p;
@@ -1187,6 +1192,11 @@ class Lexer
                         else
                             t.value = TOK.unsignedRightShift; // >>>
                     }
+                    else if (*p == '?')
+                    {
+                        p++;
+                        t.value = TOK.gtQuestion; // >?
+                    }
                     else
                         t.value = TOK.rightShift; // >>
                 }

diff --git a/compiler/src/dmd/parse.d b/compiler/src/dmd/parse.d
@@ -9156,6 +9156,14 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                 e = new AST.CatExp(loc, e, e2);
                 continue;
 
+            case TOK.ltQuestion:
+            case TOK.gtQuestion:
+                EXP op = token.value == TOK.ltQuestion ? EXP.lessThan : EXP.greaterThan;
+                nextToken();
+                auto e2 = parseMulExp();
+                e = new AST.CondExp(loc, new AST.CmpExp(op, loc, e, e2), e, e2);
+                continue;
+
             default:
                 break;
             }

diff --git a/compiler/src/dmd/tokens.d b/compiler/src/dmd/tokens.d
@@ -70,6 +70,8 @@ enum TOK : ubyte
     identity,
     notIdentity,
     is_,
+    ltQuestion,
+    gtQuestion,
 
     leftShift,
     rightShift,
@@ -846,6 +848,8 @@ extern (C++) struct Token
         TOK.pound: "#",
         TOK.arrow: "->",
         TOK.colonColon: "::",
+        TOK.ltQuestion: "<?",
+        TOK.gtQuestion: ">?",
 
         // For debugging
         TOK.error: "error",