Add ternary operator, no matter what @cetio thinks

fern-pl · May 22, 2024 · ae2f61e · ae2f61e
1 parent 2f94002
commit ae2f61e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/source/fnc/treegen/ast_types.d b/source/fnc/treegen/ast_types.d
@@ -125,6 +125,7 @@ enum OperationVariety {
     Period, // foo.bar
     Arrow, // foo->bar
     Range, // x..y OR 0..99
+    TernaryOperator, // 1 if true else false
     Voidable, // int?
 
 
@@ -297,7 +298,10 @@ class AstNode {
                 break;
 
             case AstAction.Call:
-                writeln("Calling function resolved from:");
+                writeln("Call:");
+                tabCount++;
+                printTabs();
+                writeln("Function resolved from:");
                 callNodeData.func.tree(tabCount + 1);
                 printTabs();
                 write("With Params (");
@@ -314,8 +318,6 @@ class AstNode {
                         arg.value.tree(tabCount + 1);
 
                 }
-
-                // callNodeData.args.tree(tabCount + 1);
                 break;
             case AstAction.ConversionPipe:
                 writeln("Conversion Pipe: ");

diff --git a/source/fnc/treegen/expression_parser.d b/source/fnc/treegen/expression_parser.d
@@ -11,6 +11,7 @@ import std.container.array;
 
 // Group letters.letters.letters into NamedUnit s
 // Group Parenthesis and indexing into AstNode.Expression s to be parsed speratly
+// This should not be used by the end user, and is only exposed for unittests
 public AstNode[] phaseOne(Token[] tokens) {
     AstNode[] ret;
     AstNode[] parenthesisStack;

diff --git a/source/fnc/treegen/relationships.d b/source/fnc/treegen/relationships.d
@@ -815,6 +815,14 @@ const OperatorPrecedenceLayer[] operatorPrecedence = [
                     Token(TokenType.Filler), OPR('~'), Token(TokenType.Filler)
                 ]),
         ]),
+    OperatorPrecedenceLayer(OperatorOrder.RightToLeft, [
+        OperationPrecedenceEntry(OperationVariety.TernaryOperator, [
+                Token(TokenType.Filler), Token(TokenType.Letter, "if".makeUnicodeString),
+                Token(TokenType.Filler), Token(TokenType.Letter, "else".makeUnicodeString),
+                Token(TokenType.Filler)
+            ]),
+
+    ]),
     OperatorPrecedenceLayer(OperatorOrder.RightToLeft, [
             OperationPrecedenceEntry(OperationVariety.Assignment, [
                     Token(TokenType.Filler), OPR('='), Token(TokenType.Filler)
@@ -909,6 +917,14 @@ bool testAndJoin(const(OperationPrecedenceEntry) entry, ref Array!AstNode nodes,
                     return false;
                 potentialArrayStyleAssignmentData = node.arrayEqNodeData;
                 break;
+            case TokenType.Letter:
+                if (node.action != AstAction.NamedUnit)
+                    return false;
+                if (node.namedUnit.names.length != 1) // We don't support operators with . in it
+                    return false;
+                if (node.namedUnit.names[0] != entry.tokens[index].value)
+                    return false;
+                break;
             case TokenType.QuestionMark:
             case TokenType.ExclamationMark:
             case TokenType.Equals:

diff --git a/source/tests/expression_parser.d b/source/tests/expression_parser.d
@@ -46,4 +46,11 @@ unittest {
     auto toks = "int 2 = 2 + 5".tokenizeText;
     assert(2 == toks.prematureSingleTokenGroupLength(0));
     assert(8 == toks.prematureSingleTokenGroupLength(2));
+}
+
+unittest {
+    Array!AstNode nodes = expressionNodeFromTokens("t = 5 + 5 if foo() else 1 + 4".tokenizeText);
+    assert(nodes.length == 1);
+    // assert(nodes[0].);
+    nodes[0].tree;
 }
diff --git a/source/tests/tokenizer.d b/source/tests/tokenizer.d
@@ -92,10 +92,17 @@ unittest {
     assert(toks[0].base == SpecialNumberBase.Binary);
     assert(toks[0].value == "0b10101010".makeUnicodeString);
 
+    toks = "0o1010_1010".tokenizeText;
+    assert(toks.length == 1);
+    assert(toks[0].tokenVariety == TokenType.Number);
+    assert(toks[0].base == SpecialNumberBase.Octal);
+    assert(toks[0].value == "0o10101010".makeUnicodeString);
+
 
     toks = "0b1010_1010 + 1".tokenizeText;
     assert(toks.length == 5);
     assert(toks[0].tokenVariety == TokenType.Number);
     assert(toks[0].base == SpecialNumberBase.Binary);
     assert(toks[0].value == "0b10101010".makeUnicodeString);
+
 }