Fixed bug with generate code for fixed length strings

John Haley · John Haley · commit 0fd2f2ff7757 · 2015-02-12T08:09:46.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -182,6 +182,18 @@
         }
       }
     },
+    "cert_hostkey": {
+      "fields": {
+        "hash_md5": {
+          "cppClassName": "String",
+          "size": 16
+        },
+        "hash_sha1": {
+          "cppClassName": "String",
+          "size": 20
+        }
+      }
+    },
     "checkout": {
       "functions": {
         "git_checkout_head": {
diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -50,26 +50,27 @@ module.exports = function generateNativeCode() {
   };
 
   var filters = {
-    upper: require("../templates/filters/upper"),
-    replace: require("../templates/filters/replace"),
-    titleCase: require("../templates/filters/title_case"),
-    or: require("../templates/filters/or"),
     and: require("../templates/filters/and"),
-    defaultValue: require("../templates/filters/default_value"),
     argsInfo: require("../templates/filters/args_info"),
     cppToV8: require("../templates/filters/cpp_to_v8"),
-    jsArgsCount: require("../templates/filters/js_args_count"),
-    isV8Value: require("../templates/filters/is_v8_value"),
-    isPointer: require("../templates/filters/is_pointer"),
+    defaultValue: require("../templates/filters/default_value"),
+    fieldsInfo: require("../templates/filters/fields_info"),
+    hasReturnType: require("../templates/filters/has_return_type"),
+    hasReturns: require("../templates/filters/has_returns"),
     isDoublePointer: require("../templates/filters/is_double_pointer"),
+    isFixedLengthString: require("../templates/filters/is_fixed_length_string"),
     isOid: require("../templates/filters/is_oid"),
-    unPointer: require("../templates/filters/un_pointer"),
+    isPointer: require("../templates/filters/is_pointer"),
+    isV8Value: require("../templates/filters/is_v8_value"),
+    jsArgsCount: require("../templates/filters/js_args_count"),
+    or: require("../templates/filters/or"),
     payloadFor: require("../templates/filters/payload_for"),
-    hasReturnType: require("../templates/filters/has_return_type"),
-    hasReturns: require("../templates/filters/has_returns"),
+    replace: require("../templates/filters/replace"),
     returnsCount: require("../templates/filters/returns_count"),
     returnsInfo: require("../templates/filters/returns_info"),
-    fieldsInfo: require("../templates/filters/fields_info")
+    titleCase: require("../templates/filters/title_case"),
+    unPointer: require("../templates/filters/un_pointer"),
+    upper: require("../templates/filters/upper")
   };
 
   // Convert Buffers to Combyne templates.
diff --git a/generate/templates/filters/is_fixed_length_string.js b/generate/templates/filters/is_fixed_length_string.js
@@ -0,0 +1,3 @@
+module.exports = function(field) {
+  return field.cppClassName == "String" && field.size;
+};
diff --git a/generate/templates/partials/fields.cc b/generate/templates/partials/fields.cc
@@ -4,8 +4,12 @@
       NanScope();
       Handle<v8::Value> to;
 
+      {% if field | isFixedLengthString %}
+      char* {{ field.name }} = (char *)ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->GetValue()->{{ field.name }};
+      {% else %}
       {{ field.cType }} {% if not field.cppClassName|isV8Value %}*{% endif %}{{ field.name }} =
         {% if not field.cppClassName|isV8Value %}&{% endif %}ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->GetValue()->{{ field.name }};
+      {% endif %}
 
       {% partial convertToV8 field %}
       NanReturnValue(to);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function(field) {`
	`2`	`+ return field.cppClassName == "String" && field.size;`
	`3`	`+};`