R4 4

ConfigGenerator/config_compare.py

@@ -78,5 +78,5 @@ def ordered(obj):
         json2 = ordered(json.load(json_file_2)) if args.ignoreorder else json.load(json_file_2)
 
     if json1 != json2:
-        log.Error(f"JSON Input files are not identical")
+        log.Warn(f"JSON Input files are not identical")
         sys.exit(1)

ConfigGenerator/params.config

@@ -1,7 +1,13 @@
 autostart
+callsign
+communicator
+configuration
+persistentpathpostfix
 precondition
 resumed
+startmode
+startuporder
+systemrootpath
 terminations
-callsign
-persistentpathpostfix
-configuration
+volatilepathpostfix
+webui

JsonGenerator/JsonGenerator.py

@@ -60,6 +60,10 @@
                 files.append(p)
 
         for path in files:
+
+            trackers.object_tracker.Reset()
+            trackers.enum_tracker.Reset()
+
             try:
                 log.Header(path)
 

JsonGenerator/source/class_emitter.py

@@ -51,9 +51,10 @@ def _EmitEnumRegistration(root, enum):
     count = 0
 
     for obj in trackers.enum_tracker.objects:
-        if not obj.is_duplicate and not obj.included_from:
+        if not obj.is_duplicate and not obj.included_from and ("@register" not in obj.schema or obj.schema["@register"]):
             emit.Line()
             _EmitEnumRegistration(root, obj)
+            obj.schema["@register"] = False
             count += 1
 
     emit.Line()

JsonGenerator/source/code_generator.py

@@ -43,9 +43,6 @@ def _ParseJsonRpcSchema(schema):
         else:
             return None
 
-    trackers.object_tracker.Reset()
-    trackers.enum_tracker.Reset()
-
     directory = os.path.dirname(path)
     filename = (schema["info"]["namespace"]) if "info" in schema and "namespace" in schema["info"] else ""
     filename += (schema["info"]["class"]) if "info" in schema and "class" in schema["info"] else ""

JsonGenerator/source/documentation_generator.py

@@ -31,7 +31,7 @@ def Create(log, schema, path, indent_size = 4):
     input_basename = os.path.basename(path)
     output_path = os.path.dirname(path) + os.sep + input_basename.replace(".json", "") + ".md"
 
-    with Emitter(output_path, config.INDENT_SIZE) as emit:
+    with Emitter(output_path, config.INDENT_SIZE, 10000) as emit:
         def bold(string):
             return "**%s**" % string
 

JsonGenerator/source/emitter.py

@@ -16,11 +16,11 @@
 # limitations under the License.
 
 class Emitter():
-    def __init__(self, file_name, indent_size):
+    def __init__(self, file_name, indent_size, max_line_length = 160):
         self.file = open(file_name, "w") if file_name else None
         self.indent_size = indent_size
         self.indent = 0
-        self.threshold = 160
+        self.threshold = max_line_length
         self.lines = []
 
     def __del__(self):

JsonGenerator/source/header_loader.py

@@ -41,7 +41,15 @@ def __init__(self, obj, msg):
         else:
             super(CppParseError, self).__init__(msg)
 
+
 def LoadInterface(file, log, all = False, includePaths = []):
+
+    def StripFrameworkNamespace(identifier):
+        return str(identifier).replace("::" + config.FRAMEWORK_NAMESPACE + "::", "")
+
+    def StripInterfaceNamespace(identifier):
+        return str(identifier).replace(config.INTERFACE_NAMESPACE + "::", "")
+
     try:
         tree = CppParser.ParseFiles([os.path.join(os.path.dirname(os.path.realpath(__file__)),
                     posixpath.normpath(config.DEFAULT_DEFINITIONS_FILE)), file], includePaths, log)
@@ -88,15 +96,12 @@ def _EvaluateRpcFormat(obj):
         info["format"] = rpc_format.value
 
         if not face.obj.parent.full_name.endswith(config.INTERFACE_NAMESPACE):
-            info["namespace"] = face.obj.parent.name
+            info["namespace"] = face.obj.parent.name[1:] if (face.obj.parent.name[0] == "I" and face.obj.parent.name[1].isupper()) else face.obj.parent.name
 
         info["class"] = face.obj.name[1:] if face.obj.name[0] == "I" else face.obj.name
         scoped_face = face.obj.full_name.split("::")[1:]
 
-        if scoped_face[0] == config.FRAMEWORK_NAMESPACE:
-            scoped_face = scoped_face[1:]
-
-        info["interface"] = "::".join(scoped_face)
+        info["interface"] = StripInterfaceNamespace("::" + "::".join(scoped_face))
         info["sourcefile"] = os.path.basename(file)
 
         if face.obj.sourcelocation:
@@ -119,12 +124,6 @@ def _EvaluateRpcFormat(obj):
             def ResolveTypedef(type):
                 return type.Resolve()
 
-            def StripFrameworkNamespace(identifier):
-                return str(identifier).replace("::" + config.FRAMEWORK_NAMESPACE + "::", "")
-
-            def StripInterfaceNamespace(identifier):
-                return str(identifier).replace(config.INTERFACE_NAMESPACE + "::", "").replace("::" + config.FRAMEWORK_NAMESPACE + "::", "")
-
             def ConvertType(var):
                 var_type = ResolveTypedef(var.type)
                 cppType = var_type.Type()
@@ -195,13 +194,11 @@ def ConvertType(var):
                     elif isinstance(cppType, CppParser.Enum):
 
                         if len(cppType.items) > 1:
-                            enum_values = [e.auto_value for e in cppType.items]
-
-                            for i, e in enumerate(cppType.items, 0):
-                                if enum_values[i - 1] != enum_values[i]:
-                                    raise CppParseError(var, "enumerator values in an enum must all be explicit or all be implied")
+                            autos = [e.auto_value for e in cppType.items].count(True)
+                            if autos != 0 and (autos != len(cppType.items)):
+                               raise CppParseError(var, "enumerator values in an enum must all be explicit or all be implied")
 
-                        enum_spec = { "enum": [e.meta.text if e.meta.text else e.name.replace("_"," ").title().replace(" ","") for e in cppType.items], "scoped": var.type.Type().scoped  }
+                        enum_spec = { "enum": [e.meta.text if e.meta.text else e.name.replace("_"," ").title().replace(" ","") for e in cppType.items], "scoped": var_type.Type().scoped  }
                         enum_spec["ids"] = [e.name for e in cppType.items]
                         enum_spec["hint"] = var.type.Type().name
 
@@ -215,26 +212,36 @@ def ConvertType(var):
                             result = ["array", { "items": enum_spec } ]
                         else:
                             result = ["string", enum_spec]
+
+
+                        if isinstance(var.type.Type(), CppParser.Typedef):
+                            result[1]["@register"] = False
+
                     # POD objects
                     elif isinstance(cppType, CppParser.Class):
-                        def GenerateObject(ctype):
+                        def GenerateObject(ctype, was_typdef):
                             properties = dict()
 
                             for p in ctype.vars:
                                 name = p.name.lower()
 
                                 if isinstance(ResolveTypedef(p.type).Type(), CppParser.Class):
-                                    _, props = GenerateObject(ResolveTypedef(p.type).Type())
+                                    _, props = GenerateObject(ResolveTypedef(p.type).Type(), isinstance(p.type.Type(), CppParser.Typedef))
                                     properties[name] = props
                                     properties[name]["type"] = "object"
                                     properties[name]["original_type"] = StripFrameworkNamespace(p.type.Type().full_name)
                                 else:
                                     properties[name] = ConvertParameter(p)
+
                                 properties[name]["@originalname"] = p.name
 
+                                if was_typdef:
+                                    properties[name]["@register"] = False
+
                             return "object", { "properties": properties, "required": list(properties.keys()) }
 
-                        result = GenerateObject(cppType)
+                        result = GenerateObject(cppType, isinstance(var.type.Type(), CppParser.Typedef))
+
                     # All other types are not supported
                     else:
                         raise CppParseError(var, "unable to convert C++ type to JSON type: %s" % cppType.type)
@@ -405,14 +412,26 @@ def BuildResult(vars, is_property=False):
 
             if method.is_excluded:
                 if event_params:
-                    log.WarnLine(method, "'%s()': @json:omit is redundant for notification registration methods" % method.name)
+                    log.WarnLine(method, "'%s': @json:omit is redundant for notification registration methods" % method.name)
 
                 continue
 
-            prefix = (face.obj.parent.name.lower() + "_") if face.obj.parent.full_name != config.INTERFACE_NAMESPACE else ""
+            if face.obj.json_prefix:
+                prefix = (face.obj.json_prefix + "::")
+            elif face.obj.parent.full_name != config.INTERFACE_NAMESPACE:
+                prefix = (face.obj.parent.name.lower() + "_")
+            else:
+                prefix = ""
+
             method_name = method.retval.meta.text if method.retval.meta.text else method.name
             method_name_lower = method_name.lower()
 
+            if method.retval.meta.alt == method_name_lower:
+                log.WarnLine(method, "%s': alternative name is same as original name" % method.name)
+
+            if method.retval.meta.text == method_name_lower:
+                log.WarnLine(method, "%s': changed function name is same as original name" % method.name)
+
             for e in event_params:
                 exists = any(x.obj.type == e.type.type for x in event_interfaces)
 
@@ -533,6 +552,11 @@ def BuildResult(vars, is_property=False):
 
                             if obj["params"] == None or obj["params"]["type"] == "null":
                                 raise CppParseError(method.vars[value], "property setter method must have one input parameter")
+
+                    if method.retval.meta.alt:
+                        properties[prefix + method.retval.meta.alt] = copy.deepcopy(obj)
+                        properties[prefix + method.retval.meta.alt]["deprecated"] = True
+
                 else:
                     raise CppParseError(method, "property method must have one parameter")
 

JsonGenerator/source/json_loader.py

@@ -110,7 +110,7 @@ def __init__(self, name, parent, schema, included=None):
 
         # Do some sanity check on the type name
         if parent and not isinstance(parent, JsonArray):
-            if not is_generated:
+            if not is_generated and not self.original_name:
                 if not self.name.replace("_", "").isalnum():
                     raise JsonParseError("Invalid characters in identifier name: '%s'" % self.print_name)
 
@@ -728,7 +728,7 @@ def function_name(self):
             return self.cpp_name
 
     def Headline(self):
-        return "%s%s%s" % (self.json_name, (" - " + self.summary.split(".", 1)[0]) if self.summary else "",
+        return "'%s'%s%s" % (self.json_name, (" - " + self.summary.split(".", 1)[0]) if self.summary else "",
                            " (DEPRECATED)" if self.deprecated else " (OBSOLETE)" if self.obsolete else "")
 
 

JsonGenerator/source/rpc_emitter.py

@@ -269,7 +269,7 @@ def _EmitRpcCode(root, emit, header_file, source_file, data_emitted):
     module_var = "_module_"
     impl_var = "_impl_"
     struct = "J" + root.json_name
-    face = "I" + root.json_name
+    face = root.info["interface"] if "interface" in root.info else ("I" + root.json_name)
 
     has_listeners = any((isinstance(m, JsonNotification) and m.is_status_listener) for m in root.properties)
 

JsonGenerator/source/trackers.py

@@ -253,7 +253,7 @@ def __Compare(lhs, rhs):
 
                     return obj
 
-            return None
+        return None
 
     def CommonObjects(self):
         return SortByDependency(filter(lambda obj: ((obj.RefCount() > 1) or self._IsTopmost(obj)), self.objects))