Merge pull request #125 from AntelopeIO/mikelik/singleton_fix

Fix getting wrong name of the table for singleton

tests/toolchain/abigen-pass/singleton_contract.abi

@@ -0,0 +1,45 @@
+{
+ "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
+ "version": "eosio::abi/1.2",
+ "types": [],
+ "structs": [
+ {
+ "name": "tbl_config",
+ "base": "",
+ "fields": [
+ {
+ "name": "y",
+ "type": "uint64"
+ },
+ {
+ "name": "x",
+ "type": "uint64"
+ }
+ ]
+ },
+ {
+ "name": "whatever",
+ "base": "",
+ "fields": []
+ }
+ ],
+ "actions": [
+ {
+ "name": "whatever",
+ "type": "whatever",
+ "ricardian_contract": ""
+ }
+ ],
+ "tables": [
+ {
+ "name": "config",
+ "type": "tbl_config",
+ "index_type": "i64",
+ "key_names": [],
+ "key_types": []
+ }
+ ],
+ "ricardian_clauses": [],
+ "variants": [],
+ "action_results": []
+}

tests/toolchain/abigen-pass/singleton_contract.cpp

@@ -0,0 +1,21 @@
+#include <eosio/asset.hpp>
+#include <eosio/eosio.hpp>
+#include <eosio/name.hpp>
+#include <eosio/singleton.hpp>
+
+using namespace eosio;
+
+class [[eosio::contract("singleton_contract")]] singleton_contract : public contract {
+ public:
+ using contract::contract;
+
+ [[eosio::action]]
+ void whatever() {};
+
+ struct [[eosio::table]] tbl_config {
+ uint64_t y;
+ uint64_t x;
+ };
+
+ typedef eosio::singleton<"config"_n, tbl_config> config;
+};

tests/toolchain/abigen-pass/singleton_contract.json

@@ -0,0 +1,10 @@
+{
+ "tests" : [
+ {
+ "expected" : {
+ "abi-file" : "singleton_contract.abi"
+ }
+ }
+ ]
+ }
+

tools/include/eosio/abigen.hpp

@@ -802,7 +802,7 @@ namespace eosio { namespace cdt {
  }
  virtual bool VisitDecl(clang::Decl* decl) {
  if (const auto* d = dyn_cast<clang::ClassTemplateSpecializationDecl>(decl)) {
- if (d->getName() == "multi_index") {
+ if (d->getName() == "multi_index" || d->getName() == "singleton") {
  ag.add_table(d->getTemplateArgs()[0].getAsIntegral().getExtValue(),
  (clang::CXXRecordDecl*)((clang::RecordType*)d->getTemplateArgs()[1].getAsType().getTypePtr())->getDecl());
  }