[Tool][Generator] fix mismatched type of typedef arguments

Change-Id: Ie9752ed98878546c8ca3651ba35d27c224b5a1e5
Signed-off-by: pius.lee <pius.lee@samsung.com>

diff --git a/tools/skeleton_generator/WAPIOven.py b/tools/skeleton_generator/WAPIOven.py
index 896a354..27d75f2 100644 (file)
--- a/tools/skeleton_generator/WAPIOven.py
+++ b/tools/skeleton_generator/WAPIOven.py
@@ -24,6 +24,21 @@ cppPrimitiveMap = {
         'double':'double'
         }
 
+jsPrimitiveMap = {
+        'DOMString':'STRING',
+        'object':'DICTIONARY',
+        'boolean':'BOOLEAN',
+        'byte':'BYTE',
+        'octet':'OCTET',
+        'short':'LONG',
+        'long':'LONG',
+        'long long': 'LONG_LONG',
+        'unsigned short':'UNSIGNED_LONG',
+        'unsigned long long':'UNSIGNED_LONG_LONG',
+        'float':'DOUBLE',
+        'double':'DOUBLE'
+        }
+
 class IndentPrintable(object):
     def __init__(self, isIndent=True, tabstep=2, ignoreLF=False):
         self.moduleName = moduleName
@@ -72,6 +87,46 @@ class Compiler(IndentPrintable):
     def todo(self, formatstring):
         self.dprint(("// %s " % Compiler.TODOSTR) +formatstring)
 
+    def jstype(self, t):
+        if t.name in jsPrimitiveMap:
+            return [jsPrimitiveMap[t.name]]
+
+        elif t.name in self.ctx['enum']:
+            return ['ENUM', self.ctx['enum'][t.name]]
+        elif t.name in self.ctx['typedef']:
+            t2 = self.ctx['typedef'][t.name]
+            if t2.union:
+                union_names = [x.name for x in t2.union]
+                isEnum = reduce(lambda x, y: x & y, [ x in self.ctx['enum'] for x in union_names])
+                if isEnum :
+                    enums = reduce(lambda x,y: x+y, [ self.ctx['enum'][x] for x in self.ctx['enum'] if x in union_names])
+                    return ['ENUM', enums]
+                else:
+                    types = reduce(lambda x, y: x & y, [ x in m.getTypes('Interface') for x in union_names])
+                    return ['PLATFORM_OBJECT', types]
+            else:
+                return self.jstype(t2)
+        elif t.name in self.ctx['callback']:
+            cb = self.ctx['callback'][t.name]
+            if cb.functionOnly:
+                return ['FUNCTION']
+            else:
+                cb_ops = cb.getTypes('Operation')
+                if 'onsuccess' in cb_ops:
+                    cb.callbackType = 'success'
+                elif 'onerror' in cb_ops:
+                    cb.callbackType = 'error'
+                return ['LISTENER', [o.name for o in cb_ops]]
+        elif t.name in self.ctx['dictionary']:
+            return ['DICTIONARY']
+        elif t.name in self.ctx['interfaces']:
+            return ['PLATFORM_OBJECT', [t.name]]
+        else:
+            print "I think \"%s\" is in tizen module, generate with tizen.widl" % t.name
+            sys.exit(1)
+            return None
+
+
     def prepare(self, module):
         self.ctx = dict()
         self.ctx['interfaces'] = dict()
@@ -138,36 +193,15 @@ class Compiler(IndentPrintable):
                         native_function = iface.name+(operation.name.title())
                         self.ctx['cmdtable'][native_function] = native_cmd
                     operation.argnames = [a.name for a in operation.arguments]
-                    operation.primitiveArgs = [x for x in operation.arguments if x.xtype.name in cppPrimitiveMap]
+                    #operation.primitiveArgs = [x for x in operation.arguments if x.xtype.name in cppPrimitiveMap]
+                    operation.primitiveArgs = []
                     for arg in operation.arguments:
-                        if arg.xtype.name in self.ctx['interfaces'] and \
-                            hasattr(self.ctx['interfaces'][arg.xtype.name], 'constructor'):
-                            arg.isPlatformObject = True
-
-                        if arg.xtype.name in self.ctx['enum']:
-                            arg.isEnum = True
-                            arg.enums = self.ctx['enum'][arg.xtype.name]
-                        if arg.xtype.name in self.ctx['typedef']:
-                            arg.isTypedef = True
-                            t = self.ctx['typedef'][arg.xtype.name]
-                            if t.union:
-                                union_names = [t.name for t in t.union]
-                                arg.isEnum = reduce(lambda x, y: x & y, [ x in self.ctx['enum'] for x in union_names])
-                                if arg.isEnum :
-                                    arg.enums = reduce(lambda x,y: x+y, [ self.ctx['enum'][x] for x in self.ctx['enum'] if x in union_names])
-                                arg.isTypes = reduce(lambda x, y: x & y, [ x in m.getTypes('Interface') for x in union_names])
-                        if arg.xtype.name in self.ctx['callback']:
-                            callback = self.ctx['callback'][arg.xtype.name]
-                            if callback.functionOnly:
-                                arg.functionOnly = True
-                            arg.isListener = True
-                            arg.listenerType = self.ctx['callback'][arg.xtype.name]
-                            operation.async = True
-                            m.async = True
-                            if arg.listenerType.get('Operation', 'onsuccess'):
-                                arg.listenerType.callbackType = 'success'
-                            elif arg.listenerType.get('Operation', 'onerror'):
-                                arg.listenerType.callbackType = 'error'
+                        arg.validation = self.jstype(arg.xtype)
+                        if arg.validation:
+                            if arg.validation[0] in ['FUNCTION', 'LISTENER']:
+                                m.async = True
+                            elif arg.validation[0] in jsPrimitiveMap.values():
+                                operation.primitiveArgs.append(arg)
 
                     for xiface in self.ctx['exportedInterface']:
                         if operation.returnType.name == xiface.name:

diff --git a/tools/skeleton_generator/tpl/tpl_api.js b/tools/skeleton_generator/tpl/tpl_api.js
index a055e14..48b0dfb 100644 (file)
--- a/tools/skeleton_generator/tpl/tpl_api.js
+++ b/tools/skeleton_generator/tpl/tpl_api.js
@@ -9,22 +9,6 @@
 var validator_ = xwalk.utils.validator;
 var types_ = validator_.Types;
 
-{% set type_map = {
-  'DOMString':'STRING',
-  'object':'DICTIONARY',
-  'Date':'PLATFORM_OBJECT',
-  'boolean':'BOOLEAN',
-  'byte':'BYTE',
-  'octet':'OCTET',
-  'short':'LONG',
-  'long':'LONG',
-  'long long': 'LONG_LONG',
-  'unsigned short':'UNSIGNED_LONG',
-  'unsigned long long':'UNSIGNED_LONG_LONG',
-  'float':'DOUBLE',
-  'double':'DOUBLE'
-} %}
-
 {% if module.async %}
 var callbackId = 0;
 var callbacks = {};
@@ -110,6 +94,7 @@ function {{iface.name}}(
     {% endfor %}
   };
   var syncResult = callNative('{{iface.name}}_constructor', nativeParam);
+  {% endif %}
 
   {% for attribute in iface.getTypes('Attribute') %}
     {% if attribute.existIn == 'ctor' %}
@@ -125,7 +110,6 @@ function {{iface.name}}(
   this.{{attribute.name}} = {{attrValue}};
     {% endif %}
   {% endfor %}
-  {% endif %}
 }
 
 {% if iface.inherit %}
@@ -142,39 +126,11 @@ function {{iface.name}}(
   {% if operation.arguments %}
   var args = validator_.validateArgs(arguments, [
     {% for arg in operation.arguments %}
-    {'name': '{{arg.name}}', 'type': types_.
-      {%- if arg.functionOnly -%}
-        FUNCTION
-      {%- elif arg.isListener -%}
-        LISTENER, 'values': [
-        {%- for listener in arg.listenerType.getTypes('Operation') -%}
-          '{{listener.name}}'{% if not loop.last %}, {% endif %}
-        {%- endfor -%}
-        ]
-      {%- elif arg.isEnum -%}
-        ENUM, 'values': [
-        {%- for e in arg.enums -%}
-        '{{e}}' {%- if not loop.last -%}, {% endif %}
-        {%- endfor -%}
-        ]
-      {%- elif arg.xtype.array > 0 -%}
-        ARRAY
-      {%- elif arg.xtype.unions or arg.isTypes -%}
-        PLATFORM_OBJECT, 'values': [
-        {%- for union in arg.xtype.unions -%}
-          {{union}} {%- if not loop.last -%}, {% endif -%}
-        {%- endfor -%}
-        ]
-      {%- elif arg.xtype.name in type_map -%}
-        {{type_map[arg.xtype.name]}}
-      {%- elif arg.isPlatformObject -%}
-        PLATFORM_OBJECT, 'values': tizen.{{arg.xtype.name}}
-      {%- else -%}
-        DICTIONARY
-      {%- endif -%}
-      {%- if arg.optional -%}, 'optional': true{% endif -%}
-      {%- if arg.xtype.nullable -%}, 'nullable': true{% endif -%}
-    }{% if not loop.last %},{% endif %}
+    {'name': '{{arg.name}}', 'type': types_.{{arg.validation[0]}}
+        {%- if arg.validation[1] -%}
+        , 'values': {{arg.validation[1]}} 
+        {%- endif -%} }
+        {%- if not loop.last %},{% endif %}
 
     {% endfor %}
   ]);