Merge pull request #73 from cpprefjp/add_new_categories

Add new categories

Author: faithandbrave

crsearch.json/run.py

@@ -99,6 +99,7 @@ class Validator(object):
                 'type': 'object',
                 'oneOf': [
                     {'$ref': '#/definitions/header'},
+                    {'$ref': '#/definitions/category'},
                     {'$ref': '#/definitions/common'},
                 ],
             },
@@ -126,13 +127,37 @@ class Validator(object):
                     },
                 },
             },
+            'category': {
+                'require': ['type', 'key'],
+                'additionalProperties': False,
+                'properties': {
+                    'type': {
+                        'type': 'string',
+                        'enum': ['category'],
+                    },
+                    'key': {
+                        'type': 'array',
+                        'items': {
+                            'type': 'string',
+                            'pattern': '^[^"<>]+$',
+                        },
+                    },
+                    'cpp_namespace': {
+                        'type': 'array',
+                        'items': {
+                            'type': 'string',
+                            'pattern': '^[^:]+$',
+                        },
+                    },
+                },
+            },
             'common': {
                 'require': ['type', 'key'],
                 'additionalProperties': False,
                 'properties': {
                     'type': {
                         'type': 'string',
-                        'enum': ['class', 'function', 'mem_fun', 'macro', 'enum', 'variable', 'type-alias', 'concept', 'cpo', 'article'],
+                        'enum': ['class', 'function', 'mem_fun', 'macro', 'enum', 'variable', 'type-alias', 'concept', 'named requirement', 'cpo', 'article'],
                     },
                     'key': {
                         'type': 'array',
@@ -249,13 +274,15 @@ def get_meta(self, md):
     @staticmethod
     def identify_type(metas, names, nojump):
         # type 判別
-        # metas['id-type']: class, class template, function, function template, enum, variable, type-alias, concept, macro, namespace
-        # type: "header" / "class" / "function" / "mem_fun" / "macro" / "enum" / "variable"/ "type-alias" / "concept"/ "article"
+        # metas['id-type']: class, class template, function, function template, enum, variable, type-alias, concept, named requirement, macro, namespace
+        # type: "header" / "category" / "class" / "function" / "mem_fun" / "macro" / "enum" / "variable"/ "type-alias" / "concept" / "named requirement" / "article"
         if nojump:
             return 'meta'
         elif 'id-type' not in metas:
             if 'header' in metas:
                 return 'header'
+            elif 'category' in metas:
+                return 'category'
             elif names[0] == 'article':
                 # それ以外の article/ の下は article 扱いにする
                 return 'article'
@@ -280,7 +307,7 @@ def identify_type(metas, names, nojump):
                     return 'mem_fun'
                 else:
                     return 'function'
-            elif id_type in {'enum', 'variable', 'type-alias', 'concept', 'macro', 'namespace', 'cpo'}:
+            elif id_type in {'enum', 'variable', 'type-alias', 'concept', 'named requirement', 'macro', 'namespace', 'cpo'}:
                 return id_type
             else:
                 raise RuntimeError(f'unexpected meta: {metas}')
@@ -327,6 +354,11 @@ def make_index(self, md, names, idgen, nojump):
                 'type': 'header',
                 'key': metas['header'][0].split('/'),
             }))
+        if 'category' in metas:
+            related_to.append(idgen.get_indexid({
+                'type': 'category',
+                'key': metas['category'][0].split('/'),
+            }))
 
         if len(related_to) != 0:
             index['related_to'] = related_to