cplus2ruby 1.0.0 → 1.1.0

data/README

@@ -84,7 +84,7 @@ EXAMPLE
       #
       # Generate C++ code, compile and load shared library. 
       #
-      Cplus2Ruby.startup('work/neural') 
+      Cplus2Ruby.commit('work/neural') 
 
       n = Neuron.new
       n.id = "n1"
@@ -189,7 +189,7 @@ FEATURES
 
   Compilation flags etc.:
 
-    Cplus2Ruby.startup(module_name, force_compilation, cflags, ldflags) 
+    Cplus2Ruby.commit(module_name, force_compilation, cflags, ldflags) 
 
   For example:
 
@@ -197,7 +197,7 @@ FEATURES
     # force_compilation => true regenerates and recompiles the 
     # C++ code every time.
     #
-    Cplus2Ruby.startup("work/mymodule", true, '-DNDEBUG -Winline -Wall', '-lm') 
+    Cplus2Ruby.commit("work/mymodule", true, '-DNDEBUG -Winline -Wall', '-lm') 
 
 BUGS
 

data/cplus2ruby.gemspec

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

data/example.rb

@@ -34,7 +34,7 @@ if __FILE__ == $0
   #
   # Generate C++ code, compile and load shared library. 
   #
-  Cplus2Ruby.startup('work/neural') 
+  Cplus2Ruby.commit('work/neural') 
 
   n = Neuron.new
   n.id = "n1"

data/lib/cplus2ruby/compiler.rb

@@ -13,7 +13,7 @@ class Cplus2Ruby::Compiler
     wrap_cg.write_files(mod_name)
   end
 
-  def startup(file, force_compilation=false, cflags="", libs="", &block) 
+  def commit(file, force_compilation=false, cflags="", libs="", &block) 
     n = names(file)
 
     if not force_compilation
@@ -30,6 +30,8 @@ class Cplus2Ruby::Compiler
     block.call if block
   end
 
+  alias startup commit
+
   #
   # Compiles +file+. Returns the name of the shared object to
   # use by +require+.

data/lib/cplus2ruby/model.rb

@@ -45,27 +45,34 @@ class Cplus2Ruby::Model
     usage_cnt
   end
 
-  def entities_ordered
-    entities().sort {|a, b|
-      if a.ancestors.include?(b)
-        # a 'after' b (a > b)
-        1
-      elsif b.ancestors.include?(a)
+  def cmp_entities(a,b)
+    if a.ancestors.include?(b)
+      # a 'after' b (a > b)
+      1
+    elsif b.ancestors.include?(a)
+      -1
+    else
+      ea = entity_usage(a, b)
+      eb = entity_usage(b, a)
+
+      if ea > 0 and eb == 0
         -1
+      elsif eb > 0 and ea == 0 
+        1
       else
-        ea = entity_usage(a, b)
-        eb = entity_usage(b, a)
-
-        if ea > 0 and eb == 0
-          -1
-        elsif eb > 0 and ea == 0 
-          1
-        else
-          ao = (a.heritage(:__options__) || {})[:order] || 0
-          bo = (b.heritage(:__options__) || {})[:order] || 0
-          ao <=> bo
-        end
+        ao = (a.heritage(:__options__) || {})[:order] || 0
+        bo = (b.heritage(:__options__) || {})[:order] || 0
+        ao <=> bo
       end
+    end
+  end
+
+  def entities_ordered
+    ents = entities()
+    ents.sort_by {|entity|
+      ents.inject(0) {|accum, e|
+        accum + (cmp_entities(entity, e) == 1 ? 1 : 0)
+      }
     }
   end
 
@@ -114,9 +121,13 @@ module Cplus2Ruby
     h.each {|from, to| model.typing.alias_entry(from, to)}
   end
 
-  def self.startup(*args, &block)
+  def self.commit(*args, &block)
     self.model.finish!
-    Cplus2Ruby::Compiler.new(self.model).startup(*args, &block)
+    Cplus2Ruby::Compiler.new(self.model).commit(*args, &block)
+  end
+
+  def self.startup(*args, &block)
+    commit(*args, &block)
   end
 
   def self.compile(*args)

data/test/test_mixin.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-$LOAD_PATH.unshift '../src'
+$LOAD_PATH.unshift '../lib'
 require 'cplus2ruby'
 
 module Mixin1; cplus2ruby
@@ -18,7 +18,7 @@ class C < B; cplus2ruby
   property :z, :int
 end
 
-Cplus2Ruby.startup('work/test_mixin', true)
+Cplus2Ruby.commit('work/test_mixin', true)
 t = B.new
 t.y = 2
 p t.y

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cplus2ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Michael Neumann
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-16 00:00:00 +01:00
+date: 2008-03-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,14 +44,6 @@ files:
 - lib/cplus2ruby/code_generator.rb
 - test
 - test/test_mixin.rb
-- test/work
-- test/work/test_mixin.h
-- test/work/test_mixin.o
-- test/work/test_mixin.cc
-- test/work/Makefile
-- test/work/test_mixin.so
-- test/work/test_mixin_wrap.cc
-- test/work/test_mixin_wrap.o
 has_rdoc: false
 homepage: http://www.ntecs.de/projects/cplus2ruby/
 post_install_message: 

data/test/work/Makefile

@@ -1,149 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /usr/local/lib/ruby/1.8/i386-freebsd7
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr/local
-exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
-localedir = $(datarootdir)/locale
-htmldir = $(docdir)
-datadir = $(datarootdir)
-includedir = $(prefix)/include
-infodir = $(DESTDIR)/usr/local/info/
-sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/usr/local/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
-
-CC = cc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC  
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.  -rdynamic  -Wl,-soname,$(.TARGET) 
-LDSHARED = cc -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby18
-RUBY_SO_NAME = ruby18
-arch = i386-freebsd7
-sitearch = i386-freebsd7
-ruby_version = 1.8
-ruby = /usr/local/bin/ruby18
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c -o root -g wheel
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = install  -o root -g wheel -m 444
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L'.' -L'$(libdir)' -Wl,-R'$(libdir)'
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lcrypt -lm  -rpath=/usr/lib:/usr/local/lib -pthread  -lc -lstdc++ 
-SRCS = test_mixin.cc test_mixin_wrap.cc
-OBJS = test_mixin.o test_mixin_wrap.o
-TARGET = test_mixin
-DLLIB = $(TARGET).so
-EXTSTATIC = 
-STATIC_LIB = 
-
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb install
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h

data/test/work/test_mixin.cc

@@ -1,23 +0,0 @@
-#include "test_mixin.h"
-
-
-      A::A()
-      {
-        this->y = 0;
-      }
-    
-
-
-      B::B()
-      {
-        this->a = 0;
-      }
-    
-
-
-      C::C()
-      {
-        this->z = 0;
-      }
-    
-

data/test/work/test_mixin.h

@@ -1,51 +0,0 @@
-#include <stdlib.h>
-#include "ruby.h"
-      struct RubyObject {
-        VALUE __obj__;
-        RubyObject() { __obj__ = Qnil; }
-        virtual ~RubyObject() {};
-        static void __free(void *ptr) { ((RubyObject*)ptr)->__free__(); }
-        static void __mark(void *ptr) { ((RubyObject*)ptr)->__mark__(); }
-        virtual void __free__() { delete this; }
-        virtual void __mark__() { }
-      };
-    struct A;
-struct B;
-struct C;
-
-        struct A : RubyObject
-        {
-          typedef RubyObject super;
-
-          A();
-
-          
-          
-          
-          int y;
-        };
-      
-        struct B : A
-        {
-          typedef A super;
-
-          B();
-
-          
-          
-          
-          int a;
-        };
-      
-        struct C : B
-        {
-          typedef B super;
-
-          C();
-
-          
-          
-          
-          int z;
-        };
-      

data/test/work/test_mixin_wrap.cc

@@ -1,105 +0,0 @@
-#include "test_mixin.h"
-
-
-      static VALUE
-      A_alloc__(VALUE klass)
-      {
-        A *__cobj__;
-        __cobj__ = new A();
-        __cobj__->__obj__ = Data_Wrap_Struct(klass, RubyObject::__mark, RubyObject::__free, __cobj__);
-        return __cobj__->__obj__;
-      }
-    static VALUE
-A_get__y(VALUE __self__)
-{
-int __res__;
-A *__cobj__;
-Check_Type(__self__, T_DATA);
-__cobj__ = (A*) DATA_PTR(__self__);
-__res__ = __cobj__->y;
-return INT2NUM(__res__);
-}
-static VALUE
-A_set__y(VALUE __self__, VALUE __val__)
-{
-A *__cobj__;
-Check_Type(__self__, T_DATA);
-__cobj__ = (A*) DATA_PTR(__self__);
-;
-__cobj__->y = (int)NUM2INT(__val__);
-return Qnil;
-}
-
-      static VALUE
-      B_alloc__(VALUE klass)
-      {
-        B *__cobj__;
-        __cobj__ = new B();
-        __cobj__->__obj__ = Data_Wrap_Struct(klass, RubyObject::__mark, RubyObject::__free, __cobj__);
-        return __cobj__->__obj__;
-      }
-    static VALUE
-B_get__a(VALUE __self__)
-{
-int __res__;
-B *__cobj__;
-Check_Type(__self__, T_DATA);
-__cobj__ = (B*) DATA_PTR(__self__);
-__res__ = __cobj__->a;
-return INT2NUM(__res__);
-}
-static VALUE
-B_set__a(VALUE __self__, VALUE __val__)
-{
-B *__cobj__;
-Check_Type(__self__, T_DATA);
-__cobj__ = (B*) DATA_PTR(__self__);
-;
-__cobj__->a = (int)NUM2INT(__val__);
-return Qnil;
-}
-
-      static VALUE
-      C_alloc__(VALUE klass)
-      {
-        C *__cobj__;
-        __cobj__ = new C();
-        __cobj__->__obj__ = Data_Wrap_Struct(klass, RubyObject::__mark, RubyObject::__free, __cobj__);
-        return __cobj__->__obj__;
-      }
-    static VALUE
-C_get__z(VALUE __self__)
-{
-int __res__;
-C *__cobj__;
-Check_Type(__self__, T_DATA);
-__cobj__ = (C*) DATA_PTR(__self__);
-__res__ = __cobj__->z;
-return INT2NUM(__res__);
-}
-static VALUE
-C_set__z(VALUE __self__, VALUE __val__)
-{
-C *__cobj__;
-Check_Type(__self__, T_DATA);
-__cobj__ = (C*) DATA_PTR(__self__);
-;
-__cobj__->z = (int)NUM2INT(__val__);
-return Qnil;
-}
-extern "C" void Init_test_mixin()
-{
-  VALUE klass;
-  klass = rb_eval_string("A");
-  rb_define_alloc_func(klass, A_alloc__);
-  rb_define_method(klass, "y", (VALUE(*)(...))A_get__y, 0);
-rb_define_method(klass, "y=", (VALUE(*)(...))A_set__y, 1);
-  klass = rb_eval_string("B");
-  rb_define_alloc_func(klass, B_alloc__);
-  rb_define_method(klass, "a", (VALUE(*)(...))B_get__a, 0);
-rb_define_method(klass, "a=", (VALUE(*)(...))B_set__a, 1);
-  klass = rb_eval_string("C");
-  rb_define_alloc_func(klass, C_alloc__);
-  rb_define_method(klass, "z", (VALUE(*)(...))C_get__z, 0);
-rb_define_method(klass, "z=", (VALUE(*)(...))C_set__z, 1);
-}