Commit: 1ebc30ebe3f26f858f5b79c3f27dff3bcc418e70 - protobuf_bvgsdk (git)

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

Commit MetaInfo

• Revisão: 1ebc30ebe3f26f858f5b79c3f27dff3bcc418e70 (tree)
• Hora: 2015-01-27 00:42:56
• Autor: ornse01 <ornse01@user...>
• Commiter: ornse01

Mensagem de Log

fix generator class structure.

Mudança Sumário

• modified: src/protobuf/cgenerator.rb
• modified: src/protobuf/template.erb

Diff

--- a/src/protobuf/cgenerator.rb
+++ b/src/protobuf/cgenerator.rb
@@ -4,8 +4,29 @@ require 'pathname'
 module Protobuf end
 
 class Protobuf::CGenerator
-  def self.field_to_c_type(field)
-    case field.type
+  def self.generate_header(msg_list)
+    msg_list = msg_list.map { |msg| Protobuf::CGenerator::Message.new msg }
+    script = Pathname("../template.erb").expand_path(__FILE__).read()
+
+    erb = ERB.new(script, nil, '-');
+    erb.result(binding)
+  end
+
+  def self.generate_source
+  end
+end
+
+class Protobuf::CGenerator::Field
+  def initialize(field_node)
+    @field_node = field_node
+  end
+
+  def name
+    @field_node.name
+  end
+  
+  def to_c_type
+    case @field_node.type
     when :double
       "DOUBLE"
     when :float
@@ -39,24 +60,32 @@ class Protobuf::CGenerator
     end
   end
 
-  def self.field_method_type(field)
-    if (field.rule == :required)||(field.rule == :optional)
-      if field.type == :int32
+  def field_method_type
+    if (@field_node.rule == :required)||(@field_node.rule == :optional)
+      if @field_node.type == :int32
         return :singular_numeric
-      elsif field.type == :string
+      elsif @field_node.type == :string
         return :singular_string
       end
-    elsif field.rule == :repeated
+    elsif @field_node.rule == :repeated
     end
   end
+end
 
-  def self.generate_header(msg_list)
-    script = Pathname("../template.erb").expand_path(__FILE__).read()
+class Protobuf::CGenerator::Message
+  def initialize(msg_node)
+    @msg_node = msg_node
+  end
 
-    erb = ERB.new(script, nil, '-');
-    erb.result(binding)
+  def name
+    @msg_node.name
   end
 
-  def self.generate_source
+  def each_field
+    return to_enum(__method__) unless block_given?
+
+    @msg_node.each_field { |field|
+      yield Protobuf::CGenerator::Field.new field
+    }
   end
 end

--- a/src/protobuf/template.erb
+++ b/src/protobuf/template.erb
@@ -7,11 +7,11 @@ typedef struct <%= m.name %>_ <%= m.name %>;
 <%- msg_list.each do |m| -%>
     <%- m.each_field do |f| -%>
 /* <%= m.name %>.<%= f.name %> */
-    	<%- case field_method_type f -%>
+    	<%- case f.field_method_type -%>
 	<%- when :singular_numeric -%>
 Bool <%= m.name %>__has_<%= f.name %>(<%= m.name %> *m);
-<%= field_to_c_type f %> <%= m.name %>__<%= f.name %>(<%= m.name %> m*)
-VOID <%= m.name %>__set_<%= f.name %>(<%= m.name %> *m, <%= field_to_c_type f %> value)
+<%= f.to_c_type %> <%= m.name %>__<%= f.name %>(<%= m.name %> m*)
+VOID <%= m.name %>__set_<%= f.name %>(<%= m.name %> *m, <%= f.to_c_type %> value)
 VOID <%= m.name %>__clear_<%= f.name %>(<%= m.name %> *m)
         <%- when :singular_string -%>
 Bool <%= m.name %>__has_<%= f.name %>(<%= m.name %> *m)