talk 2.3.6 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a5abbb15a585fc235b8447ce7811f92ca3b14b
-  data.tar.gz: aa468079200186fdef8d92913c903f4b9539a7b3
+  metadata.gz: ba013c3a9959cffe8437109544ac80fe0ba56656
+  data.tar.gz: 9ecc6df80df26fbc85110f9fa8a73ce31b42003d
 SHA512:
-  metadata.gz: 7ef638efe6c9b72b9b5a32d42b65af49a846a6122a1aeb42ece3e50872a9590397761933870c6aa14b3edd15118be7eb7f955e5c9de01c1f56d14f79b11d90cc
-  data.tar.gz: d940a4a534110ec594fe6f5072265364c0afdae689598f10d18dd2aa679e542bcfa3a9d6cb5c4ccb08cffd0a38ff8bf6063727e1b6114a60c8d26b1526a09508
+  metadata.gz: 97162e8d65b4b6946150b51958ebca5a50073b01e9f2aa89b2323818882dd273660b45073ba48ae8983b8f3520085505294754a13b4a838a69923fe28b7d2796
+  data.tar.gz: 495194289d8326087d0bf98c3b504ac597647320abb54a4cb265f1f71e5236dd3b2767ce0f1e00f109902801881746ecc96a9e6ade0f9df6be041e0b969ae353

data/CHANGELOG

@@ -1 +1,2 @@
+2.3.7  - Add C# generator
 2.3.6  - Fix crashes in JS generator

data/lib/languages/cs/cs.rb

@@ -0,0 +1,183 @@
+require 'set'
+
+def make_source
+  types = [ :class, :enumeration, :glossary]
+  types.each do |type|
+    @base[type].each do |current|
+      @current = current
+      @current[:field] ||= [] if type == :class
+      generate_template(filename_for_entity(@current), type.to_s+".cs.erb")
+    end
+  end
+  @base[:protocol].each do |current|
+    @current = current
+    generate_template("com/acres4/common/protocol/#{current[:name]}.cs", "TalkProtocol.cs.erb")
+  end
+end
+
+def filename_for_entity(name)
+  name = name[:name] if name.is_a? Hash
+  name.gsub(".", "/") + ".cs"
+end
+
+def autogenerated_warning
+  <<-AUTOGEN_DONE
+/* Autogenerated from Talk
+** Please do not edit this file directly. Instead, modify the underlying .talk files. */
+  AUTOGEN_DONE
+end
+
+def definition_reference(tag)
+  "@talkFile #{tag[:__meta][:file]}:#{tag[:__meta][:line]}"
+end
+
+def rootclass
+  @target[:rootclass] || "io.usetalk.TalkObject"
+end
+
+def superclass(cls)
+  cls[:inherits] || rootclass
+end
+
+def class_package(cls)
+  cls[:name].split(".")[0..-2].join(".")
+end
+
+def list_references_for_class(cls)
+  references = Set.new
+  cls[:field].each do |field|
+    unless is_primitive?(field[:type].first) then
+      references.add( class_package( class_named(field[:type][0], @base[:class]) ))
+    end
+  end
+
+  references.add("System.Collections.Generic") if class_has_map(cls)
+  references.to_a
+end
+
+def class_has_map(cls)
+  cls[:field].each do |f|
+    return true if f[:type].include? "{}"
+  end
+
+  false
+end
+
+def import_classes
+  (list_references_for_class(@current).map { |name| "using #{name};"}).join("\n")
+end
+
+def comment_block(tag, indent_level=0)
+  lines = []
+  indent = "\t" * indent_level
+  lines.push(indent)
+  lines.push(indent + "/**")
+  lines.push(wrap_text_to_width(tag[:description], 80, indent + " *  ")) unless tag[:description].nil?
+  lines.push(indent + " *  ")
+  lines.push(indent + " *  " + definition_reference(tag))
+  lines.push(indent + " */")
+
+  lines.join("\n")
+end
+
+def field_datatype_rec(field, stack)
+  return field_datatype_basic(field, stack.last) if stack.length == 1
+  t = stack.last
+
+  r = field_datatype_rec(field, stack[0 .. -2])
+  if is_array? t then
+    "#{r}[]"
+  elsif is_dict? t then
+    "Dictionary<string, #{convert_field_for_map(r)}>"
+  else
+    nil
+  end
+end
+
+def convert_field_for_map(field)
+  case field
+  when "byte"
+    "byte"
+  when "short"
+    "short"
+  when "int"
+    "int"
+  when "long"
+    "long"
+  when "double"
+    "double"
+  else
+    field
+  end
+end
+
+def field_datatype_basic(field, type)
+  if is_primitive? type then
+    case type
+    when "string"
+      "string"
+    when "real"
+      "double"
+    when "bool"
+      "bool"
+    when "object"
+      "object"
+    when "talkobject"
+      rootclass
+    when "int8"
+      "sbyte"
+    when "uint8"
+      "byte"
+    when "int16"
+      "short"
+    when "uint16"
+      "ushort"
+    when "int32"
+      "int"
+    when "uint32"
+      "uint"
+    when "int64"
+      "long"
+    when "uint64"
+      "ulong"
+    end
+  else
+    truncated_name type
+  end
+end
+
+def field_datatype(field)
+  field_datatype_rec(field, field[:type])
+end
+
+def field_variable(cls,field)
+  lines = []
+  lines.push comment_block(field, 2)
+  lines.push "\t\tpublic #{field_datatype(field)} #{mapped_name(cls, field, :field)} { get; set; }"
+  lines.join("\n")
+end
+
+def setter_name(field)
+  "set#{field[:name].sub(/^(\w)/) {|s| s.capitalize}}"
+end
+
+def getter_name(field)
+  "get#{field[:name].sub(/^(\w)/) {|s| s.capitalize}}"
+end
+
+def field_accessors(cls, field)
+  lines = []
+  lines.push "\t\t/**"
+  lines.push "\t\t#{wrap_text_to_width(field[:description])}"
+  lines.push "\t\t#{field[:deprecated] if field.has_key? :deprecated}"
+  lines.push "\t\t#{definition_reference(field)}"
+  lines.push "\t\t@param #{field[:name]} #{field[:description]}"
+  lines.push "\t\t*/"
+  lines.push "\t\tpublic void #{setter_name(field)}(#{field_datatype(field)} #{mapped_name(cls, field,:field)}) {"
+  lines.push "\t\t\tthis.#{mapped_name(cls, field, :field)} = #{mapped_name(cls, field, :field)};"
+  lines.push "\t\t}"
+  lines.push "\t\tpublic #{field_datatype(field)} #{getter_name(field)}() {"
+  lines.push "\t\t\treturn this.#{mapped_name(cls, field, :field)};"
+  lines.push "\t\t}"
+  lines.join "\n"
+end

data/lib/languages/cs/templates/TalkProtocol.cs.erb

@@ -0,0 +1,14 @@
+<%= autogenerated_warning %>
+namespace  com.acres4.common.protocol
+{
+	public class <%= truncated_name(@current[:name]) %> 
+	{
+		<% @current[:method].each do |method| %>
+    		/**
+    		<%= method[:description] %>
+    		*/
+    		public static readonly string <%= method[:name].sub(/^(\w)/) {|s| s.capitalize} %> = "<%= method[:name] %>";
+
+		<% end %>
+	}
+}

data/lib/languages/cs/templates/class.cs.erb

@@ -0,0 +1,10 @@
+<%= autogenerated_warning %>
+<%= import_classes %>
+namespace <%= class_package(@current) %>
+{
+	<%= comment_block(@current,1) %>
+	public class <%= truncated_name(@current) %> :  <%= superclass(@current) %>
+	{
+		<%= (@current[:field].map do |f| field_variable(truncated_name(@current),f) end).join("\n") %>
+	}
+}

data/lib/languages/cs/templates/enumeration.cs.erb

@@ -0,0 +1,11 @@
+<%= autogenerated_warning %>
+namespace <%= class_package(@current) %>
+{
+	<%= comment_block(@current) %>
+	public class <%= truncated_name(@current) %> :  <%= rootclass %>
+	{<% @current[:constant].each do |field| %>
+    	/** <%= field[:description] %> */
+    	public readonly static int <%= field[:name] %> = <%= field[:value].to_i %>;
+	<% end %>
+	}
+}

data/lib/languages/cs/templates/glossary.cs.erb

@@ -0,0 +1,10 @@
+<%= autogenerated_warning %>
+namespace <%= class_package(@current) %>
+{
+	<%= comment_block(@current) %>
+	public class <%= truncated_name(@current) %>
+	{
+		<% @current[:term].each do |field| %>
+  		public readonly static string <%= field[:name] %> = "<%= field[:value] %>";<% end %>
+	}
+}

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Talk
-  VERSION = "2.3.6"
+  VERSION = "2.3.7"
 end

data/talk.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.name        = 'talk'
   s.executables << 'maketalk'
   s.version     = Talk::VERSION
-  s.date        = '2014-07-31'
+  s.date        = '2014-08-25'
   s.summary     = "Compile-to-source protocol contract specification language"
-  s.description = "A lightweight language for specifying protocol contracts. Compiles to source in Java, Javascript, ObjC and Ruby."
+  s.description = "A lightweight language for specifying protocol contracts. Compiles to source in Java, CSharp, Javascript, ObjC and Ruby."
   s.authors     = ["Jonas Acres"]
   s.email       = 'jonas@becuddle.com'
   s.homepage    = 'http://github.com/jonasacres/talk'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talk
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
 platform: ruby
 authors:
 - Jonas Acres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.1
 description: A lightweight language for specifying protocol contracts. Compiles to
-  source in Java, Javascript, ObjC and Ruby.
+  source in Java, CSharp, Javascript, ObjC and Ruby.
 email: jonas@becuddle.com
 executables:
 - maketalk
@@ -101,6 +101,11 @@ files:
 - lib/contexts/string.rb
 - lib/contexts/target.rb
 - lib/contexts/term.rb
+- lib/languages/cs/cs.rb
+- lib/languages/cs/templates/TalkProtocol.cs.erb
+- lib/languages/cs/templates/class.cs.erb
+- lib/languages/cs/templates/enumeration.cs.erb
+- lib/languages/cs/templates/glossary.cs.erb
 - lib/languages/java/java.rb
 - lib/languages/java/templates/TalkProtocol.java.erb
 - lib/languages/java/templates/class.java.erb