cplus2ruby 1.1.2 → 1.2.0

data/cplus2ruby.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name = "cplus2ruby"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
   s.summary = "Gluing C++ and Ruby together in an OO manner"
   s.files = Dir['**/*']
   s.add_dependency('facets', '>= 2.3.0')

data/lib/cplus2ruby/code_generator.rb

@@ -25,9 +25,10 @@ class Cplus2Ruby::CodeGenerator
   end
 
   def all_properties_of(klass)
-    klass.local_annotations.each do |name, options|
-      next if options[:class] != Cplus2Ruby::Property
-      yield name, options
+    klass.local_annotations.sort_by {|name, options| options[:order] || 0}.
+      each do |name, options|
+        next if options[:class] != Cplus2Ruby::Property
+        yield name, options
     end
   end
 

data/lib/cplus2ruby/cpp_code_generator.rb

@@ -50,7 +50,7 @@ class Cplus2Ruby::CppCodeGenerator < Cplus2Ruby::CodeGenerator
   def gen_free_or_mark_method(klass, kind)
     stmts = stmts_for_free_or_mark_method(klass, kind)
     return "" if stmts.empty?
-    stmts << "super::__#{kind}__()"
+    stmts.unshift("super::__#{kind}__()")
     %[
       void #{klass.name}::__#{kind}__()
       {

data/lib/cplus2ruby/model.rb

@@ -14,12 +14,17 @@ class Cplus2Ruby::Model
     @order_cnt += 1
   end
 
+  def next_prop_cnt
+    @prop_cnt += 1
+  end
+
   def initialize
     @typing = Cplus2Ruby::Typing.new
     @code = ""
     @includes = []
     @settings = default_settings()
     @order_cnt = 0
+    @prop_cnt = 0
   end
 
   def finish!
@@ -140,7 +145,8 @@ end
 module Cplus2Ruby::Entity
   def property(name, type=Object, options={})
     raise ArgumentError if options[:type]
-    options[:type] = type
+    options[:type] = type || Object
+    options[:order] = Cplus2Ruby.model.next_prop_cnt 
     ann! name, Cplus2Ruby::Property, options
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cplus2ruby
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - Michael Neumann
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-01 00:00:00 +02:00
+date: 2008-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,20 +30,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- cplus2ruby.gemspec
-- example.rb
-- README
+- test
+- test/test_mixin.rb
 - lib
 - lib/cplus2ruby.rb
 - lib/cplus2ruby
-- lib/cplus2ruby/model.rb
+- lib/cplus2ruby/code_generator.rb
 - lib/cplus2ruby/cpp_code_generator.rb
 - lib/cplus2ruby/compiler.rb
 - lib/cplus2ruby/wrapper_code_generator.rb
 - lib/cplus2ruby/typing.rb
-- lib/cplus2ruby/code_generator.rb
-- test
-- test/test_mixin.rb
+- lib/cplus2ruby/model.rb
+- README
+- example.rb
+- cplus2ruby.gemspec
 has_rdoc: false
 homepage: http://www.ntecs.de/projects/cplus2ruby/
 post_install_message: