msgpack-idl 0.1.0 → 0.1.1

data/lib/msgpack/idl/ir.rb

@@ -115,6 +115,11 @@ module IR
 		def map_type?
 			@generic_type == Primitive.map
 		end
+
+		def ==(o)
+			o.is_a?(ParameterizedType) && @generic_type == o.generic_type &&
+				@type_params == o.type_params
+		end
 	end
 
 	class TypeParameterSymbol
@@ -138,6 +143,11 @@ module IR
 		def map_type?
 			false
 		end
+
+		def ==(o)
+			o.is_a?(GenericType) && @name == o.name &&
+				@type_params.size == o.type_params.size
+		end
 	end
 
 	class PrimitiveGenericType < GenericType
@@ -342,32 +352,47 @@ module IR
 			@functions = funcs
 		end
 		attr_reader :version, :functions
+		attr_writer :functions
 	end
 
 	class Function
-		def initialize(name, return_type, args, super_version, super_func)
+		def initialize(name, return_type, args, exceptions)
 			@name = name
 			@return_type = return_type
 			@args = args
-			@super_version = super_version
-			@super_func = super_func
+			@exceptions = exceptions
 			@max_id = @args.map {|a| a.id }.max || 0
 			@max_required_id = @args.select {|a| a.required? }.map {|a| a.id }.max || 0
 		end
-		attr_reader :name, :return_type, :args
-		attr_reader :super_version, :super_func
+		attr_reader :name, :return_type, :args, :exceptions
 		attr_reader :max_id, :max_required_id
-		attr_writer :super_version, :super_func
 
 		def super_class; nil; end
 		alias new_fields args
 		alias all_fields args
 
+		def inherited?
+			false
+		end
+
 		def [](id)
 			@args.find {|a| a.id == id }
 		end
 	end
 
+	class InheritedFunction < Function
+		def initialize(inherit_version, inherit_func)
+			super(inherit_func.name, inherit_func.return_type, inherit_func.args, inherit_func.exceptions)
+			@inherit_version = inherit_version
+			@inherit_func = inherit_func
+		end
+		attr_reader :inherit_version, :inherit_func
+
+		def inherited?
+			true
+		end
+	end
+
 	class Argument < Field
 	end
 

data/lib/msgpack/idl/parser/rule.rb

@@ -149,7 +149,7 @@ class ParsletParser < Parslet::Parser
 			service_name.as(:service_name) >>
 			service_version.maybe.as(:service_version) >>
 		k_lwing >>
-			func.repeat.as(:service_funcs) >>
+			service_def.repeat.as(:service_funcs) >>
 		k_rwing
 	}
 
@@ -159,6 +159,19 @@ class ParsletParser < Parslet::Parser
 			(str('0') | (match('[1-9]') >> match('[0-9]').repeat)).as(:val_int)
 	}
 
+	rule(:service_def) {
+		inherit | func
+	}
+
+	rule(:inherit) {
+		k_inherit >>
+		(
+			k_asterisk.as(:inherit_all) |
+			func.as(:inherit_func) |
+			func_name.as(:inherit_name)
+		)
+	}
+
 	rule(:func) {
 		return_type.as(:return_type) >>
 		func_name.as(:func_name) >>
@@ -169,6 +182,10 @@ class ParsletParser < Parslet::Parser
 		eol
 	}
 
+	rule(:func_modifier) {
+		k_obsolete.as(:val_obsolete)
+	}
+
 	sequence :func_args_seq, :k_comma, :field_element
 
 	rule(:func_args) {
@@ -395,6 +412,7 @@ class ParsletParser < Parslet::Parser
 	keyword('application')
 	keyword('optional')
 	keyword('required')
+	keyword('inherit')
 	keyword('obsolete')
 	keyword('throws')
 	keyword('default')
@@ -420,6 +438,7 @@ class ParsletParser < Parslet::Parser
 	separator('!', :k_bang)
 	separator('?', :k_question)
 	separator('.', :k_dot)
+	separator('*', :k_asterisk)
 
 	LINE_HEAD_FORMAT = " % 4d: "
 	LINE_HEAD_SIZE = (LINE_HEAD_FORMAT % 0).size
@@ -488,8 +507,6 @@ class ParsletParser < Parslet::Parser
 			out.puts ln
 		}
 
-		out.puts ""
-
 		out
 	end
 end

data/lib/msgpack/idl/parser/transform.rb

@@ -18,6 +18,11 @@
 module MessagePack
 module IDL
 
+if defined?(RUBY_VERSION) && RUBY_VERSION >= "1.9.0" && RUBY_VERSION < "1.9.2"
+	class Parslet::Pattern::Context
+		AST = MessagePack::IDL::AST
+	end
+end
 
 class ParsletTransform < Parslet::Transform
 	rule(:sequence_x => simple(:x)) {
@@ -131,24 +136,16 @@ class ParsletTransform < Parslet::Transform
 		AST::Func.new(n, rt, a, ex)
 	}
 
-	rule(:service_description => sequence(:s)) {
-		current = AST::ServiceVersion.new(0, [])
-		versions = [current]
-		s.each {|l|
-			case l
-			when Integer
-				v = versions.find {|v| v.version == l }
-				if v
-					current = v
-				else
-					current = AST::ServiceVersion.new(l, [])
-					versions << current
-				end
-			else
-				current.funcs << l
-			end
-		}
-		versions
+	rule(:inherit_all => simple(:_)) {
+		AST::InheritAll.new
+	}
+
+	rule(:inherit_name => simple(:n)) {
+		AST::InheritName.new(n)
+	}
+
+	rule(:inherit_func => simple(:f)) {
+		AST::InheritFunc.new(f.name, f.return_type, f.args, f.exceptions)
 	}
 
 	rule(:service_name => simple(:n),

data/lib/msgpack/idl/version.rb

@@ -1,7 +1,7 @@
 module MessagePack
 module IDL
 
-VERSION = '0.1.0'
+VERSION = '0.1.1'
 
 end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack-idl
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 +09:00
+date: 2011-04-26 00:00:00 +09:00
 default_executable: msgpack-idl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,9 @@ files:
 - lib/msgpack/idl/ast.rb
 - lib/msgpack/idl/command/example.rb
 - lib/msgpack/idl/command/idl.rb
+- lib/msgpack/idl/command/vimcolor.rb
+- lib/msgpack/idl/command/vimcolor/mark.vim
+- lib/msgpack/idl/command/vimcolor/msgspec.vim
 - lib/msgpack/idl/error.rb
 - lib/msgpack/idl/evaluator.rb
 - lib/msgpack/idl/generator.rb