Merge branch 'development'

# Conflicts: # test/codeblocks/.gitignore # test/codeblocks/ETL.depend # test/codeblocks/ETL.layout # test/test_type_lookup.cpp
ETLCPP · Sep 19, 2017 · 68c964a · 68c964a
1 parent d4c3606
commit 68c964a
Show file tree

Hide file tree

Showing 5 changed files with 305 additions and 4 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=9.5.1
+version=9.6.0
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 sentence=A C++ template library tailored for embedded systems.

diff --git a/src/type_lookup.h b/src/type_lookup.h
@@ -165,6 +165,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -254,6 +268,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -340,6 +368,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -423,6 +465,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -504,6 +560,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -581,6 +651,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -655,6 +739,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -726,6 +824,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -795,6 +907,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -859,6 +985,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -920,6 +1060,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -978,6 +1132,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -1034,6 +1202,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -1086,6 +1268,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -1135,6 +1331,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
 
   //***************************************************************************
@@ -1181,6 +1391,20 @@ namespace etl
 
       STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
     };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
   };
   //***************************************************************************
   // Default for 16 types.

diff --git a/src/type_lookup_generator.h b/src/type_lookup_generator.h
@@ -145,6 +145,20 @@ namespace etl
   cog.outl("")
   cog.outl("    STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), \"Invalid type\");")
   cog.outl("  };")
+  cog.outl("")
+  cog.outl("  //************************************")
+  cog.outl("  template <typename T>")
+  cog.outl("  static unsigned int get_id_from_type(const T&)")
+  cog.outl("  {")
+  cog.outl("    return get_id_from_type<T>();")
+  cog.outl("  }")
+  cog.outl("")
+  cog.outl("  //************************************")
+  cog.outl("  template <typename T>")
+  cog.outl("  static unsigned int get_id_from_type()")
+  cog.outl("  {")
+  cog.outl("    return id_from_type<T>::value;")
+  cog.outl("  }")
   cog.outl("};")
   for n in range(int(NTypes) - 1, 0, -1):
       cog.outl("")
@@ -220,6 +234,20 @@ namespace etl
       cog.outl("")
       cog.outl("    STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), \"Invalid type\");")
       cog.outl("  };")
+      cog.outl("")
+      cog.outl("  //************************************")
+      cog.outl("  template <typename T>")
+      cog.outl("  static unsigned int get_id_from_type(const T&)")
+      cog.outl("  {")
+      cog.outl("    return get_id_from_type<T>();")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //************************************")
+      cog.outl("  template <typename T>")
+      cog.outl("  static unsigned int get_id_from_type()")
+      cog.outl("  {")
+      cog.outl("    return id_from_type<T>::value;")
+      cog.outl("  }")
       cog.outl("};")
   cog.outl("//***************************************************************************")
   cog.outl("// Default for %s types." % int(NTypes))

diff --git a/test/codeblocks/.gitignore b/test/codeblocks/.gitignore
@@ -1,3 +1,4 @@
 random_*.csv
 /ETL.depend
 /ETL.layout
+*.depend