Commit: 489c2c780208418addb99391362bb0ae06458eb6 - protobuf_bvgsdk (git)

超漢字アプリケーション開発用のProtocol Buffersコンパイラの開発

Commit MetaInfo

• Revision: 489c2c780208418addb99391362bb0ae06458eb6 (tree)
• Time: 2015-02-04 02:14:00
• Author: ornse01 <ornse01@user...>
• Commiter: ornse01

Log Message

change scalar type definition in C.

Change Summary

• add: src/pb_scalartypes.h
• modified: src/protobuf/cgenerator.rb
• modified: src/protobuf/template.h.erb

Incremental Difference

--- /dev/null
+++ b/src/pb_scalartypes.h
@@ -0,0 +1,48 @@
+/*
+ * pb_scalartypes.h
+ *
+ * Copyright (c) 2009 project bchan
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source
+ *    distribution.
+ *
+ */
+
+#include	<basic.h>
+
+#ifndef __PB_SCALARTYPES_H__
+#define __PB_SCALARTYPES_H__
+
+typedef DOUBLE pb_double_t;
+typedef FLOAT pb_float_t;
+typedef W pb_int32_t;
+typedef UW pb_uint21_t;
+typedef long long int pb_int64_t;
+typedef unsinged long long int pb_uint64_t;
+typedef Bool pb_bool_t;
+typedef pb_str_t_ pb_str_t;
+typedef pb_bytes_t_ pb_bytes_t;
+
+IMPORT pb_str_t* pb_str_new();
+IMPORT VOID pb_str_delete(pb_str_t *str);
+
+IMPORT pb_bytes_t* pb_bytes_new();
+IMPORT VOID pb_bytes_delete(pb_bytes_t *bytes);
+
+#endif

--- a/src/protobuf/cgenerator.rb
+++ b/src/protobuf/cgenerator.rb
@@ -28,31 +28,31 @@ class Protobuf::CGenerator::Field
   def to_c_type
     case @field_node.type
     when :double
-      "DOUBLE"
+      "pb_double_t"
     when :float
-      "FLOAT"
+      "pb_float_t"
     when :int32
-      "W"
+      "pb_int32_t"
     when :int64
-      "D"
+      "pb_int64_t"
     when :uint32
-      "UW"
+      "pb_uint32_t"
     when :uint64
-      "UD"
+      "pb_uint64_t"
     when :sint32
-      "W"
+      "pb_int32_t"
     when :sint64
-      "D"
+      "pb_int64_t"
     when :fixed32
-      "W"
+      "pb_int32_t"
     when :fixed64
-      "D"
+      "pb_int64_t"
     when :sfixed32
-      "W"
+      "pb_int32_t"
     when :sfixed64
-      "D"
+      "pb_int64_t"
     when :bool
-      "Bool"
+      "pb_bool_t"
     when :string
       nil
     when :bytes

--- a/src/protobuf/template.h.erb
+++ b/src/protobuf/template.h.erb
@@ -22,5 +22,14 @@ void <%= m.name %>__clear_<%= f.name %>(<%= m.name %> *m)
 void <%= m.name %>__set_allocated_<%= f.name %>(<%= m.name %> *m, pb_str_t *value)
 pb_str_t* <%= m.name %>__release_<%= f.name %>(<%= m.name %> *m)
 	<%- end -%>
+	<%- if f.is_singular_bytes? -%>
+Bool <%= m.name %>__has_<%= f.name %>(<%= m.name %> *m)
+pb_bytes_t* <%= m.name %>__<%= f.name %>(<%= m.name %> *m)
+void <%= m.name %>__set_<%= f.name %>(<%= m.name %> *m, const pb_bytes_t *string)
+pb_bytes_t* <%= m.name %>__mutable_<%= f.name %>(<%= m.name %> *m)
+void <%= m.name %>__clear_<%= f.name %>(<%= m.name %> *m)
+void <%= m.name %>__set_allocated_<%= f.name %>(<%= m.name %> *m, pb_bytes_t *value)
+pb_bytes_t* <%= m.name %>__release_<%= f.name %>(<%= m.name %> *m)
+	<%- end -%>
     <%- end -%>
 <%- end -%>