Update headers for member of operator

dlang · Feb 6, 2024 · cae85fc · cae85fc
1 parent 56cc1db
commit cae85fc
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 57 deletions.
diff --git a/compiler/src/dmd/expression.d b/compiler/src/dmd/expression.d
@@ -1363,11 +1363,6 @@ extern (C++) class MemberOfOperatorExp : Expression
         this.ident = ident;
     }
 
-    static MemberOfOperatorExp create(const ref Loc loc, Identifier ident) @safe
-    {
-        return new MemberOfOperatorExp(loc, ident);
-    }
-
     override void accept(Visitor v)
     {
         v.visit(this);

diff --git a/compiler/src/dmd/expression.h b/compiler/src/dmd/expression.h
@@ -124,6 +124,7 @@ class Expression : public ASTNode
     ComplexExp* isComplexExp();
     IdentifierExp* isIdentifierExp();
     DollarExp* isDollarExp();
+    MemberOfOperatorExp* isMemberOfExp();
     DsymbolExp* isDsymbolExp();
     ThisExp* isThisExp();
     SuperExp* isSuperExp();
@@ -1057,6 +1058,13 @@ class AddAssignExp final : public BinAssignExp
     void accept(Visitor *v) override { v->visit(this); }
 };
 
+class MemberOfOperator : public Expression
+{
+public:
+    Identifier* ident;
+    void accept(Visitor* v) override { v->visit(this); }
+};
+
 class MinAssignExp final : public BinAssignExp
 {
 public:

diff --git a/compiler/src/dmd/frontend.h b/compiler/src/dmd/frontend.h
@@ -179,6 +179,7 @@ class RealExp;
 class ComplexExp;
 class IdentifierExp;
 class DollarExp;
+class MemberOfOperatorExp;
 class DsymbolExp;
 class ThisExp;
 class SuperExp;
@@ -1103,6 +1104,7 @@ class ParseTimeVisitor
     virtual void visit(typename AST::TypeExp e);
     virtual void visit(typename AST::ScopeExp e);
     virtual void visit(typename AST::IdentifierExp e);
+    virtual void visit(typename AST::MemberOfOperatorExp e);
     virtual void visit(typename AST::UnaExp e);
     virtual void visit(typename AST::DefaultInitExp e);
     virtual void visit(typename AST::BinExp e);
@@ -1685,20 +1687,21 @@ enum class TY : uint8_t
     Tchar = 31u,
     Twchar = 32u,
     Tdchar = 33u,
-    Terror = 34u,
-    Tinstance = 35u,
-    Ttypeof = 36u,
-    Ttuple = 37u,
-    Tslice = 38u,
-    Treturn = 39u,
-    Tnull = 40u,
-    Tvector = 41u,
-    Tint128 = 42u,
-    Tuns128 = 43u,
-    Ttraits = 44u,
-    Tmixin = 45u,
-    Tnoreturn = 46u,
-    Ttag = 47u,
+    Tmemberof = 34u,
+    Terror = 35u,
+    Tinstance = 36u,
+    Ttypeof = 37u,
+    Ttuple = 38u,
+    Tslice = 39u,
+    Treturn = 40u,
+    Tnull = 41u,
+    Tvector = 42u,
+    Tint128 = 43u,
+    Tuns128 = 44u,
+    Ttraits = 45u,
+    Tmixin = 46u,
+    Tnoreturn = 47u,
+    Ttag = 48u,
 };
 
 typedef uint64_t dinteger_t;
@@ -1783,6 +1786,7 @@ class Type : public ASTNode
     static Type* tsize_t;
     static Type* tptrdiff_t;
     static Type* thash_t;
+    static Type* tmemberOfOperator;
     static ClassDeclaration* dtypeinfo;
     static ClassDeclaration* typeinfoclass;
     static ClassDeclaration* typeinfointerface;
@@ -1801,7 +1805,7 @@ class Type : public ASTNode
     static ClassDeclaration* typeinfoshared;
     static ClassDeclaration* typeinfowild;
     static TemplateDeclaration* rtinfo;
-    static Type* basic[48LLU];
+    static Type* basic[49LLU];
     virtual const char* kind() const;
     Type* copy() const;
     virtual Type* syntaxCopy();
@@ -2053,39 +2057,40 @@ enum class EXP : uint8_t
     halt = 92u,
     tuple = 93u,
     error = 94u,
-    void_ = 95u,
-    int64 = 96u,
-    float64 = 97u,
-    complex80 = 98u,
-    import_ = 99u,
-    delegate_ = 100u,
-    function_ = 101u,
-    mixin_ = 102u,
-    in_ = 103u,
-    break_ = 104u,
-    continue_ = 105u,
-    goto_ = 106u,
-    scope_ = 107u,
-    traits = 108u,
-    overloadSet = 109u,
-    line = 110u,
-    file = 111u,
-    fileFullPath = 112u,
-    moduleString = 113u,
-    functionString = 114u,
-    prettyFunction = 115u,
-    pow = 116u,
-    powAssign = 117u,
-    vector = 118u,
-    voidExpression = 119u,
-    cantExpression = 120u,
-    showCtfeContext = 121u,
-    objcClassReference = 122u,
-    vectorArray = 123u,
-    compoundLiteral = 124u,
-    _Generic_ = 125u,
-    interval = 126u,
-    loweredAssignExp = 127u,
+    memberOf = 95u,
+    void_ = 96u,
+    int64 = 97u,
+    float64 = 98u,
+    complex80 = 99u,
+    import_ = 100u,
+    delegate_ = 101u,
+    function_ = 102u,
+    mixin_ = 103u,
+    in_ = 104u,
+    break_ = 105u,
+    continue_ = 106u,
+    goto_ = 107u,
+    scope_ = 108u,
+    traits = 109u,
+    overloadSet = 110u,
+    line = 111u,
+    file = 112u,
+    fileFullPath = 113u,
+    moduleString = 114u,
+    functionString = 115u,
+    prettyFunction = 116u,
+    pow = 117u,
+    powAssign = 118u,
+    vector = 119u,
+    voidExpression = 120u,
+    cantExpression = 121u,
+    showCtfeContext = 122u,
+    objcClassReference = 123u,
+    vectorArray = 124u,
+    compoundLiteral = 125u,
+    _Generic_ = 126u,
+    interval = 127u,
+    loweredAssignExp = 128u,
 };
 
 struct complex_t final
@@ -2148,6 +2153,7 @@ class Expression : public ASTNode
     ComplexExp* isComplexExp();
     IdentifierExp* isIdentifierExp();
     DollarExp* isDollarExp();
+    MemberOfOperatorExp* isMemberOfExp();
     DsymbolExp* isDsymbolExp();
     ThisExp* isThisExp();
     SuperExp* isSuperExp();
@@ -3069,6 +3075,13 @@ class LoweredAssignExp final : public AssignExp
     void accept(Visitor* v) override;
 };
 
+class MemberOfOperatorExp : public Expression
+{
+public:
+    Identifier* ident;
+    void accept(Visitor* v) override;
+};
+
 class MinAssignExp final : public BinAssignExp
 {
 public:
@@ -5775,6 +5788,7 @@ struct ASTCodegen final
     using LineInitExp = ::LineInitExp;
     using LogicalExp = ::LogicalExp;
     using LoweredAssignExp = ::LoweredAssignExp;
+    using MemberOfOperatorExp = ::MemberOfOperatorExp;
     using MemorySet = ::MemorySet;
     using MinAssignExp = ::MinAssignExp;
     using MinExp = ::MinExp;
@@ -6243,6 +6257,7 @@ struct CompileEnv final
     bool previewIn;
     bool ddocOutput;
     bool masm;
+    bool ignoreMemberOf;
     CompileEnv() :
         versionNumber(),
         date(),
@@ -6251,18 +6266,20 @@ struct CompileEnv final
         timestamp(),
         previewIn(),
         ddocOutput(),
-        masm()
+        masm(),
+        ignoreMemberOf()
     {
     }
-    CompileEnv(uint32_t versionNumber, _d_dynamicArray< const char > date = {}, _d_dynamicArray< const char > time = {}, _d_dynamicArray< const char > vendor = {}, _d_dynamicArray< const char > timestamp = {}, bool previewIn = false, bool ddocOutput = false, bool masm = false) :
+    CompileEnv(uint32_t versionNumber, _d_dynamicArray< const char > date = {}, _d_dynamicArray< const char > time = {}, _d_dynamicArray< const char > vendor = {}, _d_dynamicArray< const char > timestamp = {}, bool previewIn = false, bool ddocOutput = false, bool masm = false, bool ignoreMemberOf = false) :
         versionNumber(versionNumber),
         date(date),
         time(time),
         vendor(vendor),
         timestamp(timestamp),
         previewIn(previewIn),
         ddocOutput(ddocOutput),
-        masm(masm)
+        masm(masm),
+        ignoreMemberOf(ignoreMemberOf)
         {}
 };
 

diff --git a/compiler/src/dmd/globals.h b/compiler/src/dmd/globals.h
@@ -274,6 +274,8 @@ struct CompileEnv
     DString timestamp;
     d_bool previewIn;
     d_bool ddocOutput;
+    d_bool masm;
+    d_bool ignoreMemberOf;
 };
 
 struct Global

diff --git a/compiler/src/dmd/iasmgcc.d b/compiler/src/dmd/iasmgcc.d
@@ -420,7 +420,7 @@ unittest
         scope p = new Parser!ASTCodegen(null, ";", false, global.errorSink, &cenv, doUnittests);
         p.token = *tokens;
 
-        GccAsmStatement s = p.parseGccAsm(gas);
+        p.parseGccAsm(gas);
         return global.errors - errors;
     }
 

diff --git a/compiler/src/dmd/mtype.h b/compiler/src/dmd/mtype.h
@@ -82,6 +82,7 @@ enum class TY : uint8_t
     Tchar,
     Twchar,
     Tdchar,
+    Tmemberof,
     Terror,
     Tinstance,
     Ttypeof,
@@ -191,6 +192,7 @@ class Type : public ASTNode
     static Type *tsize_t;               // matches size_t alias
     static Type *tptrdiff_t;            // matches ptrdiff_t alias
     static Type *thash_t;               // matches hash_t alias
+    static Type *tmemberOfOperator;
 
     static ClassDeclaration *dtypeinfo;
     static ClassDeclaration *typeinfoclass;

diff --git a/compiler/src/dmd/tokens.h b/compiler/src/dmd/tokens.h
@@ -397,6 +397,7 @@ enum class EXP : unsigned char
     halt,
     tuple,
     error,
+    memberOf,
 
     // Basic types
     void_,

diff --git a/compiler/src/dmd/visitor.h b/compiler/src/dmd/visitor.h
@@ -190,6 +190,7 @@ class RealExp;
 class ComplexExp;
 class IdentifierExp;
 class DollarExp;
+class MemberOfOperatorExp;
 class DsymbolExp;
 class ThisExp;
 class SuperExp;
@@ -491,6 +492,7 @@ class ParseTimeVisitor
     virtual void visit(TypeExp *e) { visit((Expression *)e); }
     virtual void visit(ScopeExp *e) { visit((Expression *)e); }
     virtual void visit(IdentifierExp *e) { visit((Expression *)e); }
+    virtual void visit(MemberOfOperatorExp *e) { visit((Expression *)e); }
     virtual void visit(UnaExp *e) { visit((Expression *)e); }
     virtual void visit(DefaultInitExp *e) { visit((Expression *)e); }
     virtual void visit(BinExp *e) { visit((Expression *)e); }