cheri 0.0.7 → 0.0.8

data/lib/cheri/awt.rb

@@ -22,10 +22,7 @@
 #++
 #
 
-if (defined?JRUBY_VERSION) &&
-    ((JRUBY_VERSION =~ /^(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/ &&
-      (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC3')) || $1 > '1.0.0')) ||
-    (JRUBY_VERSION =~ /^(\d+\.\d+)([-\.A-Z0-9]*)/ &&  $1 >= '1.0'))
+if RUBY_PLATFORM =~ /java/ && defined?JRUBY_VERSION
 
   require 'cheri/java/builder'
   require 'cheri/builder/awt/types'
@@ -34,10 +31,12 @@ if (defined?JRUBY_VERSION) &&
   require 'cheri/builder/awt/main'
 
 else
+
 STDERR.puts %{
- Cheri::AWT requires JRuby (1.0.0RC3 or later)
-    Download the latest version of JRuby at:
-           http://www.jruby.org/
+ Cheri::AWT requires JRuby 1.0 or later
+Download the latest version of JRuby at:
+       http://www.jruby.org/
+
 }
 
 end

data/lib/cheri/builder/base.rb

@@ -95,7 +95,7 @@ module Frame
      
   # Overrides the default Object#inspect to prevent mind-boggling circular displays in IRB.
   def inspect
-    "#<#{self.class}:instance>"  
+   to_s  
   end
 
 end #Frame

data/lib/cheri/builder/config.rb

@@ -31,8 +31,7 @@ class Config
     @m = [] # included modules
     @f = {} # factories, indexed by module
     @c = {} # connecters, indexed by module
-    # lazily allocated:
-    # @n = {} # consumers, indexed by module
+    @n = {} # consumers, indexed by module
     # @r = {} # resolvers, indexed by module
     mods.each do |mod| self << mod; end
   end
@@ -50,9 +49,11 @@ class Config
   end
 
   def consumers
-    @n || None
+    @n
   end
 
+  
+  # FIXME: eliminate!
   def resolvers
     @r || None
   end
@@ -63,74 +64,159 @@ class Config
     extendee = mod.respond_to?(:extends) ? mod.extends : nil
     raise BuilderException,"extended builder module not included: #{extendee}" if extendee && !@m.include?(extendee)
     @m << mod
-    @f[mod] = mod.factory if mod.respond_to?(:factory) && mod.factory
-    @c[mod] = mod.connecter if mod.respond_to?(:connecter) && mod.connecter
-    (@n ||= {})[mod] = mod.consumer if mod.respond_to?(:consumer) && mod.consumer
+
+    if mod.respond_to?(:factory) && (obj = mod.factory)
+      @f[mod] = obj
+    end
+    
+    if mod.respond_to?(:connecter) && (obj = mod.connecter)
+      @c[mod] = obj
+    end
+
+    if mod.respond_to?(:consumer) && (obj = mod.consumer)
+      @n[mod] = obj
+    end
+    
+    # FIXME: eliminate (isolate in Java class stuff)
     (@r ||= {})[mod] = mod.resolver if mod.respond_to?(:resolver) && mod.resolver
+
+
     extend_mod(extendee,mod) if extendee
     self
   end
   alias_method :add, :<<
 
-  def extend_mod(mod,ext)
-    # get to the base module to be extended
-    mod = mod.extends while mod.respond_to?(:extends) && mod.extends
-
-    # if we're extending the factory...
-    if (fx = @f[ext])
-      if (fm = @f[mod])
-          # if there's already a factory, wrap it in a SuperFactory
-          # extender goes first so it can override
-        @f[mod] = SuperFactory[fx,fm]
+  def flatten(obj)
+    if obj
+      if Aggregate === obj
+        obj.flatten
       else
-        # no factory, use the extender
-        @f[mod] = fx
+        [obj]      
       end
+    else
+      []    
     end
+  end
+  private :flatten
 
-    # if we're extending the connecter...
-    if (cx = @c[ext])
-      # TODO: break apart mod/ext SuperConnecters to combine embedded type connecters?
-      # Right now all built-in/generated Cheri connecters are type connecters, so it's
-      # not an issue... yet...
-      if (cm = @c[mod])
-        if TypeConnecter === cm && TypeConnecter === cx
-          # if they're both TypeConnecters, create a combined TypeConnecter
-          # extender goes second so it can override
-          @c[mod] = TypeConnecter.new(cm,cx)
-        else
-          # otherwise, combine them in a SuperConnecter
-          # extender goes first so it can override
-          @c[mod] = SuperConnecter[cx,cm]
-        end
-      else
-        # no connecter, use extender
-        @c[mod] = cx
-      end
+  def merge_aggregates(amod, aext, aggr_clazz)
+    aggr = aggr_clazz.new
+    flatten(aext).each do |elem|
+      aggr << elem      
     end
+    flatten(amod).each do |elem|
+      aggr << elem      
+    end
+    aggr    
+  end
+  private :merge_aggregates
+  
+  def merge_factories(fmod, fext)
+    merge_aggregates(fmod,fext,SuperFactory)  
+  end
+  private :merge_factories
+  
+  def merge_consumers(cmod, cext)
+    merge_aggregates(cmod,cext,SuperConsumer)  
+  end
+  private :merge_consumers
 
-    # if we're extending the consumer... (see comments for factory)
-    if @n && (nx = @n[ext])
-      if (nm = @n[mod])
-        @n[mod] = SuperConsumer[nx,nm]
+  def merge_connecters(cmod, cext)
+    # first, break down connecters into TypeConnecters and others
+    tcs = []
+    others = []
+    flatten(cmod).each do |ctr|
+      if TypeConnecter === ctr
+        tcs << ctr
       else
-        @n[mod] = nx
+        others << ctr      
+      end    
+    end
+    # we want extender's TC's after mod's
+    (fext = flatten(cext)).each do |ctr|
+      tcs << ctr if TypeConnecter === ctr
+    end
+    # we want extender's other connecters before mod's
+    fext.reverse_each do |ctr|
+      others.unshift(ctr) unless TypeConnecter === ctr
+    end
+    
+    # combine (merge) any TypeConnecters
+    unless tcs.empty?
+      tc = TypeConnecter.new
+      tcs.each do |atc|
+        tc.merge!(atc)
       end
+      # return the merged TC if there are no other
+      # connecters (the usual case)
+      return tc if others.empty?   
+    else
+      tc = nil
+    end
+    
+    # aggregate any 'other' (non-TypeConnecter) connecters, 
+    # and add the (merged) TypeConnecter (if any) last
+    sc = SuperConnecter.new
+    others.each do |oth|
+      sc << oth      
+    end
+    sc << tc if tc
+    sc
+  end
+  private :merge_connecters
+  
+  def extend_mod(mod,ext)
+    # get to the base module to be extended
+    while mod.respond_to?(:extends) && (mext = mod.extends)
+      mod = mext
+    end
+    
+    # merge the extendee's (mod) factory(s) with the extender's (ext)
+    # factory(s).  update any reference to either to point to the 
+    # merged factory(s).
+    mods = [mod,ext]
+    hash = @f
+    hmod = hash[mod]
+    hext = hash[ext]
+    hash.each_pair do |m,h|
+      mods << m if h == hmod || h == hext unless mods.include?(m) 
+    end    
+    merged = merge_factories(hmod,hext)
+    mods.each do |m|
+      hash[m] = merged
     end
 
-    # if we're extending the resolver...
-    # FIXME: this won't really work right now, at least for Java apps, which are
-    # the only ones likely to use this feature. the Java constant resolver wants
-    # all constant symbols from a single (virtual) source, and raises exceptions if
-    # it fails to resolve. coding it anyway, will rethink for next version.
-    if @r && (rx = @r[ext])
-      if (rm = @r[mod])
-        @r[mod] = SuperResolver[rx,rm]
-      else
-        @r[mod] = rx
-      end
+    # merge the extendee's (mod) connecter(s) with the extender's (ext)
+    # connecter(s).  update any reference to either to point to the 
+    # merged connecter(s).
+    mods = [mod,ext]
+    hash = @c
+    hmod = hash[mod]
+    hext = hash[ext]
+    hash.each_pair do |m,h|
+      mods << m if h == hmod || h == hext unless mods.include?(m)
+    end    
+    merged = merge_connecters(hmod,hext)
+    mods.each do |m|
+      hash[m] = merged
+    end
+
+    # merge the extendee's (mod) consumers(s) with the extender's (ext)
+    # consumers(s).  update any reference to either to point to the 
+    # merged consumer(s).
+    mods = [mod,ext]
+    hash = @n
+    hmod = hash[mod]
+    hext = hash[ext]
+    hash.each_pair do |m,h|
+      mods << m if h == hmod || h == hext unless mods.include?(m)
+    end    
+    merged = merge_consumers(hmod,hext)
+    mods.each do |m|
+      hash[m] = merged
     end
   end
+  private :extend_mod
   
   def include?(mod)
     @m.include?(mod)
@@ -146,7 +232,7 @@ class Config
 
   # Overrides the default Object#inspect to prevent mind-boggling circular displays in IRB.
   def inspect
-    "#<#{self.class}:instance>"  
+    to_s
   end
 
 protected
@@ -154,7 +240,7 @@ protected
     @m = m.dup
     @f = f.dup
     @c = c.dup
-    @n = n.dup if n
+    @n = n.dup
     @r = r.dup if r
     self
   end  

data/lib/cheri/builder/connecter.rb

@@ -27,32 +27,33 @@ module Builder
 
 class TypeConnecter
 
-  def initialize(*parents,&k)
+  def initialize(*parents,&block)
     @t = {}
     @s = {}
     @c = {}
-    unless parents.empty?
-      t = @t
-      s = @s
-      parents.each do |parent|
-        raise Cheri.type_error(parent,TypeConnecter) unless TypeConnecter === parent
-        parent.get_types.each_pair do |mod,type|
-          if (tmod = t[mod])
-            tmod.merge(type)
-          else
-            t[mod] = type.copy
-          end
-        end
-        parent.get_syms.each_pair do |sym,symc|
-          if (ssym = s[sym])
-            ssym.merge(symc)
-          else
-            s[sym] = symc.copy
-          end
-        end
+    parents.each do |parent| merge!(parent); end
+    instance_eval(&block) if block
+  end
+  
+  def merge!(other)
+    raise Cheri.type_error(other,TypeConnecter) unless TypeConnecter === other
+    t = @t
+    s = @s
+    other.get_types.each_pair do |mod,type|
+      if (tmod = t[mod])
+        tmod.merge(type)
+      else
+        t[mod] = type.copy
       end
     end
-    instance_eval(&k) if k
+    other.get_syms.each_pair do |sym,symc|
+      if (ssym = s[sym])
+        ssym.merge(symc)
+      else
+        s[sym] = symc.copy
+      end
+    end
+    self
   end
 
   def prepare(ctx,builder,obj,sym,props)
@@ -155,6 +156,7 @@ class TypeConnecter
     @t[mod] ||= Type.new(mod)
   end
   
+
   class Type
     def initialize(mod)
       raise Cheri.type_error(mod,Class,Module) unless Module === mod

data/lib/cheri/builder/context.rb

@@ -28,7 +28,7 @@ module Builder
 class InstanceContext
   # TODO: defined?Java pulls it in (same as require 'java' or include Java)
   # not sure if anyone would object...
-  if (defined?Java) && (defined?JRUBY_VERSION) # JRuby 0.9.9 or later
+  if (defined?(::Java)) && (defined?JRUBY_VERSION) # JRuby 0.9.9 or later
     Col = java.util.Collections
     Map = java.util.HashMap
     WMap = java.util.WeakHashMap
@@ -108,7 +108,7 @@ class InstanceContext
   
   # Overrides the default Object#inspect to prevent mind-boggling circular displays in IRB.
   def inspect
-    "#<#{self.class}:instance>"  
+    to_s 
   end
 
 end #InstanceContext
@@ -134,7 +134,6 @@ class Context
   #   @r - array of ConstantResolver instances, lazily initialized
   #   @s - the stack, holds active builders and builder frames
   #   @u - auto-factories array, lazily initialized
-  ##### TODO: REMOVE   @v - flag used to prevent reentrant calls to #consume (aka #csm)
   #   @x - flag indicating whether instance_exec is supported, lazily initialized
   #++ 
   def initialize(ictx,client)
@@ -428,15 +427,15 @@ class Context
   # in the order they were enabled. Returns nil if no builder is found.
   def bld(*r,&k)
     #puts "bld args: #{[r.join(',')]}"
-    fs = nil # lazily-allocated array to hold factories we've already queried
+    queried = nil # lazily-allocated array to hold factories we've already queried
     b = nil # builder
-
+    atf = @f
     # search stack for a frame whose module's factory can supply a matching builder
     @s.reverse_each do |s|
-      if (f = @f[s.mod])
-        unless fs && fs.include?(f)
+      if (f = atf[s.mod])
+        unless queried && queried.include?(f)
           return b if (b = f.builder(self,*r,&k))
-          (fs ||= []) << f
+          (queried ||= []) << f
         end
       end
     end
@@ -444,10 +443,10 @@ class Context
     # try auto-enabled builders
     if (u = auto)
       u.each do |m|
-        if (f = @f[m])
-          unless fs && fs.include?(f)
+        if (f = atf[m])
+          unless queried && queried.include?(f)
             return b if (b = f.builder(self,*r,&k))
-            (fs ||= []) << f
+            (queried ||= []) << f
           end
         end
       end
@@ -540,9 +539,12 @@ class Context
         break
       end
     end
- 
+
+    #puts "frame.object #{obj}"
+    #puts "parent #{parent}" 
     # if we got a builder (parent), attempt to connect it
     if parent && (n = @n[parent.mod])
+      #puts "parent.mod #{n}"
       n.prepare(self,parent,obj,sym,props)
     end
     
@@ -624,7 +626,7 @@ class Context
 
   # Overrides the default Object#inspect to prevent mind-boggling circular displays in IRB.
   def inspect
-    "#<#{self.class}:instance>"  
+    to_s 
   end
 
   # We want to prevent built objects passed as parameters from
@@ -669,14 +671,14 @@ class Context
     # store a prepared connection.
     def ppd(ctr,bldr,obj,sym,props=nil)
       @o[obj.__id__] = bldr
-      @c[bldr.__id__] << Con.new(ctr,bldr.object,obj,sym,props)
+      @c[bldr.__id__] << Conn.new(ctr,bldr.object,obj,sym,props)
       true
     end
     alias_method :prepared, :ppd #:nodoc:
 
     # store a prepared 'any' connection.
     def ppda(ctr,bldr,obj,sym,props=nil)
-      ((@a ||= {})[bldr.__id__] ||= []) << Con.new(ctr,bldr.object,obj,sym,props)
+      ((@a ||= {})[bldr.__id__] ||= []) << Conn.new(ctr,bldr.object,obj,sym,props)
       true
     end
     alias_method :prepared_any, :ppda # :nodoc:
@@ -714,7 +716,7 @@ class Context
     end
     alias_method :check, :ck #:nodoc:
 
-    class Con # :nodoc: all
+    class Conn # :nodoc: all
       def initialize(ctr,par,obj,sym,props)
         @c = ctr
         @p = par

data/lib/cheri/cheri.rb

@@ -29,7 +29,7 @@ module Cheri
 module VERSION #:nodoc:
   MAJOR = 0
   MINOR = 0
-  TINY  = 7
+  TINY  = 8
   STRING = [MAJOR, MINOR, TINY].join('.').freeze
 end
 #:stopdoc:

data/lib/cheri/explorer.rb

@@ -24,10 +24,7 @@
 
 require 'cheri/cheri'
 
-if (defined?JRUBY_VERSION) &&
-    ((JRUBY_VERSION =~ /^(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/ &&
-      (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC3')) || $1 > '1.0.0')) ||
-    (JRUBY_VERSION =~ /^(\d+\.\d+)([-\.A-Z0-9]*)/ &&  $1 >= '1.0'))
+if RUBY_PLATFORM =~ /java/ && defined?JRUBY_VERSION
   require 'cheri/jruby'
 end
 

data/lib/cheri/java/builder/main.rb

@@ -370,6 +370,10 @@ class GenericCheriYieldBuilder < CheriYieldBuilder
 end #GenericCheriYieldBuilder
 
 class GenericBuilderFactory
+  # :stopdoc:
+  BuildType = Cheri::Builder::BuildType
+  BuildTypes = Cheri::Builder::BuildTypes
+  # :startdoc:
   def initialize(mod,types)
     raise Cheri.type_error(types,BuildType) unless BuildTypes === types
     @mod = mod

data/lib/cheri/jruby.rb

@@ -22,10 +22,7 @@
 #++
 #
 
-if (defined?JRUBY_VERSION) &&
-    ((JRUBY_VERSION =~ /^(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/ &&
-      (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC3')) || $1 > '1.0.0')) ||
-    (JRUBY_VERSION =~ /^(\d+\.\d+)([-\.A-Z0-9]*)/ &&  $1 >= '1.0'))
+if RUBY_PLATFORM =~ /java/ && defined?JRUBY_VERSION
   require 'java'
   require 'cheri/cheri'
   require 'cheri/jruby/jruby'

data/lib/cheri/swing.rb

@@ -22,10 +22,7 @@
 #++
 #
 
-if (defined?JRUBY_VERSION) &&
-    ((JRUBY_VERSION =~ /^(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/ &&
-      (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC3')) || $1 > '1.0.0')) ||
-    (JRUBY_VERSION =~ /^(\d+\.\d+)([-\.A-Z0-9]*)/ &&  $1 >= '1.0'))
+if RUBY_PLATFORM =~ /java/ && defined?JRUBY_VERSION
 
   require 'cheri/awt'
   require 'cheri/builder/swing/types'
@@ -34,10 +31,12 @@ if (defined?JRUBY_VERSION) &&
   require 'cheri/builder/swing/main'
 
 else
+
 STDERR.puts %{
- Cheri::Swing requires JRuby (1.0.0RC3 or later)
-    Download the latest version of JRuby at:
-           http://www.jruby.org/
+Cheri::Swing requires JRuby 1.0 or later
+Download the latest version of JRuby at:
+        http://www.jruby.org/
+
 }
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: cheri
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
-date: 2007-06-20 00:00:00 -07:00
+  version: 0.0.8
+date: 2007-12-10 00:00:00 -08:00
 summary: Cheri Builder Platform
 require_paths: 
 - lib