use all reserver keywords, instead of using ios only

2 files changed, 21 insertions, 17 deletions

diff --git a/generator/generator.py b/generator/generator.py
index 17f0be091..2dda4129f 100644
--- a/generator/generator.py
+++ b/generator/generator.py
@@ -265,15 +265,8 @@ class Generator:
         """
         content = self.get_file_content(file_name)
         content = tuple(map(lambda e: re.sub(r'\n', r'', e).strip().casefold(), content))
-        try:
-            start_index = content.index('# ios library')
-            content = content[start_index + 1:len(content)]
-            content = tuple(filter(lambda e: not re.search(r'^#+\s+.+|^$', e), content))
-            self.logger.debug('key_words: %s', ', '.join(content))
-            return content
-        except (IndexError, ValueError, StopIteration) as error1:
-            self.logger.error('Error while getting key_words, %s %s', type(error1).__name__, error1)
-            return []
+        content = tuple(filter(lambda e: not re.search(r'^#+\s+.+|^$', e), content))
+        return content
 
     def get_paths(self, file_name: Path = ROOT.joinpath('paths.ini')):
         """
diff --git a/generator/test/test_structs.py b/generator/test/test_structs.py
index beb9e35c5..61ea23702 100644
--- a/generator/test/test_structs.py
+++ b/generator/test/test_structs.py
@@ -27,7 +27,7 @@ class TestStructsProducer(TestCase):
 
     def setUp(self):
         self.maxDiff = None
-        key_words = Generator().get_key_words()
+        key_words = ('value', 'id')
 
         self.producer = StructsProducer('SDLRPCStruct', enum_names=(), struct_names=['Image'], key_words=key_words)
 
@@ -36,9 +36,10 @@ class TestStructsProducer(TestCase):
         generator/transformers/common_producer.py	64%
         generator/transformers/structs_producer.py	100%
         """
-        item = Struct(name='CloudAppProperties', members={
-            'appID': Param(name='appID', param_type=String())
-        })
+        members = OrderedDict()
+        members['appID'] = Param(name='appID', param_type=String())
+        members['value'] = Param(name='value', param_type=String())
+        item = Struct(name='CloudAppProperties', members=members)
         expected = OrderedDict()
         expected['origin'] = 'CloudAppProperties'
         expected['name'] = 'SDLCloudAppProperties'
@@ -49,15 +50,25 @@ class TestStructsProducer(TestCase):
                 constructor_argument='appID', constructor_argument_override=None, constructor_prefix='AppID',
                 deprecated=False, description=['{"default_value": null, "max_length": null, "min_length": null}'],
                 for_name='object', mandatory=True, method_suffix='AppID', modifier='strong', of_class='NSString.class',
-                origin='appID', since=None, type_native='NSString *', type_sdl='NSString *'),)
+                origin='appID', since=None, type_native='NSString *', type_sdl='NSString *'),
+            self.producer.param_named(
+                constructor_argument='valueParam', constructor_argument_override=None, constructor_prefix='ValueParam',
+                deprecated=False, description=['{"default_value": null, "max_length": null, "min_length": null}'],
+                for_name='object', mandatory=True, method_suffix='ValueParam', modifier='strong',
+                of_class='NSString.class', origin='valueParam', since=None, type_native='NSString *',
+                type_sdl='NSString *')
+        )
 
         argument = [
-            self.producer.argument_named(variable='appID', deprecated=False, constructor_argument='appID',
-                                         origin='appID')]
+            self.producer.argument_named(
+                variable='appID', deprecated=False, constructor_argument='appID', origin='appID'),
+            self.producer.argument_named(
+                variable='valueParam', deprecated=False, constructor_argument='valueParam', origin='valueParam')
+        ]
 
         expected['constructors'] = (self.producer.constructor_named(
             all=argument, arguments=argument, deprecated=False, self='',
-            init='AppID:(NSString *)appID'),)
+            init='AppID:(NSString *)appID valueParam:(NSString *)valueParam'),)
 
         actual = self.producer.transform(item)
         self.assertDictEqual(expected, actual)