Use STL types for C++ output

This give us much nicer lookup for string keys, boundary checks
and better introspection when it comes to iteration.

Signed-off-by: Pierre Ossman <ossman@cendio.se>

1 files changed, 13 insertions, 0 deletions

diff --git a/tools/keymap-gen b/tools/keymap-gen
index cb8b8fc..6536861 100755
--- a/tools/keymap-gen
+++ b/tools/keymap-gen
@@ -530,6 +530,19 @@ class CLanguageGenerator(LanguageSrcGenerator):
 
 class CppLanguageGenerator(CLanguageGenerator):
 
+    def _array_start_code(self, varname, length, fromtype, totype):
+        totypename = self.inttypename if totype == int else "const " + self.strtypename
+        if fromtype == int:
+            print("#include <vector>")
+            print("const std::vector<%s> %s = {" % (totypename, varname))
+        else:
+            print("#include <map>")
+            print("#include <string>")
+            print("const std::map<const std::string, %s> %s = {" % (totypename, varname))
+
+    def _array_end(self):
+        print("};")
+
     # designated initializers not available in C++
     def _array_entry_code(self, index, value, comment):
         if type(index) != int: