cheri 0.0.5 → 0.0.6

data/lib/cheri/builder/xml/types.rb

@@ -30,6 +30,11 @@ Types = Hash[
   :t! => TextElem,
   :esc! => EscElem,
   :proc! => ProcElem,
+  :comment! =>CommentElem
+]
+Aliases = Hash[
+  :inspect! => :inpect,
+  :class! => :class
 ]
 
 end #Xml

data/lib/cheri/cheri.rb

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

data/lib/cheri/explorer.rb

@@ -24,8 +24,10 @@
 
 require 'cheri/cheri'
 
-if (defined?JRUBY_VERSION) && 0 == (JRUBY_VERSION =~ /(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/) &&
-    (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC3')) || $1 > '1.0.0')
+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.1'))
   require 'cheri/jruby'
 end
 

data/lib/cheri/explorer/explorer.rb

@@ -550,8 +550,10 @@ class RubyExplorer
     Config::CONFIG  
   end
 
-if (defined?JRUBY_VERSION) && 0 == (JRUBY_VERSION =~ /(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/) &&
-    (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC2')) || $1 > '1.0.0')
+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.1'))
 
   System = ::Java::JavaLang::System
   Runtime = ::Java::JavaLang::Runtime

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

@@ -328,13 +328,24 @@ class ConstantResolver < Cheri::Builder::AbstractConstantResolver
 end #ConstantResolver
 
 class GenericClassBuilder < ClassBuilder
-  def initialize(mod,*args,&block)
-    super(*args,&block)
+  # TODO: eliminate ClassBuilder inheritance?
+  def initialize(mod,type,ctx,sym,*args,&block)    
+    super(ctx,sym,type.clazz,*args,&block)
     @mod = mod
+    @type = type
   end
   def mod
     @mod  
   end
+  def parent?
+    @type.parent?  
+  end
+  def child?
+    @type.child?
+  end
+  def any?
+    @type.any?
+  end
 end #GenericClassBuilder
 
 
@@ -360,14 +371,14 @@ end #GenericCheriYieldBuilder
 
 class GenericBuilderFactory
   def initialize(mod,types)
-    raise Cheri.type_error(types,Hash) unless Hash === types
+    raise Cheri.type_error(types,BuildType) unless BuildTypes === types
     @mod = mod
     @types = types
     @inv = types.invert
   end
   def builder(ctx,sym,*r,&k)
-    if (clazz = @types[sym])
-      GenericClassBuilder.new(@mod,ctx,sym,clazz,*r,&k)
+    if (type = @types[sym])
+      GenericClassBuilder.new(@mod,type,ctx,sym,*r,&k)
     elsif @inv[r.first.class]
       if sym == :cherify
         GenericCherifyBuilder.new(@mod,ctx,sym,*r,&k)
@@ -383,22 +394,32 @@ class GenericBuilderFactory
 end #GenericBuilderFactory
 
 class PackageFactory
-  #:stopdoc:
+  # :stopdoc:
   Dot = '.'
   CJ = Cheri::Java
+  BuildType = Cheri::Builder::BuildType
+  BuildTypes = Cheri::Builder::BuildTypes
   #Util = Cheri::Java::Builder::Util
-  #:startdoc:
+  # :startdoc:
   def initialize(pkg_str,mod)
     raise Cheri.type_error(pkg_str,String) unless String === pkg_str
     @pkg = pkg_str.empty? || pkg_str[-1] == ?. ? pkg_str.dup : pkg_str + Dot
     @mod = mod
-    @classes = {}
+    @types = BuildTypes.new
   end
   def builder(ctx,sym,*r,&k)
-    if (clazz = @classes[sym] ||= (CJ.get_class(@pkg + Util.cc(sym)) rescue :none)) != :none
-      return GenericClassBuilder.new(@mod,ctx,sym,clazz,*r,&k)    
+    unless type = @types[sym]
+      if clazz = CJ.get_class(@pkg + Util.cc(sym)) rescue nil
+        type = @types[sym] = BuildType.new(clazz,sym)
+      else
+        type = @types[sym] = :none
+      end
+    end
+    unless type == :none
+      GenericClassBuilder.new(@mod,type,ctx,sym,*r,&k)
+    else
+      nil
     end
-    nil
   end
 end #PackageFactory
 

data/lib/cheri/jruby.rb

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

data/lib/cheri/jruby/explorer.rb

@@ -21,8 +21,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 #
-if (defined?JRUBY_VERSION) && 0 == (JRUBY_VERSION =~ /(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/) &&
-    (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC3')) || $1 > '1.0.0')
+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.1'))
 
   require 'cheri/html'
   require 'cheri/swing'

data/lib/cheri/swing.rb

@@ -22,8 +22,10 @@
 #++
 #
 
-if (defined?JRUBY_VERSION) && 0 == (JRUBY_VERSION =~ /(\d+\.\d+\.\d+)([-\.A-Z0-9]*)/) &&
-    (($1 == '1.0.0' && ($2.empty? || $2 >= 'RC3')) || $1 > '1.0.0')
+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.1'))
 
   require 'cheri/awt'
   require 'cheri/builder/swing/types'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: cheri
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2007-06-11 00:00:00 -07:00
+  version: 0.0.6
+date: 2007-06-19 00:00:00 -07:00
 summary: Cheri Builder Platform
 require_paths: 
 - lib
@@ -55,6 +55,7 @@ files:
 - lib/cheri/builder/html/main.rb
 - lib/cheri/builder/html/types.rb
 - lib/cheri/builder/main.rb
+- lib/cheri/builder/markup.rb
 - lib/cheri/builder/swing
 - lib/cheri/builder/swing/connecter.rb
 - lib/cheri/builder/swing/constants.rb