optimize binary op overload infer

CppCXY · May 20, 2024 · 9d4e74b · 9d4e74b
1 parent dcc55d7
commit 9d4e74b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 31 deletions.
diff --git a/EmmyLua/CodeAnalysis/Compilation/Index/Storage.cs b/EmmyLua/CodeAnalysis/Compilation/Index/Storage.cs
@@ -142,7 +142,7 @@ public void Remove(LuaDocumentId documentId)
     {
         return _storage.TryGetValue(key, out var entry)
             ? entry.Files.Values.SelectMany(it => it)
-            : Enumerable.Empty<(TSyntaxElement, TElement)>();
+            : [];
     }
 }
 
@@ -187,11 +187,6 @@ private void RemoveOperator(LuaDocumentId documentId)
 
     public IEnumerable<TypeOperator> GetTypeOperators(string typeName)
     {
-        if (TypeOperators.TryGetValue(typeName, out var entry))
-        {
-            return entry.Files.Values.SelectMany(it => it);
-        }
-
-        return Enumerable.Empty<TypeOperator>();
+        return TypeOperators.TryGetValue(typeName, out var entry) ? entry.Files.Values.SelectMany(it => it) : [];
     }
 }
diff --git a/EmmyLua/CodeAnalysis/Compilation/Infer/ExpressionInfer.cs b/EmmyLua/CodeAnalysis/Compilation/Infer/ExpressionInfer.cs
@@ -101,7 +101,18 @@ private static LuaType GuessBinaryMathType(LuaBinaryExprSyntax binaryExpr, Opera
         {
             return bop.Ret;
         }
-        return leftTy;
+        var bop2 = context.GetBestMatchedBinaryOperator(opKind, rightTy, leftTy);
+        if (bop2 is not null)
+        {
+            return bop2.Ret;
+        }
+
+        if (leftTy.Equals(Builtin.Integer) && rightTy.Equals(Builtin.Integer))
+        {
+            return Builtin.Integer;
+        }
+
+        return Builtin.Number;
     }
 
     private static LuaType InferClosureExpr(LuaClosureExprSyntax closureExpr, SearchContext context)

diff --git a/EmmyLua/CodeAnalysis/Document/LuaDocument.cs b/EmmyLua/CodeAnalysis/Document/LuaDocument.cs
@@ -2,33 +2,11 @@
 
 namespace EmmyLua.CodeAnalysis.Document;
 
-public readonly struct LuaDocumentId(int id)
+public readonly record struct LuaDocumentId(int Id)
 {
     public static LuaDocumentId VirtualDocumentId { get; } = new(0);
 
-    public int Id { get; } = id;
-
     public bool IsVirtual => Id == 0;
-
-    public override int GetHashCode()
-    {
-        return Id.GetHashCode();
-    }
-
-    public static bool operator ==(LuaDocumentId left, LuaDocumentId right)
-    {
-        return left.Id == right.Id;
-    }
-
-    public static bool operator !=(LuaDocumentId left, LuaDocumentId right)
-    {
-        return !(left == right);
-    }
-
-    public override string ToString()
-    {
-        return Id.ToString();
-    }
 }
 
 public sealed class LuaDocument