Implement Unsigned Right Shift and bitwise operations

GreemDev · GreemDev · commit fcad8fc0fb5b · 2025-09-11T02:04:10.000-05:00
bitwise xor uses ^ now, use ^^ for exponents in math
diff --git a/src/Lib/Internal/Instruction.cs b/src/Lib/Internal/Instruction.cs
@@ -14,6 +14,14 @@ public enum Instruction : byte
     Modulo,
     Power,
 
+    BitwiseAnd,
+    BitwiseOr,
+    BitwiseXor,
+    BitwiseNot,
+    LeftShift,
+    RightShift,
+    UnsignedRightShift,
+
     AddConstant,
 
     Pop,
@@ -26,8 +34,6 @@ public enum Instruction : byte
     GreaterEqual,
     Less,
     LessEqual,
-    LeftShift, 
-    RightShift,
 
     Variable,
     Get,
diff --git a/src/Lib/Internal/Lexer.cs b/src/Lib/Internal/Lexer.cs
@@ -1,4 +1,5 @@
-﻿using System.Runtime.CompilerServices;
+﻿using System.Collections.Immutable;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Starscript.Util;
 
@@ -72,19 +73,21 @@ public void Next() {
                     case '!':  CreateToken(Match('=') ? Token.BangEqual : Token.Bang); break;
                     case '>':  
                         CreateToken(
-                            Match('=') 
-                                ? Token.GreaterEqual 
-                                : Match('>') 
-                                    ? Token.RightShift 
+                            Match('=')
+                                ? Token.GreaterEqual
+                                : Match('>')
+                                    ? Match('>')
+                                        ? Token.TripleGreater
+                                        : Token.DoubleGreater
                                     : Token.Greater
                             ); 
                         break;
                     case '<':
                         CreateToken(
-                            Match('=') 
-                                ? Token.LessEqual 
-                                : Match('<') 
-                                    ? Token.LeftShift 
+                            Match('=')
+                                ? Token.LessEqual
+                                : Match('<')
+                                    ? Token.DoubleLess
                                     : Token.Less
                             ); 
                         break;
@@ -94,7 +97,12 @@ public void Next() {
                     case '*':  CreateToken(Token.Star); break;
                     case '/':  CreateToken(Token.Slash); break;
                     case '%':  CreateToken(Token.Percentage); break;
-                    case '^':  CreateToken(Token.UpArrow); break;
+                    case '^':  CreateToken(
+                        Match('^')
+                            ? Token.DoubleUpArrow
+                            : Token.UpArrow
+                        );
+                        break;
 
                     case '.':  CreateToken(Token.Dot); break;
                     case ',':  CreateToken(Token.Comma); break;
@@ -110,6 +118,10 @@ public void Next() {
                         CreateToken(Token.Section, Source[(Start + 1)..Current]);
                         break;
 
+                    case '&': CreateToken(Token.Ampersand); break;
+                    case '|': CreateToken(Token.VBar); break;
+                    case '~': CreateToken(Token.Tilde); break;
+
                     default:   Unexpected(); break;
                 }
             }
@@ -182,17 +194,25 @@ private void Number() {
         CreateToken(Token.Number);
     }
 
+    public static readonly ImmutableArray<string> Keywords = [NullKeyword, TrueKeyword, FalseKeyword, AndKeyword, OrKeyword];
+
+    private const string NullKeyword = "null";
+    private const string TrueKeyword = "true";
+    private const string FalseKeyword = "false";
+    private const string AndKeyword = "and";
+    private const string OrKeyword = "or";
+
     private void Identifier() {
         while (!IsAtEnd && IsAlphanumeric(Peek())) Advance();
 
         CreateToken(Token.Identifier);
 
         switch (Lexeme) {
-            case "null":  Token = Token.Null; break;
-            case "true":  Token = Token.True; break;
-            case "false": Token = Token.False; break;
-            case "and":   Token = Token.And; break;
-            case "or":    Token = Token.Or; break;
+            case NullKeyword:  Token = Token.Null; break;
+            case TrueKeyword:  Token = Token.True; break;
+            case FalseKeyword: Token = Token.False; break;
+            case AndKeyword:   Token = Token.And; break;
+            case OrKeyword:    Token = Token.Or; break;
         }
     }
 
diff --git a/src/Lib/Internal/Token.cs b/src/Lib/Internal/Token.cs
@@ -13,16 +13,20 @@ public enum Token : byte
     Less, LessEqual,
 
     Plus, Minus,
-    Star, Slash, Percentage, UpArrow,
+    Star, Slash, Percentage, UpArrow, DoubleUpArrow,
     Bang,
 
     Dot, Comma,
     QuestionMark, Colon,
     LeftParen, RightParen,
     LeftBrace, RightBrace,
-    LeftShift, RightShift,
 
     Section,
+    Ampersand,
+    Tilde,
+    VBar,
+    DoubleGreater, TripleGreater,
+    DoubleLess,
 
     Error, EOF
 }
diff --git a/src/Lib/Public/Compiler/Compiler.Visitors.cs b/src/Lib/Public/Compiler/Compiler.Visitors.cs
@@ -112,16 +112,21 @@ public void Visit(Expr.Binary expr)
             case Token.Star: _output.Write(Multiply); break;
             case Token.Slash: _output.Write(Divide); break;
             case Token.Percentage: _output.Write(Modulo); break;
-            case Token.UpArrow: _output.Write(Power); break;
+            case Token.DoubleUpArrow: _output.Write(Power); break;
 
             case Token.EqualEqual: _output.Write(Instruction.Equals); break;
             case Token.BangEqual: _output.Write(NotEquals); break;
             case Token.Greater: _output.Write(Greater); break;
             case Token.GreaterEqual: _output.Write(GreaterEqual); break;
             case Token.Less: _output.Write(Less); break;
             case Token.LessEqual: _output.Write(LessEqual); break;
-            case Token.LeftShift: _output.Write(LeftShift); break;
-            case Token.RightShift: _output.Write(RightShift); break;
+            
+            case Token.Ampersand: _output.Write(BitwiseAnd); break;
+            case Token.VBar: _output.Write(BitwiseOr); break;
+            case Token.UpArrow: _output.Write(BitwiseXor); break;
+            case Token.DoubleLess: _output.Write(LeftShift); break;
+            case Token.DoubleGreater: _output.Write(RightShift); break;
+            case Token.TripleGreater: _output.Write(UnsignedRightShift); break;
         }
 
 #if DEBUG
@@ -140,6 +145,9 @@ public void Visit(Expr.Unary expr)
             case Token.Minus:
                 _output.Write(Negate);
                 break;
+            case Token.Tilde:
+                _output.Write(BitwiseNot);
+                break;
         }
 
 #if DEBUG
diff --git a/src/Lib/Public/Entities/SemanticTokenProvider.cs b/src/Lib/Public/Entities/SemanticTokenProvider.cs
@@ -26,8 +26,12 @@ public static void Provide(string source, List<SemanticToken> tokens)
                 case Token.GreaterEqual:
                 case Token.Less:
                 case Token.LessEqual:
-                case Token.LeftShift: 
-                case Token.RightShift:
+                case Token.DoubleLess: 
+                case Token.DoubleGreater:
+                case Token.TripleGreater:
+                case Token.Ampersand:
+                case Token.VBar:
+                case Token.DoubleUpArrow:
                 case Token.Plus:
                 case Token.Minus:
                 case Token.Star:
diff --git a/src/Lib/Public/Hypervisor/Abstraction/AbstractHypervisor.Insn.cs b/src/Lib/Public/Hypervisor/Abstraction/AbstractHypervisor.Insn.cs
@@ -23,8 +23,15 @@ public partial class AbstractHypervisor<TSelf>
     protected abstract void Divide();
     protected abstract void Modulo();
     protected abstract void Power();
-    protected abstract void RightShift();
     protected abstract void LeftShift();
+    protected abstract void RightShift();
+    protected abstract void UnsignedRightShift();
+
+    protected abstract void BitwiseAnd();
+    protected abstract void BitwiseOr();
+    protected abstract void BitwiseXor();
+    protected abstract void BitwiseNot();
+
 
     protected abstract void Section(
         ref StringBuilder sb,
diff --git a/src/Lib/Public/Hypervisor/Abstraction/AbstractHypervisor.Runner.cs b/src/Lib/Public/Hypervisor/Abstraction/AbstractHypervisor.Runner.cs
@@ -52,7 +52,14 @@ protected virtual StringSegment RunInternal(ExecutableScript script, StringBuild
                 case Instruction.Modulo: Modulo(); break;
                 case Instruction.Power: Power(); break;
                 case Instruction.Negate: Negate(); break;
+
+                // Bit shenanigans
+                case Instruction.BitwiseNot: BitwiseNot(); break;
+                case Instruction.BitwiseAnd: BitwiseAnd(); break;
+                case Instruction.BitwiseOr: BitwiseOr(); break;
+                case Instruction.BitwiseXor: BitwiseXor(); break;
                 case Instruction.RightShift: RightShift(); break;
+                case Instruction.UnsignedRightShift: UnsignedRightShift(); break;
                 case Instruction.LeftShift: LeftShift(); break;
 
                 // Comparison
diff --git a/src/Lib/Public/Hypervisor/InsnImpl/Arithmetic.cs b/src/Lib/Public/Hypervisor/InsnImpl/Arithmetic.cs
@@ -86,6 +86,56 @@ protected override void RightShift()
             throw Error(">> operation requires 2 numbers.");
     }
 
+    protected override void UnsignedRightShift()
+    {
+        var (a, b) = PopPair();
+
+        if (a.IsNumber && b.IsNumber)
+            Push(Convert.ToInt32(a.GetNumber()) >>> Convert.ToInt32(double.Truncate(b.GetNumber())));
+        else
+            throw Error(">> operation requires 2 numbers.");
+    }
+
+    protected override void BitwiseAnd()
+    {
+        var (a, b) = PopPair();
+
+        if (a.IsNumber && b.IsNumber)
+            Push(Convert.ToInt32(Math.Floor(a.GetNumber())) & Convert.ToInt32(Math.Floor(b.GetNumber())));
+        else
+            throw Error("& operation requires 2 numbers.");
+    }
+
+    protected override void BitwiseOr()
+    {
+        var (a, b) = PopPair();
+
+        if (a.IsNumber && b.IsNumber)
+            Push(Convert.ToInt32(Math.Floor(a.GetNumber())) | Convert.ToInt32(Math.Floor(b.GetNumber())));
+        else
+            throw Error("| operation requires 2 numbers.");
+    }
+
+    protected override void BitwiseXor()
+    {
+        var (a, b) = PopPair();
+
+        if (a.IsNumber && b.IsNumber)
+            Push(Convert.ToInt32(Math.Floor(a.GetNumber())) ^ Convert.ToInt32(Math.Floor(b.GetNumber())));
+        else
+            throw Error("^ operation requires 2 numbers.");
+    }
+
+    protected override void BitwiseNot()
+    {
+        var a = Pop();
+
+        if (a.IsNumber)
+            Push(~Convert.ToInt32(Math.Floor(a.GetNumber())));
+        else
+            throw Error("~ unary operation requires a number.");
+    }
+
     protected override void LeftShift()
     {
         var (a, b) = PopPair();
diff --git a/src/Lib/Public/Parser/Parser.Tokenization.cs b/src/Lib/Public/Parser/Parser.Tokenization.cs
@@ -162,11 +162,32 @@ private Expr Term()
     }
 
     private Expr Factor()
+    {
+        int start = _previous.Start;
+        Expr expr = Bitwise();
+
+        while (MatchAnyNext(Token.Star, Token.Slash, Token.Percentage, Token.DoubleUpArrow))
+        {
+            Token op = _previous.Token;
+            Expr right = Bitwise();
+
+#if DEBUG
+            DebugLog(
+                $"Expr {nameof(Expr.Binary)} created: Start {start}, End {_previous.End}, LeftType {expr.ExprName} Operator {Enum.GetName(op)}, RightType {right.ExprName}");
+#endif
+
+            expr = new Expr.Binary(start, _previous.End, expr, op, right);
+        }
+
+        return expr;
+    }
+    
+    private Expr Bitwise()
     {
         int start = _previous.Start;
         Expr expr = Unary();
 
-        while (MatchAnyNext(Token.Star, Token.Slash, Token.Percentage, Token.UpArrow, Token.LeftShift, Token.RightShift))
+        while (MatchAnyNext(Token.Ampersand, Token.VBar, Token.UpArrow, Token.DoubleLess, Token.DoubleGreater, Token.TripleGreater))
         {
             Token op = _previous.Token;
             Expr right = Unary();
@@ -184,7 +205,7 @@ private Expr Factor()
 
     private Expr Unary()
     {
-        if (MatchAnyNext(Token.Bang, Token.Minus))
+        if (MatchAnyNext(Token.Bang, Token.Minus, Token.Tilde))
         {
             int start = _previous.Start;
 
diff --git a/src/Lib/Public/Values/ValueMap.cs b/src/Lib/Public/Values/ValueMap.cs
@@ -6,8 +6,6 @@ namespace Starscript;
 
 public class ValueMap : IReadOnlyDictionary<string, Func<Value>>
 {
-    public static readonly ImmutableArray<string> Keywords = ["null", "true", "false", "and", "or"];
-    
     private readonly Dictionary<string, Func<Value>> _entries;
 
     /// <summary>
@@ -25,12 +23,12 @@ public ValueMap(Dictionary<string, Func<Value>>? entries = null)
     /// </summary>
     public ValueMap SetRaw(string name, Func<Value> value)
     {
-        if (Keywords.Contains(name))
+        if (Internal.Lexer.Keywords.Contains(name))
             throw new StarscriptException($"The name of a variable cannot be a keyword. " +
                                           $"Disallowed words: [{
-                                              string.Join(", ", Keywords.Select(x => $"\"{x}\""))
+                                              string.Join(", ", Internal.Lexer.Keywords.Select(x => $"\"{x}\""))
                                           }]");
-        
+
         _entries[name] = value;
         return this;
     }
diff --git a/src/TestProgram/Program.cs b/src/TestProgram/Program.cs
@@ -23,7 +23,7 @@ internal static void Main()
             "TestProgram can only be run in debug as it relies on debug-only logging instrumentation in Starscript.");
 #else
 
-        string source = "Name: {name}     Age: {age() >> 2}";
+        string source = "Name: {name}     Age: {age() ^ 2}";
 
         DebugLogger.AllOutput = true;
 
