stark 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee88e66907614d95a281f6fd2652090d72819597
-  data.tar.gz: 91e8a4938a10133026421032e509fa919a302662
+  metadata.gz: eb7324236d30ca7b3ac671be85de15c61711ca00
+  data.tar.gz: b66c8a55bbe142c278412b3a3275449cb52cba04
 SHA512:
-  metadata.gz: 15d9b264ee7df0283b7158eb8395d41ec4ef870188d0343f31e96b612ad9550c6c6b857a0eaf29eb9fd547215d30562fb17aaef4320e5fc09f57aa6e6fb20cef
-  data.tar.gz: 48be3431365f17b3684c6d0b0b82ffc857651d0ed2ca6c4dff10a750e2b067c74422a4400cdf0ad90867984d9b2abda25c9c07c0f41ba8c81b157e8bbb2d5381
+  metadata.gz: 1480bd6c16afaee07d84d803de9d816fe0a278e2287a79da0e9c12cc0e0b92a8679ac47baf5277ee83431b11cc4fded15f63646edcefec1441b301261cde1ba3
+  data.tar.gz: 4a0a15ae192c3f0cff13c49054ee4dde6414ae4c892059eca7ce8414dd811060098967139cf701b40f924d0a81038f6903ae98ff29afafd3fd3f00b8c4518edb

data/lib/stark.rb

@@ -2,7 +2,7 @@ require 'thrift'
 require 'logger'
 
 module Stark
-  VERSION = '0.9.3'
+  VERSION = '0.10.0'
 
   def self.logger
     @logger ||= ::Logger.new($stdout)

data/lib/stark/raw_parser.rb

@@ -13,8 +13,7 @@ class Stark::Parser
     # Prepares for parsing +str+.  If you define a custom initialize you must
     # call this method before #parse
     def setup_parser(str, debug=false)
-      @string = str
-      @pos = 0
+      set_string str, 0
       @memoizations = Hash.new { |h,k| h[k] = {} }
       @result = nil
       @failed_rule = nil
@@ -27,7 +26,6 @@ class Stark::Parser
     attr_reader :failing_rule_offset
     attr_accessor :result, :pos
 
-    
     def current_column(target=pos)
       if c = string.rindex("\n", target-1)
         return target - c - 1
@@ -61,6 +59,13 @@ class Stark::Parser
       @string[start..@pos-1]
     end
 
+    # Sets the string and current parsing position for the parser.
+    def set_string string, pos
+      @string = string
+      @string_size = string ? string.size : 0
+      @pos = pos
+    end
+
     def show_pos
       width = 10
       if @pos < width
@@ -167,19 +172,19 @@ class Stark::Parser
       return nil
     end
 
-    if "".respond_to? :getbyte
+    if "".respond_to? :ord
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
-        s = @string.getbyte @pos
+        s = @string[@pos].ord
         @pos += 1
         s
       end
     else
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
@@ -228,8 +233,7 @@ class Stark::Parser
       old_pos = @pos
       old_string = @string
 
-      @pos = other.pos
-      @string = other.string
+      set_string other.string, other.pos
 
       begin
         if val = __send__(rule, *args)
@@ -240,8 +244,7 @@ class Stark::Parser
         end
         val
       ensure
-        @pos = old_pos
-        @string = old_string
+        set_string old_string, old_pos
       end
     end
 
@@ -494,60 +497,63 @@ class Stark::Parser
       attr_reader :fields
     end
   end
-  def comment(text)
-    AST::Comment.new(text)
-  end
-  def const_dbl(value)
-    AST::ConstDouble.new(value)
-  end
-  def const_id(value)
-    AST::ConstIdentifier.new(value)
-  end
-  def const_int(value)
-    AST::ConstInt.new(value)
-  end
-  def const_list(values)
-    AST::ConstList.new(values)
-  end
-  def const_map(values)
-    AST::ConstMap.new(values)
-  end
-  def const_str(value)
-    AST::ConstString.new(value)
-  end
-  def enum(name, values)
-    AST::Enum.new(name, values)
-  end
-  def exception(name, fields)
-    AST::Exception.new(name, fields)
-  end
-  def field(index, type, name, value, options)
-    AST::Field.new(index, type, name, value, options)
-  end
-  def function(name, return_type, arguments, throws, options)
-    AST::Function.new(name, return_type, arguments, throws, options)
-  end
-  def include(path)
-    AST::Include.new(path)
-  end
-  def list(value)
-    AST::List.new(value)
-  end
-  def map(key, value)
-    AST::Map.new(key, value)
-  end
-  def namespace(lang, namespace)
-    AST::Namespace.new(lang, namespace)
-  end
-  def service(name, functions)
-    AST::Service.new(name, functions)
-  end
-  def set(value)
-    AST::Set.new(value)
-  end
-  def struct(type, name, fields)
-    AST::Struct.new(type, name, fields)
+  module ASTConstruction
+    def comment(text)
+      AST::Comment.new(text)
+    end
+    def const_dbl(value)
+      AST::ConstDouble.new(value)
+    end
+    def const_id(value)
+      AST::ConstIdentifier.new(value)
+    end
+    def const_int(value)
+      AST::ConstInt.new(value)
+    end
+    def const_list(values)
+      AST::ConstList.new(values)
+    end
+    def const_map(values)
+      AST::ConstMap.new(values)
+    end
+    def const_str(value)
+      AST::ConstString.new(value)
+    end
+    def enum(name, values)
+      AST::Enum.new(name, values)
+    end
+    def exception(name, fields)
+      AST::Exception.new(name, fields)
+    end
+    def field(index, type, name, value, options)
+      AST::Field.new(index, type, name, value, options)
+    end
+    def function(name, return_type, arguments, throws, options)
+      AST::Function.new(name, return_type, arguments, throws, options)
+    end
+    def include(path)
+      AST::Include.new(path)
+    end
+    def list(value)
+      AST::List.new(value)
+    end
+    def map(key, value)
+      AST::Map.new(key, value)
+    end
+    def namespace(lang, namespace)
+      AST::Namespace.new(lang, namespace)
+    end
+    def service(name, functions)
+      AST::Service.new(name, functions)
+    end
+    def set(value)
+      AST::Set.new(value)
+    end
+    def struct(type, name, fields)
+      AST::Struct.new(type, name, fields)
+    end
   end
+  include ASTConstruction
   def setup_foreign_grammar; end
 
   # intconstant = /([+-]?[0-9]+)/
@@ -2127,7 +2133,7 @@ class Stark::Parser
     return _tmp
   end
 
-  # EnumDef = (CaptureDocText tok_identifier "=" tok_int_constant CommaOrSemicolonOptional | CaptureDocText tok_identifier CommaOrSemicolonOptional)
+  # EnumDef = (CaptureDocText tok_identifier osp "=" osp tok_int_constant CommaOrSemicolonOptional | CaptureDocText tok_identifier CommaOrSemicolonOptional)
   def _EnumDef
 
     _save = self.pos
@@ -2145,11 +2151,21 @@ class Stark::Parser
           self.pos = _save1
           break
         end
+        _tmp = apply(:_osp)
+        unless _tmp
+          self.pos = _save1
+          break
+        end
         _tmp = match_string("=")
         unless _tmp
           self.pos = _save1
           break
         end
+        _tmp = apply(:_osp)
+        unless _tmp
+          self.pos = _save1
+          break
+        end
         _tmp = apply(:_tok_int_constant)
         unless _tmp
           self.pos = _save1
@@ -2287,7 +2303,7 @@ class Stark::Parser
     return _tmp
   end
 
-  # Const = "const" - FieldType tok_identifier "=" ConstValue CommaOrSemicolonOptional
+  # Const = "const" - FieldType tok_identifier osp "=" osp ConstValue CommaOrSemicolonOptional
   def _Const
 
     _save = self.pos
@@ -2312,11 +2328,21 @@ class Stark::Parser
         self.pos = _save
         break
       end
+      _tmp = apply(:_osp)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _tmp = match_string("=")
       unless _tmp
         self.pos = _save
         break
       end
+      _tmp = apply(:_osp)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _tmp = apply(:_ConstValue)
       unless _tmp
         self.pos = _save
@@ -3097,7 +3123,7 @@ class Stark::Parser
     return _tmp
   end
 
-  # Function = CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name osp "(" FieldList?:args ")" Throws?:t CommaOrSemicolonOptional {function(name, rt, args, t, o)}
+  # Function = CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name osp "(" obsp FieldList?:args ")" Throws?:t CommaOrSemicolonOptional {function(name, rt, args, t, o)}
   def _Function
 
     _save = self.pos
@@ -3146,6 +3172,11 @@ class Stark::Parser
         self.pos = _save
         break
       end
+      _tmp = apply(:_obsp)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _save2 = self.pos
       _tmp = apply(:_FieldList)
       @result = nil unless _tmp
@@ -3230,7 +3261,7 @@ class Stark::Parser
     return _tmp
   end
 
-  # Throws = osp "throws" osp "(" FieldList ")"
+  # Throws = osp "throws" osp "(" obsp FieldList ")"
   def _Throws
 
     _save = self.pos
@@ -3255,6 +3286,11 @@ class Stark::Parser
         self.pos = _save
         break
       end
+      _tmp = apply(:_obsp)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _tmp = apply(:_FieldList)
       unless _tmp
         self.pos = _save
@@ -4060,11 +4096,11 @@ class Stark::Parser
   Rules[:_CommaOrSemicolonOptional] = rule_info("CommaOrSemicolonOptional", "(\",\" | \";\")? obsp")
   Rules[:_Enum] = rule_info("Enum", "\"enum\" - tok_identifier:name osp \"{\" obsp EnumDefList:vals obsp \"}\" {enum(name, vals)}")
   Rules[:_EnumDefList] = rule_info("EnumDefList", "(EnumDefList:l EnumDef:e { l + [e] } | EnumDef:e { [e] })")
-  Rules[:_EnumDef] = rule_info("EnumDef", "(CaptureDocText tok_identifier \"=\" tok_int_constant CommaOrSemicolonOptional | CaptureDocText tok_identifier CommaOrSemicolonOptional)")
+  Rules[:_EnumDef] = rule_info("EnumDef", "(CaptureDocText tok_identifier osp \"=\" osp tok_int_constant CommaOrSemicolonOptional | CaptureDocText tok_identifier CommaOrSemicolonOptional)")
   Rules[:_Senum] = rule_info("Senum", "\"senum\" - tok_identifier \"{\" SenumDefList \"}\"")
   Rules[:_SenumDefList] = rule_info("SenumDefList", "(SenumDefList SenumDef | nothing)")
   Rules[:_SenumDef] = rule_info("SenumDef", "tok_literal CommaOrSemicolonOptional")
-  Rules[:_Const] = rule_info("Const", "\"const\" - FieldType tok_identifier \"=\" ConstValue CommaOrSemicolonOptional")
+  Rules[:_Const] = rule_info("Const", "\"const\" - FieldType tok_identifier osp \"=\" osp ConstValue CommaOrSemicolonOptional")
   Rules[:_ConstValue] = rule_info("ConstValue", "(tok_int_constant:i {const_int(i)} | tok_literal:s {const_str(s)} | tok_identifier:i {const_id(i)} | ConstList | ConstMap | tok_dub_constant:d {const_dbl(d)})")
   Rules[:_ConstList] = rule_info("ConstList", "\"[\" osp ConstListContents*:l osp \"]\" {const_list(l)}")
   Rules[:_ConstListContents] = rule_info("ConstListContents", "ConstValue:i CommaOrSemicolonOptional osp {i}")
@@ -4080,9 +4116,9 @@ class Stark::Parser
   Rules[:_Service] = rule_info("Service", "\"service\" - tok_identifier:name - Extends? osp \"{\" obsp FunctionList?:funcs obsp \"}\" {service(name, funcs)}")
   Rules[:_Extends] = rule_info("Extends", "\"extends\" - tok_identifier")
   Rules[:_FunctionList] = rule_info("FunctionList", "(FunctionList:l Function:f { l + [f] } | Function:f { [f] })")
-  Rules[:_Function] = rule_info("Function", "CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name osp \"(\" FieldList?:args \")\" Throws?:t CommaOrSemicolonOptional {function(name, rt, args, t, o)}")
+  Rules[:_Function] = rule_info("Function", "CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name osp \"(\" obsp FieldList?:args \")\" Throws?:t CommaOrSemicolonOptional {function(name, rt, args, t, o)}")
   Rules[:_OneWay] = rule_info("OneWay", "(\"oneway\" | \"async\") - { :oneway }")
-  Rules[:_Throws] = rule_info("Throws", "osp \"throws\" osp \"(\" FieldList \")\"")
+  Rules[:_Throws] = rule_info("Throws", "osp \"throws\" osp \"(\" obsp FieldList \")\"")
   Rules[:_FieldList] = rule_info("FieldList", "(FieldList:l Field:f { l + [f] } | Field:f { [f] })")
   Rules[:_Field] = rule_info("Field", "CaptureDocText FieldIdentifier?:i osp FieldRequiredness?:req osp FieldType:t osp tok_identifier:n osp FieldValue?:val CommaOrSemicolonOptional {field(i,t,n,val,req)}")
   Rules[:_FieldIdentifier] = rule_info("FieldIdentifier", "tok_int_constant:n \":\" {n}")

data/lib/stark/ruby.rb

@@ -62,6 +62,29 @@ module Stark
       end
     end
 
+    def const_to_ruby(val)
+      case val
+      when Stark::Parser::AST::ConstString
+        return %Q!"#{val.value}"!
+      when Stark::Parser::AST::ConstInt
+        return val.value
+      when Stark::Parser::AST::ConstDouble
+        return val.value
+      when Stark::Parser::AST::ConstIdentifier
+        return val.value.to_sym
+      when Stark::Parser::AST::ConstList
+        parts = val.values.map { |x| const_to_ruby(x) }
+        return "[#{parts.join(', ')}]"
+      when Stark::Parser::AST::ConstMap
+        parts = val.values.map { |(k,v)|
+                  const_to_ruby(k) + " => " + const_to_ruby(v)
+                }
+        return "{#{parts.join(', ')}}"
+      else
+        raise "Unsupported default type: #{val.class}"
+      end
+    end
+
     def write_field_declarations(fields)
       max_field_len = fields.inject(0) {|max,f| f.name.length > max ? f.name.length : max }
       max_index_len = fields.inject(0) {|max,f| f.index.to_s.length > max ? f.index.to_s.length : max }
@@ -73,7 +96,14 @@ module Stark
           current_index = f.index
         end
         current_index += 1
-        o("attr_accessor :%-*s  # %*s: %s" % [max_field_len, f.name, max_index_len, f.index, object_type(f.type)])
+
+        if f.value
+          o("attr_writer :%-*s  # %*s: %s" % [max_field_len, f.name, max_index_len, f.index, object_type(f.type)])
+
+          o("def %s; @%s || %s; end" % [f.name, f.name, const_to_ruby(f.value)])
+        else
+          o("attr_accessor :%-*s  # %*s: %s" % [max_field_len, f.name, max_index_len, f.index, object_type(f.type)])
+        end
       end
     end
 

data/lib/stark/thrift.kpeg

@@ -217,7 +217,7 @@ Enum = "enum" - tok_identifier:name osp "{" obsp EnumDefList:vals obsp "}" ~enum
 EnumDefList = EnumDefList:l EnumDef:e { l + [e] }
             | EnumDef:e { [e] }
 
-EnumDef = CaptureDocText tok_identifier "=" tok_int_constant CommaOrSemicolonOptional
+EnumDef = CaptureDocText tok_identifier osp "=" osp tok_int_constant CommaOrSemicolonOptional
         | CaptureDocText tok_identifier CommaOrSemicolonOptional
 
 Senum = "senum" - tok_identifier "{" SenumDefList "}"
@@ -227,7 +227,7 @@ SenumDefList = SenumDefList SenumDef
 
 SenumDef = tok_literal CommaOrSemicolonOptional
 
-Const = "const" - FieldType tok_identifier "=" ConstValue CommaOrSemicolonOptional
+Const = "const" - FieldType tok_identifier osp "=" osp ConstValue CommaOrSemicolonOptional
 
 ConstValue = tok_int_constant:i ~const_int(i)
            | tok_literal:s ~const_str(s)
@@ -274,12 +274,12 @@ FunctionList = FunctionList:l Function:f { l + [f] }
              | Function:f { [f] }
 
 Function = CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name
-           osp "(" FieldList?:args ")" Throws?:t CommaOrSemicolonOptional
+           osp "(" obsp FieldList?:args ")" Throws?:t CommaOrSemicolonOptional
            ~function(name, rt, args, t, o)
 
 OneWay = ("oneway" | "async") - { :oneway }
 
-Throws = osp "throws" osp "(" FieldList ")"
+Throws = osp "throws" osp "(" obsp FieldList ")"
 
 FieldList = FieldList:l Field:f { l + [f] }
           | Field:f { [f] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stark
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
 description: Optimized thrift bindings for ruby.
 email:
 - evan@phx.io
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Optimized thrift bindings for ruby.