(feature+WIP) Correct copying of struct data (WIP).

Author: LittleHelicase

languages/c/templates/datastructures/constructors.js

@@ -9,12 +9,12 @@ module.exports = {
     constructorAssign: (node) => {
       const fields = node.inputs.map((p, idx) => t('Datastructures.fieldAssign')({
         name: variable(p.port),
+        fieldType: p.type,
         index: idx,
         type: node.type,
         output: '____TMP____'
       }))
       return `
-    /* ${JSON.stringify(node, null, 2)} */
   ${sanitize(node.type.name)}* ____TMP____ = new ${sanitize(node.type.name)}();
   ${variable(node.output.port)} = ${t('defType')(node.output.type, '____TMP____')};
 ${fields.join('\n')}`
@@ -29,6 +29,6 @@ ${fields.join('\n')}`
 
     destructorAssign: (assign) => `${variable(assign.output.port)} = ((${t('dataType')(assign.type.name)}*)${variable(assign.input.port)}->data)->get()->arg${assign.parameter};`,
 
-    fieldAssign: (assign) => `  ${assign.output}->argp_${assign.index} = ${assign.name};`
+    fieldAssign: (assign) => `  ${assign.output}->argp_${assign.index} = __copy_${t('Types.typeName')(assign.fieldType)}(${assign.name});`
   }
 }

languages/c/templates/datastructures/typeclass.js

@@ -30,13 +30,13 @@ struct ${sanitize(typeName)} {
   std::string subType;
   void* data;
   ${orTypes.map((type, idx) => '\n  ' + sanitize(typeName) + '(' + sanitize(type.name) + '* ptr) {\n' +
-'    this->data = (void*)(new ' + t('dataType')(type.name) + '(ptr));\n' +
+'    this->data = (void*)(new ' + t('Types.typeName')(type.name) + '(ptr));\n' +
 '    this->subType = "' + type.name + '";\n' +
 '  }').join('\n')}
 
   ~${typeName}() {
     if (false) {}
-    ${orTypes.map((type, idx) => 'else if (this->subType == "' + type.name + '") { delete ((' + t('dataType')(type.name) + '*)(this->data))->get(); }').join('\n')}
+    ${orTypes.map((type, idx) => 'else if (this->subType == "' + type.name + '") { delete ((' + t('Types.typeName')(type.name) + '*)(this->data)); }').join('\n')}
   }
 };
 
@@ -59,7 +59,7 @@ std::string ${t('Types.toStringName')(struct.metaInformation.type.type.type)} (c
         return `
 std::string ${t('Types.toStringName')(struct.metaInformation.type.type.type)} (const ${sanitize(struct.metaInformation.type.type.type)}& obj) {
   if (false) {}
-  ${orTypes.map((type, idx) => 'else if (obj.subType == "' + type.name + '") { return __' + sanitize(type.name) + '_to_std__string(*((' + t('dataType')(type.name) + '*)(obj.data))->get()); }').join('\n')}
+  ${orTypes.map((type, idx) => 'else if (obj.subType == "' + type.name + '") { return __' + sanitize(type.name) + '_to_std__string(*((' + t('Types.typeName')(type.name) + '*)(obj.data))); }').join('\n')}
 }
 `
       } else {