talk 2.0.1 → 2.0.2

data/lib/languages/objc/templates/TalkClasses.h.erb

@@ -0,0 +1,3 @@
+<%= autogenerated_warning %>
+#import "TalkObject.h"
+<%= (@base[:class].map { |cls| "#import \"#{truncated_name(cls)}.h\"" }).join("\n") %>

data/lib/languages/objc/templates/TalkClassesForward.h.erb

@@ -0,0 +1,2 @@
+<%= autogenerated_warning %>
+<%= (@base[:class].map { |cls| "@class #{truncated_name(cls)}; // #{definition_reference(cls)}" }).join("\n") %>

data/lib/languages/objc/templates/TalkConstants.h.erb

@@ -0,0 +1,22 @@
+<%= autogenerated_warning %>
+<% @base[:glossary].each do |glossary| %>
+
+// @glossary <%= glossary[:name] %>
+<%= comment_block(glossary) %>
+
+<% glossary[:term].each do |term| %>
+<%= comment_block(term) %>
+#define <%= glossary_term_name(term[:name]) %> @"<%= term[:value] %>"
+<% end # term %>
+
+<% end # glossary %>
+
+<% @base[:enumeration].each do |enumeration| %>
+
+<%= comment_block(enumeration) %>
+enum <%= truncated_name(enumeration[:name]) %>
+{
+  <%= (enumeration[:constant].map { |constant| "\t"+constant_definition(constant) }).join("\n") %>
+};
+
+<% end # enumeration %>

data/lib/languages/objc/templates/TalkObjectList.h.erb

@@ -0,0 +1,4 @@
+<%= autogenerated_warning %>
+#import "TalkConstants.h"
+#import "TalkClassesForward.h"
+#import "TalkClasses.h"

data/lib/languages/objc/templates/class.h.erb

@@ -0,0 +1,21 @@
+<%= autogenerated_warning %>
+#import "TalkObjectList.h"
+
+<%= comment_block(@current_class) %>
+@interface <%= "#{truncated_name(@current_class)}" %> : <%= "#{superclass(@current_class)}" %>
+{
+<%=
+  lines = []
+  @current_class[:field].each do |field|
+    lines.push comment_block(field, 1)
+    lines.push "\t"+field_definition(@current_class, field) + "; // " + field[:type].join('')
+    lines.push ""
+  end
+
+  lines.join("\n")
+%>}
+
+<%= (@current_class[:field].map { |f| "@property #{field_tags(f)} #{field_definition(@current_class, f)};" }).join("\n") %>
++(NSString *) fullyQualifiedClassName;
+
+@end

data/lib/languages/objc/templates/class.m.erb

@@ -0,0 +1,43 @@
+<%= autogenerated_warning %>
+#define __CANONFILE__ "<%= truncated_name(@current_class) %>"
+#import "TalkObjectList.h"
+#import "TalkObject+Private.h"
+
+#if ! __has_feature(objc_arc)
+#error This file requires Automatic Reference Counting
+#endif
+
+@implementation <%= truncated_name(@current_class) %>
+<%= dynamic_body_for_named_wrapper %>
+<% unless trimmed_fields(@current_class).empty? then %>
+@synthesize <%= (trimmed_fields(@current_class).map { |f| mapped_name(@current_class, f[:name], :field) }).join(', ') %>;
+<% end %>
+
+-(void) initKeymaps
+{
+  [super initKeymaps];
+<% @target[:map].each do |map|
+    next unless map[:class_name] == truncated_name(@current_class[:name])%>
+  [self mapSerializedKey:@"<%= map[:field_name] %>" toLocalKey:@"<%= map[:new_field_name] %>"];
+<% end %>}
+
+<% unless (@current_class[:field].reject { |f| assist_line(f).nil? }).length == 0 then %>
+-(NSString *) containerStructureForLocalKey: (NSString *) localKey
+{<%
+  @current_class[:field].each do |field|
+    assist = assist_line(field)
+    unless assist.nil? %>
+  if([localKey isEqualToString:@"<%= mapped_name(@current_class, field[:name], :field) %>"]) return @"<%= assist %>";
+    <%
+    end
+  end
+  %>
+  return [super containerStructureForLocalKey:localKey];
+}
+<% end %>
++(NSString *) fullyQualifiedClassName
+{
+  return @"<%= @current_class[:name] %>";
+}
+
+@end

data/lib/parse_error.rb

@@ -0,0 +1,4 @@
+module Talk
+	class ParseError < StandardError
+	end
+end

data/lib/parser.rb

@@ -0,0 +1,119 @@
+require "parse_error.rb"
+require "context"
+
+module Talk
+  attr_reader :contexts, :finalized
+
+  @contexts = {}
+
+  class Parser
+    attr_accessor :basepath
+    
+    def self.error(tag, file, line, message)
+      near_msg = tag.nil? ? "" : " near @#{tag}"
+      raise ParseError, "#{file}:#{line}  parse error#{near_msg}: #{message}"
+    end
+
+    def initialize
+      @contexts = [ Context.context_for_name(:base).new("base", "n/a", "0") ]
+      @base = @contexts.first
+      @finalized = false
+      @closed_contexts = []
+    end
+
+    # signal that we are done parsing files, and it is time to do final validation
+    def finalize
+      close_active_context until @contexts.empty?
+      @closed_contexts.each { |ctx| ctx.finalize }
+      finalized = true
+    end
+
+    def results
+      finalize unless @finalized
+      @base.to_h
+    end
+
+    def trim_filename(filename)
+      if @basepath.nil? == false and filename.start_with? @basepath then
+        filename = filename[@basepath.length .. -1]
+        filename = filename[1..-1] while filename.start_with? "/"
+      end
+
+      filename
+    end
+
+    def parse_file(filename)
+      parse(filename, IO.read(filename))
+    end
+
+    def parse(filename, contents)
+      contents = contents.split("\n") unless contents.is_a? Array
+      contents.each_with_index { |line, line_num| parse_line(line.strip.split, filename, line_num+1) }
+    end
+
+    def parse_line(words, file, line)
+      return if line_is_comment?(words)
+
+      @file = trim_filename(file)
+      @line = line
+      words.each { |word| parse_word(word) }
+    end
+
+    def parse_word(word)
+      @word = word
+
+      if word_is_tag?(word) then
+        parse_tag(identifier_from_tag_word(word))
+      else
+        @contexts.last.parse(word, @file, @line)
+      end
+    end
+
+    def parse_tag(tag)
+      @tag = tag
+      @contexts.last.has_tag?(tag) ? parse_supported_tag : parse_unsupported_tag
+    end
+
+    def parse_supported_tag
+      new_context = @contexts.last.start_tag(@tag, @file, @line)
+      if new_context.nil? then
+        close_active_context
+      else
+        @contexts.push new_context
+        @closed_contexts.push new_context
+      end
+    end
+
+    def parse_unsupported_tag
+      stack = Array.new(@contexts)
+      stack.pop until stack.empty? or stack.last.has_tag? @tag
+
+      parse_error("tag not supported in @#{@contexts.last.tag.to_s}") if stack.empty?
+
+      close_active_context until @contexts.last == stack.last
+
+      parse_supported_tag
+    end
+
+    def close_active_context
+      @closed_contexts.push @contexts.pop
+      @contexts.last.end_tag(@closed_contexts.last) unless @contexts.empty?
+    end
+
+    def word_is_tag?(word)
+      word[0] == '@'
+    end
+
+    def identifier_from_tag_word(word)
+      word[1..-1].to_sym
+    end
+
+    def line_is_comment?(line)
+      line.length > 0 and line[0].length > 0 and line[0][0] == '#'
+    end
+
+    def parse_error(message)
+      raise Talk::Parser.error(@tag, @file, @line, message)
+    end
+  end
+end

data/lib/registry.rb

@@ -0,0 +1,151 @@
+class Array
+  def each_prefix
+    self.length.times do |i|
+      yield(self[0..i])
+    end
+  end
+end
+
+module Talk
+  class RegistryEntry
+    attr_reader :file, :line, :name
+
+    def initialize(name=nil, file=nil, line=nil)
+      @file = file
+      @line = line
+      @name = name
+      @children = {}
+    end
+
+    def make_entry(name, file, line)
+      @name = name
+      @file = file
+      @line = line
+    end
+
+    def [](key)
+      @children[key]
+    end
+
+    def []=(key, value)
+      @children[key] = value
+    end
+
+    def keys
+      @children.keys
+    end
+
+    def each(&block)
+      @children.each &block
+    end
+
+    def has_children?
+      not @children.empty?
+    end
+
+    def is_entry?
+      @file != nil
+    end
+
+    def to_s
+      is_entry? ? "#{@file}:#{@line}" : "container"
+    end
+  end
+
+  class Registry
+    class << self
+      def add(name, namespace, file, line, delimiter=nil)
+        if registered?(name, namespace) then
+          old_reg = get_registrations(name, namespace).last
+          Talk::Parser.error(nil, file, line, "Duplicate registration #{name} in #{namespace}; previously defined at #{old_reg}")
+        end
+
+        @registry ||= {}
+        @registry[namespace] ||= {}
+        split_name = delimiter.nil? ? [*name] : name.to_s.split(delimiter)
+
+        # create each level of the split name
+        level = @registry[namespace]
+        split_name[0..-2].each do |component| # all but the last component
+          level[component] ||= RegistryEntry.new
+          level = level[component]
+        end
+
+        level[split_name.last] ||= RegistryEntry.new(name, file, line)
+        level[split_name.last].make_entry(name, file, line) # in case it already existed as a container
+        add_reverse_lookup(split_name, namespace, level[split_name.last], delimiter)
+      end
+
+      def add_reverse_lookup(split_name, namespace, entry, delimiter)
+        @reverse ||= {}
+        @reverse[namespace] ||= {}
+        split_name.reverse.each_prefix do |prefix|
+          name = prefix.reverse.join(delimiter)
+          @reverse[namespace][name] ||= []
+          @reverse[namespace][name].push entry
+        end
+      end
+
+      def get_registrations(name, namespace, match_exact = false)
+        @registry ||= {}
+        exact = get_exact_registrations(name, namespace)
+        
+        return exact unless exact.empty?
+        return [] if match_exact
+
+        get_inexact_registrations(name, namespace)
+      end
+
+      def get_exact_registrations(name, namespace)
+        level = @registry[namespace]
+        [*name].each do |component|
+          return [] if level.nil?
+          level = level[component]
+        end
+
+        return [*level] if not level.nil? and level.is_entry?
+        []
+      end
+
+      def get_inexact_registrations(name, namespace)
+        return [] if @reverse.nil? or @reverse[namespace].nil? or @reverse[namespace][name].nil?
+        @reverse[namespace][name]
+      end
+
+      def registered?(name, namespace, match_exact = false)
+        not get_registrations(name, namespace, match_exact).empty?
+      end
+
+      def render_level(level, at_depth=1)
+        indent = "    "*at_depth
+        s = ""
+        level.keys.sort.each do |key|
+          value = level[key]
+          s += indent + key
+          s += " (entry from #{File.basename(value.file)}:#{value.line})" if value.is_entry?
+          s += "\n"
+          s += render_level(value, at_depth+1)
+        end
+
+        s
+      end
+
+      def reset
+        @registry = nil
+        @reverse = nil
+      end
+
+      def to_s
+        return "Empty registry" if @registry.nil? or @registry.empty?
+        s = ""
+        @registry.keys.sort.each do |namespace|
+          level = @registry[namespace]
+          s += "Namespace #{namespace}:\n"
+          s += render_level(level)
+        end
+
+        s
+      end
+    end
+  end
+end

data/lib/talk.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/ruby
+
+require 'parser'
+require 'languages/language.rb'
+

data/talk.gemspec

@@ -0,0 +1,18 @@
+Gem::Specification.new do |s|
+  s.name        = 'talk'
+  s.executables << 'talk'
+  s.version     = '2.0.2'
+  s.date        = '2014-05-14'
+  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.authors     = ["Jonas Acres"]
+  s.email       = 'jonas@becuddle.com'
+  s.homepage    = 'http://github.com/jonasacres/talk'
+  s.license     = 'GPLv2'
+
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|s|features)/})
+  s.require_paths = ["lib"]
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talk
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jonas Acres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies: []
 description: A lightweight language for specifying protocol contracts. Compiles to
   source in Java, Javascript, ObjC and Ruby.
@@ -18,7 +18,62 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
+- Gemfile
+- README.md
+- Rakefile
 - bin/talk
+- features/class-field.feature
+- features/class.feature
+- features/enumeration-constant.feature
+- features/enumeration.feature
+- features/glossary-term.feature
+- features/glossary.feature
+- features/step_definitions/class-field.rb
+- features/step_definitions/class.rb
+- features/step_definitions/enumeration-constant.rb
+- features/step_definitions/enumeration.rb
+- features/step_definitions/glossary-term.rb
+- features/step_definitions/glossary.rb
+- features/support/env.rb
+- lib/context.rb
+- lib/context_class.rb
+- lib/contexts/README.md
+- lib/contexts/base.rb
+- lib/contexts/boolean.rb
+- lib/contexts/class.rb
+- lib/contexts/constant.rb
+- lib/contexts/enumeration.rb
+- lib/contexts/field.rb
+- lib/contexts/glossary.rb
+- lib/contexts/inherits.rb
+- lib/contexts/map.rb
+- lib/contexts/meta.rb
+- lib/contexts/method.rb
+- lib/contexts/numeric.rb
+- lib/contexts/protocol.rb
+- lib/contexts/reference.rb
+- lib/contexts/string.rb
+- lib/contexts/target.rb
+- lib/contexts/term.rb
+- lib/languages/java/java.rb
+- lib/languages/java/templates/class.java.erb
+- lib/languages/java/templates/enumeration.java.erb
+- lib/languages/java/templates/glossary.java.erb
+- lib/languages/language.rb
+- lib/languages/objc/objc.rb
+- lib/languages/objc/templates/TalkClasses.h.erb
+- lib/languages/objc/templates/TalkClassesForward.h.erb
+- lib/languages/objc/templates/TalkConstants.h.erb
+- lib/languages/objc/templates/TalkObjectList.h.erb
+- lib/languages/objc/templates/class.h.erb
+- lib/languages/objc/templates/class.m.erb
+- lib/parse_error.rb
+- lib/parser.rb
+- lib/registry.rb
+- lib/talk.rb
+- talk.gemspec
 homepage: http://github.com/jonasacres/talk
 licenses:
 - GPLv2
@@ -43,4 +98,17 @@ rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Compile-to-source protocol contract specification language
-test_files: []
+test_files:
+- features/class-field.feature
+- features/class.feature
+- features/enumeration-constant.feature
+- features/enumeration.feature
+- features/glossary-term.feature
+- features/glossary.feature
+- features/step_definitions/class-field.rb
+- features/step_definitions/class.rb
+- features/step_definitions/enumeration-constant.rb
+- features/step_definitions/enumeration.rb
+- features/step_definitions/glossary-term.rb
+- features/step_definitions/glossary.rb
+- features/support/env.rb