deprecated view update

5 files changed, 12 insertions, 6 deletions

diff --git a/generator/generator.py b/generator/generator.py
index 01ccd193d..96901bbe4 100644
--- a/generator/generator.py
+++ b/generator/generator.py
@@ -12,11 +12,11 @@ from datetime import datetime, date
 from inspect import getfile
 from json import JSONDecodeError
 from os.path import basename, join
+from pathlib import Path
 from re import findall
 
 from jinja2 import UndefinedError, TemplateNotFound, FileSystemLoader, Environment, ChoiceLoader, \
     TemplateAssertionError, TemplateSyntaxError, TemplateRuntimeError
-from pathlib import Path
 
 ROOT = Path(__file__).absolute().parents[0]
 
@@ -317,6 +317,9 @@ class Generator:
         """
         tasks = []
         for item in items.values():
+            if item.name == 'FunctionID':
+                self.logger.warning('%s will be skipped', item.name)
+                continue
             render = transformer.transform(item)
             file = self.output_directory.joinpath(render.get('name', item.name))
             for extension in ('.h', '.m'):
diff --git a/generator/templates/base_struct_function.h b/generator/templates/base_struct_function.h
index c02ed3e7f..c4ee1d142 100644
--- a/generator/templates/base_struct_function.h
+++ b/generator/templates/base_struct_function.h
@@ -13,7 +13,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 {% include 'description.jinja' %}
-@interface {{name}} : {{extends_class}}{{ending}}{{ " __deprecated" if deprecated and deprecated is sameas true }}
+@interface {{name}} : {{extends_class}}{{ending}}
 {%- block constructors %}
 {% for c in constructors %}
 /**
diff --git a/generator/templates/description.jinja b/generator/templates/description.jinja
index 0c8bd31c1..4eff1614e 100644
--- a/generator/templates/description.jinja
+++ b/generator/templates/description.jinja
@@ -18,3 +18,6 @@
  {%- endif %}
  */
 {%- endif -%}
+{%- if deprecated and deprecated is sameas true %}
+__deprecated
+{%- endif -%}
diff --git a/generator/templates/enums/template.h b/generator/templates/enums/template.h
index 0947017a7..d55f9f8ba 100644
--- a/generator/templates/enums/template.h
+++ b/generator/templates/enums/template.h
@@ -7,9 +7,9 @@
 {%- endblock -%}
 {%- block body %}
 {% include 'description.jinja' %}
-typedef SDLEnum {{ name }} SDL_SWIFT_ENUM{{ending}}{{ " __deprecated" if deprecated and deprecated is sameas true }};
+typedef SDLEnum {{ name }} SDL_SWIFT_ENUM{{ending}};
 {% for param in params %}
 {% include 'description_param.jinja' %}
-extern {{ name }} const {{ name }}{{param.name}}{{ ' %s%s%s'|format('NS_SWIFT_NAME(', param.name|lower, ')') if NS_SWIFT_NAME is defined}};
+extern {{ name }} const {{ name }}{{param.name}}{{ " __deprecated" if param.deprecated and param.deprecated is sameas true }};
 {% endfor -%}
 {% endblock -%}
\ No newline at end of file
diff --git a/generator/templates/enums/template_numeric.h b/generator/templates/enums/template_numeric.h
index 5167f3ab7..a6493c6eb 100644
--- a/generator/templates/enums/template_numeric.h
+++ b/generator/templates/enums/template_numeric.h
@@ -1,11 +1,11 @@
 {% extends "template.h" %}
 {%- block body %}
 {% include 'description.jinja' %}
-typedef NS_ENUM(NSUInteger, SDL{{ name }}){{ "__deprecated" if deprecated and deprecated is sameas true }}{
+typedef NS_ENUM(NSUInteger, SDL{{ name }}){
 {% for param in params %}
 {%- macro someop() -%}{% include 'description_param.jinja' %}{%- endmacro -%}
 {{ someop()|indent(4, True) }}
-    SDL{{ name }}{{ param.name }} = {{ param.value }}{{ ' %s%s%s'|format('NS_SWIFT_NAME(', param.name|lower, ')') if NS_SWIFT_NAME is defined}};
+    SDL{{ name }}{{ param.name }} = {{ param.value }}{{ " __deprecated" if param.deprecated and param.deprecated is sameas true }};
 {% endfor -%}
 };
 {% endblock -%}
\ No newline at end of file