Multiple contracts in eosio::contract, and support for typedefs #5

cyberway · Dec 27, 2019 · 23ee920 · 23ee920
1 parent f8865e2
commit 23ee920
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
@@ -47,6 +47,7 @@
 #include <cstdint>
 #include <string>
 #include <utility>
+#include <set>
 
 namespace clang {
 
@@ -2975,6 +2976,9 @@ class TypedefNameDecl : public TypeDecl, public Redeclarable<TypedefNameDecl> {
   std::string getEosioTable() const;
   bool hasEosioScopeType() const;
   std::string getEosioScopeType() const;
+
+  bool isEosioContract() const;
+  std::set<std::string> getEosioContracts() const;
 private:
   bool isTransparentTagSlow() const;
 };

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
@@ -952,8 +952,8 @@ def EosioRicardian : InheritableAttr {
 
 def EosioContract : InheritableAttr {
    let Spellings = [CXX11<"eosio", "contract">, GNU<"eosio_contract">];
-   let Args = [StringArgument<"name", 1>];
-   let Subjects = SubjectList<[CXXRecord, CXXMethod]>;
+   let Args = [VariadicStringArgument<"names">];
+   let Subjects = SubjectList<[CXXRecord, CXXMethod, TypedefName]>;
    let Documentation = [EosioContractDocs];
 }
 

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -4450,6 +4450,12 @@ std::string TypedefNameDecl::getEosioScopeType()const {
   return getAttr<EosioScopeTypeAttr>()->getType();
 }
 
+bool TypedefNameDecl::isEosioContract()const { return hasAttr<EosioContractAttr>(); }
+std::set<std::string> TypedefNameDecl::getEosioContracts()const {
+  const auto& names = getAttr<EosioContractAttr>()->names();
+  return std::set<std::string>(names.begin(), names.end());
+}
+
 bool TypedefNameDecl::isTransparentTagSlow() const {
   auto determineIsTransparent = [&]() {
     if (auto *TT = getUnderlyingType()->getAs<TagType>()) {

diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
@@ -411,13 +411,16 @@ static void handleEosioNotifyAttribute(Sema &S, Decl *D, const AttributeList &AL
 }
 
 static void handleEosioContractAttribute(Sema &S, Decl *D, const AttributeList &AL) {
-  // Handle the cases where the attribute has a text message.
-  StringRef Str, Replacement;
-  if (AL.isArgExpr(0) && AL.getArgAsExpr(0) &&
-      !S.checkStringLiteralArgumentAttr(AL, 0, Str))
-    return;
+  SmallVector<StringRef, 2> names;
+  for (unsigned I = 0, E = AL.getNumArgs(); I != E; ++I) {
+    StringRef name;
+    if (!S.checkStringLiteralArgumentAttr(AL, I, name))
+      return;
+    names.push_back(name);
+  }
+
   D->addAttr(::new (S.Context)
-                 EosioContractAttr(AL.getRange(), S.Context, Str,
+                 EosioContractAttr(AL.getRange(), S.Context, names.data(), names.size(),
                                 AL.getAttributeSpellingListIndex()));
 }