rgen 0.4.1 → 0.4.2

data/CHANGELOG

@@ -50,3 +50,10 @@
 * Major performance improvement: AbstractXMLInstantiator optionally controls the garbage collector
 * Major performance improvement: ERB templates are reused in metamodel_builder
 * Added delete method to Environment
+
+=0.4.2 (Mar 2nd, 2008)
+
+* Performance improvement: collection feature of array extension uses hashes now to speed up array union
+* Performance improvement: find on environment hashes elements by class
+* Extended Transformer to allow sharing of result maps between several Transformer instances
+* Bugfix: User defined upper bound values are no longer overwritten by -1 in all "many" metamodel builder methods

data/lib/rgen/array_extensions.rb

@@ -11,13 +11,21 @@ class Array
 	
 	def method_missing(m, *args)
 		super unless size == 0 or compact.any?{|e| e.is_a? RGen::MetamodelBuilder::MMBase}
-		compact.inject([]) { |r,e|
+		# use an array to build the result to achiev similar ordering
+		result = []
+		inResult = {}
+		compact.each do |e|
 			if e.is_a? RGen::MetamodelBuilder::MMBase				
-				r | ( (o=e.send(m)).is_a?(Array) ? o : [o] ) 
+				((o=e.send(m)).is_a?(Array) ? o : [o] ).each do |v|
+					next if inResult[v.object_id]
+					inResult[v.object_id] = true
+					result << v
+				end
 			else
 				raise StandardError.new("Trying to call a method on an array element not a RGen MMBase")
 			end
-		}.compact
+		end
+		result.compact
 	end
 
 end

data/lib/rgen/environment.rb

@@ -1,47 +1,116 @@
-require 'rgen/find_helper'
-
 module RGen
 
 # An Environment is used to hold model elements.
 #
 class Environment
-	include RGen::FindHelper
 
 	def initialize
-		@elements = []
+		@elements = {}
+		@subClasses = {}
+		@subClassesUpdated = {}
 	end
 	
 	# Add a model element. Returns the environment so <code><<</code> can be chained.
 	# 
 	def <<(el)
-		@elements << el
+		clazz = el.class
+		@elements[clazz] ||= []
+		@elements[clazz] << el
+		updateSubClasses(clazz)
 		self
 	end
-	
+
 	# Removes model element from environment.
 	def delete(el)
-		@elements.delete(el)
+		return unless @elements[el.class]
+		@elements[el.class].delete(el)
 	end
 		
 	# Iterates each element
 	#
 	def each(&b)
-		@elements.each(&b)
+		@elements.values.flatten.each(&b)
 	end
 	
 	# Return the elements of the environment as an array
 	#
 	def elements
-		@elements.dup
+		@elements.values.flatten
 	end
 	
 	# This method can be used to instantiate a class and automatically put it into
 	# the environment. The new instance is returned.
 	#
 	def new(clazz, *args)
-		@elements << clazz.new(*args)
-		@elements[-1]
+		obj = clazz.new(*args)
+		self << obj
+		obj
+	end
+	
+	# Finds and returns model elements in the environment.
+	# 
+	# The search description argument must be a hash specifying attribute/value pairs.
+	# Only model elements are returned which respond to the specified attribute methods
+	# and return the specified values as result of these attribute methods.
+	# 
+	# As a special hash key :class can be used to look for model elements of a specific
+	# class. In this case an array of possible classes can optionally be given.
+	# 
+	def find(desc)
+		result = []
+		classes = desc[:class] if desc[:class] and desc[:class].is_a?(Array)
+		classes = [ desc[:class] ] if !classes and desc[:class]
+		if classes
+			hashKeys = classesWithSubClasses(classes)
+		else
+			hashKeys = @elements.keys
+		end
+		hashKeys.each do |clazz|
+			next unless @elements[clazz]
+			@elements[clazz].each do |e|
+				failed = false
+				desc.each_pair { |k,v|
+					failed = true if k != :class and ( !e.respond_to?(k) or e.send(k) != v )
+				}
+				result << e unless failed
+			end
+		end
+		result
 	end
-end
 	
+	private
+	
+	def updateSubClasses(clazz)
+		return if @subClassesUpdated[clazz]
+		if clazz.respond_to?( :ecore )
+			superClasses = clazz.ecore.eAllSuperTypes.collect{|c| c.instanceClass}
+		else
+			superClasses = superclasses(clazz)
+		end
+		superClasses.each do |c|
+			next if c == Object
+			@subClasses[c] ||= []
+			@subClasses[c] << clazz
+		end
+		@subClassesUpdated[clazz] = true
+	end	
+	
+	def classesWithSubClasses(classes)
+		result = classes
+		classes.each do |c|
+			result += @subClasses[c] if @subClasses[c]
+		end
+		result.uniq
+	end
+	
+	def superclasses(clazz)
+		if clazz == Object
+			[]
+		else
+			superclasses(clazz.superclass) << clazz.superclass
+		end
+	end
+	
+end
+
 end

data/lib/rgen/metamodel_builder/builder_extensions.rb

@@ -76,8 +76,8 @@ module BuilderExtensions
 	# for the add and remove methods.
 	# 
 	def has_many(role, target_class=nil, raw_props={}, &block)
-		props = ReferenceDescription.new(target_class, _ownProps(raw_props).merge({
-			:name=>role, :upperBound=>-1,	:containment=>false}))
+		props = ReferenceDescription.new(target_class, _setManyUpperBound(_ownProps(raw_props).merge({
+			:name=>role, :containment=>false})))
 		raise "No opposite available" unless _oppositeProps(raw_props).empty?
 		FeatureBlockEvaluator.eval(block, props)
 		_build_internal(props)
@@ -92,8 +92,8 @@ module BuilderExtensions
 	end
 
 	def contains_many_uni(role, target_class=nil, raw_props={}, &block)
-		props = ReferenceDescription.new(target_class, _ownProps(raw_props).merge({
-			:name=>role, :upperBound=>-1, :containment=>true}))
+		props = ReferenceDescription.new(target_class, _setManyUpperBound(_ownProps(raw_props).merge({
+			:name=>role, :containment=>true})))
 		raise "No opposite available" unless _oppositeProps(raw_props).empty?
 		FeatureBlockEvaluator.eval(block, props)
 		_build_internal(props)
@@ -121,8 +121,8 @@ module BuilderExtensions
 	# is is added to as a new element.
 	# 
 	def one_to_many(target_role, target_class, own_role, raw_props={}, &block)
-		props1 = ReferenceDescription.new(target_class, _ownProps(raw_props).merge({
-			:name=>target_role, :upperBound=>-1, :containment=>false}))
+		props1 = ReferenceDescription.new(target_class, _setManyUpperBound(_ownProps(raw_props).merge({
+			:name=>target_role, :containment=>false})))
 		props2 = ReferenceDescription.new(self, _oppositeProps(raw_props).merge({
 			:name=>own_role, :upperBound=>1, :containment=>false}))
 		FeatureBlockEvaluator.eval(block, props1, props2)
@@ -130,8 +130,8 @@ module BuilderExtensions
 	end
 
 	def contains_many(target_role, target_class, own_role, raw_props={}, &block)
-		props1 = ReferenceDescription.new(target_class, _ownProps(raw_props).merge({
-			:name=>target_role, :upperBound=>-1, :containment=>true}))
+		props1 = ReferenceDescription.new(target_class, _setManyUpperBound(_ownProps(raw_props).merge({
+			:name=>target_role, :containment=>true})))
 		props2 = ReferenceDescription.new(self, _oppositeProps(raw_props).merge({
 			:name=>own_role, :upperBound=>1, :containment=>false}))
 		FeatureBlockEvaluator.eval(block, props1, props2)
@@ -142,8 +142,8 @@ module BuilderExtensions
 	def many_to_one(target_role, target_class, own_role, raw_props={}, &block)
 		props1 = ReferenceDescription.new(target_class, _ownProps(raw_props).merge({
 			:name=>target_role, :upperBound=>1, :containment=>false}))
-		props2 = ReferenceDescription.new(self, _oppositeProps(raw_props).merge({
-			:name=>own_role, :upperBound=>-1, :containment=>false}))
+		props2 = ReferenceDescription.new(self, _setManyUpperBound(_oppositeProps(raw_props).merge({
+			:name=>own_role, :containment=>false})))
 		FeatureBlockEvaluator.eval(block, props1, props2)
 		_build_internal(props1, props2)
 	end
@@ -171,10 +171,10 @@ module BuilderExtensions
 	# is is added to as a new element.
 	# 
 	def many_to_many(target_role, target_class, own_role, raw_props={}, &block)
-		props1 = ReferenceDescription.new(target_class, _ownProps(raw_props).merge({
-			:name=>target_role, :upperBound=>-1, :containment=>false}))
-		props2 = ReferenceDescription.new(self, _oppositeProps(raw_props).merge({
-			:name=>own_role, :upperBound=>-1, :containment=>false}))
+		props1 = ReferenceDescription.new(target_class, _setManyUpperBound(_ownProps(raw_props).merge({
+			:name=>target_role, :containment=>false})))
+		props2 = ReferenceDescription.new(self, _setManyUpperBound(_oppositeProps(raw_props).merge({
+			:name=>own_role, :containment=>false})))
 		FeatureBlockEvaluator.eval(block, props1, props2)
 		_build_internal(props1, props2)
 	end
@@ -413,17 +413,22 @@ module BuilderExtensions
 	
 	def _ownProps(props)
 	  Hash[*(props.select{|k,v| !(k.to_s =~ /^opposite_/)}.flatten)]
-    end
+  end
 
 	def _oppositeProps(props)
-	   r = {}
-	   props.each_pair do |k,v|
-	     if k.to_s =~ /^opposite_(.*)$/
-            r[$1.to_sym] = v
-         end
-       end
-       r
+    r = {}
+	  props.each_pair do |k,v|
+      if k.to_s =~ /^opposite_(.*)$/
+        r[$1.to_sym] = v
+      end
     end
+    r
+  end
+
+  def _setManyUpperBound(props)
+    props[:upperBound] = -1 unless props[:upperBound].is_a?(Integer) && props[:upperBound] > 1
+    props
+  end
     
 end
 

data/lib/rgen/transformer.rb

@@ -227,11 +227,14 @@ class Transformer
 
 	# Creates a new transformer
 	# Optionally an input and output Environment can be specified.
+  # If an elementMap is provided (normally a Hash) this map will be used to lookup 
+  # and store transformation results. This way results can be predefined
+  # and it is possible to have several transformers work on the same result map.
 	# 
-	def initialize(env_in=nil, env_out=nil)
+	def initialize(env_in=nil, env_out=nil, elementMap=nil)
 		@env_in = env_in
 		@env_out = env_out
-		@transformer_results = {}
+		@transformer_results = elementMap || {}
 		@transformer_jobs = []
 	end
 

data/test/environment_test.rb

@@ -2,6 +2,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 require 'test/unit'
 require 'rgen/environment'
+require 'rgen/metamodel_builder'
 
 class EnvironmentTest < Test::Unit::TestCase
 
@@ -11,7 +12,48 @@ class EnvironmentTest < Test::Unit::TestCase
 	
 	class ModelSub < Model
 	end
+	
+	class ClassSuperA < RGen::MetamodelBuilder::MMBase
+	end
+	
+	class ClassSuperB < RGen::MetamodelBuilder::MMBase
+	end
+	
+	class ClassC < RGen::MetamodelBuilder::MMMultiple(ClassSuperA, ClassSuperB)
+		has_attr 'name', String
+	end
+	
+	class ClassSubD < ClassC
+	end
+	
+	class ClassSubE < ClassC
+	end
 
+	def test_find_mmbase
+		env = RGen::Environment.new
+		mA1 = env.new(ClassSuperA)
+		mB1 = env.new(ClassSuperB)
+		mD1 = env.new(ClassSubD, :name => "mD1")
+		mD2 = env.new(ClassSubD, :name => "mD2")
+		mE = env.new(ClassSubE, :name => "mE")
+		
+		resultA = env.find(:class => ClassSuperA)
+		assert_equal sortById([mA1,mD1,mD2,mE]), sortById(resultA)
+		resultNamedA = env.find(:class => ClassSuperA, :name => "mD1")
+		assert_equal sortById([mD1]), sortById(resultNamedA)
+		
+		resultB = env.find(:class => ClassSuperB)
+		assert_equal sortById([mB1,mD1,mD2,mE]), sortById(resultB)
+		resultNamedB = env.find(:class => ClassSuperB, :name => "mD1")
+		assert_equal sortById([mD1]), sortById(resultNamedB)
+		
+		resultC = env.find(:class => ClassC)
+		assert_equal sortById([mD1,mD2,mE]), sortById(resultC)
+		
+		resultD = env.find(:class => ClassSubD)
+		assert_equal sortById([mD1,mD2]), sortById(resultD)
+	end
+	
 	def test_find
 		m1 = Model.new
 		m1.name = "M1"
@@ -19,34 +61,30 @@ class EnvironmentTest < Test::Unit::TestCase
 		m2.name = "M2"
 		m3 = "justAString"
 		env = RGen::Environment.new << m1 << m2 << m3
-		assertFind(env, m1, m2, m3)
-		idx = env.findIndex(:name)
-		assertFind(idx, m1, m2, m3)
-	end
-	
-	def assertFind(context, m1, m2, m3)
-		result = context.find(:class => Model, :name => "M1")
+		
+		result = env.find(:class => Model, :name => "M1")
 		assert result.is_a?(Array)
 		assert_equal 1, result.size
 		assert_equal m1, result.first
 
-		result = context.find(:class => Model)
+		result = env.find(:class => Model)
 		assert result.is_a?(Array)
-		assert_equal 2, result.size
-		assert_equal m1, result[0]
-		assert_equal m2, result[1]
+		assert_equal sortById([m1,m2]), sortById(result)
 		
-		result = context.find(:name => "M2")
+		result = env.find(:name => "M2")
 		assert result.is_a?(Array)
 		assert_equal 1, result.size
-		assert_equal m2, result[0]		
+		assert_equal m2, result.first		
 		
-		result = context.find(:class => [Model, String])
+		result = env.find(:class => [Model, String])
 		assert result.is_a?(Array)
-		assert_equal 3, result.size
-		assert_equal m1, result[0]
-		assert_equal m2, result[1]
-		assert_equal m3, result[2]
+		assert_equal sortById([m1,m2,m3]), sortById(result)
+	end
+	
+	private
+	
+	def sortById(array)
+		array.sort{|a,b| a.object_id <=> b.object_id}
 	end
 	
 end

data/test/metamodel_builder_test.rb

@@ -144,7 +144,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
   end
   class ManyClass < RGen::MetamodelBuilder::MMBase
   end
-  OneClass.one_to_many 'manyClasses', ManyClass, 'oneClass'
+  OneClass.one_to_many 'manyClasses', ManyClass, 'oneClass', :upperBound => 5
   
   def test_one_to_many
     oc = OneClass.new
@@ -178,6 +178,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     
     assert_equal [], OneClass.ecore.eReferences.select{|r| r.many == false}
     assert_equal ["manyClasses"], OneClass.ecore.eReferences.select{|r| r.many == true}.name
+    assert_equal 5, OneClass.ecore.eReferences.find{|r| r.many == true}.upperBound
     assert_equal ["oneClass"], ManyClass.ecore.eReferences.select{|r| r.many == false}.name
     assert_equal [], ManyClass.ecore.eReferences.select{|r| r.many == true}
   end

data/test/transformer_test.rb

@@ -112,6 +112,39 @@ class TransformerTest < Test::Unit::TestCase
 		assert_equal env_out.elements.first, t.trans(from)
 		assert_equal 1, t.modelInTrans_count
 	end
+  
+  def test_transformer_chain
+    from = ModelIn.new
+    from.name = "Test1"
+    from2 = ModelIn.new
+    from2.name = "Test2"
+    from3 = ModelIn.new
+    from3.name = "Test3"
+    env_out = RGen::Environment.new
+    elementMap = {}
+    t1 = MyTransformer.new(:env_in, env_out, elementMap)
+		assert t1.trans(from).is_a?(ModelOut)
+		assert_equal "Test1", t1.trans(from).name
+		assert_equal 1, t1.modelInTrans_count
+    # modifying the element map means that following calls of +trans+ will be affected
+    assert_equal( {from => t1.trans(from)}, elementMap )
+    elementMap.merge!({from2 => :dummy})
+    assert_equal :dummy, t1.trans(from2)
+    # second transformer based on the element map of the first
+    t2 = MyTransformer.new(:env_in, env_out, elementMap)
+    # second transformer returns same objects
+    assert_equal t1.trans(from).object_id, t2.trans(from).object_id
+    assert_equal :dummy, t2.trans(from2)
+    # and no transformer rule is evaluated at this point
+		assert_equal nil, t2.modelInTrans_count
+    # now transform a new object in second transformer
+		assert t2.trans(from3).is_a?(ModelOut)
+		assert_equal "Test3", t2.trans(from3).name
+		assert_equal 1, t2.modelInTrans_count
+    # the first transformer returns the same object without evaluation of a transformer rule
+    assert_equal t1.trans(from3).object_id, t2.trans(from3).object_id
+		assert_equal 1, t1.modelInTrans_count
+  end
 	
 	def test_transformer_subclass
 		from = ModelInSub.new

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: rgen
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2007-11-25 00:00:00 +01:00
+  version: 0.4.2
+date: 2008-03-02 00:00:00 +01:00
 summary: Ruby Modelling and Generator Framework
 require_paths: 
 - lib
@@ -30,59 +30,58 @@ authors:
 - Martin Thiede
 files: 
 - lib/instantiators
-- lib/metamodels
-- lib/mmgen
-- lib/rgen
-- lib/transformers
 - lib/instantiators/ea_instantiator.rb
+- lib/metamodels
 - lib/metamodels/uml13_metamodel.rb
 - lib/metamodels/uml13_metamodel_ext.rb
+- lib/mmgen
 - lib/mmgen/metamodel_generator.rb
 - lib/mmgen/mmgen.rb
 - lib/mmgen/mm_ext
-- lib/mmgen/templates
 - lib/mmgen/mm_ext/ecore_ext.rb
+- lib/mmgen/templates
 - lib/mmgen/templates/annotations.tpl
 - lib/mmgen/templates/metamodel_generator.tpl
+- lib/rgen
 - lib/rgen/array_extensions.rb
 - lib/rgen/auto_class_creator.rb
 - lib/rgen/ecore
-- lib/rgen/environment.rb
-- lib/rgen/environment.rb.bak
-- lib/rgen/find_helper.rb
-- lib/rgen/instantiator
-- lib/rgen/metamodel_builder
-- lib/rgen/metamodel_builder.rb
-- lib/rgen/model_comparator.rb
-- lib/rgen/model_dumper.rb
-- lib/rgen/name_helper.rb
-- lib/rgen/serializer
-- lib/rgen/template_language
-- lib/rgen/template_language.rb
-- lib/rgen/transformer.rb
 - lib/rgen/ecore/ecore.rb
 - lib/rgen/ecore/ecore_instantiator.rb
 - lib/rgen/ecore/ecore_transformer.rb
+- lib/rgen/environment.rb
+- lib/rgen/environment.rb.bak
+- lib/rgen/instantiator
 - lib/rgen/instantiator/abstract_instantiator.rb
 - lib/rgen/instantiator/abstract_xml_instantiator.rb
 - lib/rgen/instantiator/default_xml_instantiator.rb
 - lib/rgen/instantiator/ecore_xml_instantiator.rb
 - lib/rgen/instantiator/nodebased_xml_instantiator.rb
 - lib/rgen/instantiator/xmi11_instantiator.rb
+- lib/rgen/metamodel_builder
 - lib/rgen/metamodel_builder/builder_extensions.rb
 - lib/rgen/metamodel_builder/builder_runtime.rb
 - lib/rgen/metamodel_builder/data_types.rb
 - lib/rgen/metamodel_builder/intermediate
+- lib/rgen/metamodel_builder/intermediate/annotation.rb
 - lib/rgen/metamodel_builder/metamodel_description.rb
 - lib/rgen/metamodel_builder/mm_multiple.rb
 - lib/rgen/metamodel_builder/module_extension.rb
-- lib/rgen/metamodel_builder/intermediate/annotation.rb
+- lib/rgen/metamodel_builder.rb
+- lib/rgen/model_comparator.rb
+- lib/rgen/model_dumper.rb
+- lib/rgen/name_helper.rb
+- lib/rgen/serializer
 - lib/rgen/serializer/xmi20_serializer.rb
 - lib/rgen/serializer/xml_serializer.rb
+- lib/rgen/template_language
 - lib/rgen/template_language/directory_template_container.rb
 - lib/rgen/template_language/output_handler.rb
 - lib/rgen/template_language/template_container.rb
 - lib/rgen/template_language/template_helper.rb
+- lib/rgen/template_language.rb
+- lib/rgen/transformer.rb
+- lib/transformers
 - lib/transformers/uml13_to_ecore.rb
 - test/array_extensions_test.rb
 - test/ea_instantiator_test.rb
@@ -90,33 +89,30 @@ files:
 - test/environment_test.rb
 - test/metamodel_builder_test.rb
 - test/metamodel_roundtrip_test
-- test/metamodel_roundtrip_test.rb
-- test/output_handler_test.rb
-- test/rgen_test.rb
-- test/template_language_test
-- test/template_language_test.rb
-- test/testmodel
-- test/transformer_test.rb
-- test/xml_instantiator_test
-- test/xml_instantiator_test.rb
 - test/metamodel_roundtrip_test/houseMetamodel.ecore
 - test/metamodel_roundtrip_test/houseMetamodel_from_ecore.rb
 - test/metamodel_roundtrip_test/houseMetamodel_Regenerated.ecore
 - test/metamodel_roundtrip_test/TestModel.rb
 - test/metamodel_roundtrip_test/TestModel_Regenerated.rb
+- test/metamodel_roundtrip_test.rb
+- test/output_handler_test.rb
+- test/rgen_test.rb
+- test/template_language_test
 - test/template_language_test/expected_result.txt
 - test/template_language_test/templates
-- test/template_language_test/testout.txt
 - test/template_language_test/templates/code
-- test/template_language_test/templates/content
-- test/template_language_test/templates/index
-- test/template_language_test/templates/root.tpl
 - test/template_language_test/templates/code/array.tpl
+- test/template_language_test/templates/content
 - test/template_language_test/templates/content/author.tpl
 - test/template_language_test/templates/content/chapter.tpl
+- test/template_language_test/templates/index
 - test/template_language_test/templates/index/c
-- test/template_language_test/templates/index/chapter.tpl
 - test/template_language_test/templates/index/c/cmod.tpl
+- test/template_language_test/templates/index/chapter.tpl
+- test/template_language_test/templates/root.tpl
+- test/template_language_test/testout.txt
+- test/template_language_test.rb
+- test/testmodel
 - test/testmodel/class_model_checker.rb
 - test/testmodel/ea_testmodel.eap
 - test/testmodel/ea_testmodel.xml
@@ -124,38 +120,35 @@ files:
 - test/testmodel/ecore_model_checker.rb
 - test/testmodel/manual_testmodel.xml
 - test/testmodel/object_model_checker.rb
+- test/transformer_test.rb
+- test/xml_instantiator_test
 - test/xml_instantiator_test/simple_ecore_model_checker.rb
 - test/xml_instantiator_test/simple_xmi_ecore_instantiator.rb
 - test/xml_instantiator_test/simple_xmi_metamodel.rb
 - test/xml_instantiator_test/simple_xmi_to_ecore.rb
+- test/xml_instantiator_test.rb
 - redist/xmlscan
 - redist/xmlscan/ChangeLog
 - redist/xmlscan/doc
-- redist/xmlscan/install.rb
-- redist/xmlscan/lib
-- redist/xmlscan/memo
-- redist/xmlscan/README
-- redist/xmlscan/samples
-- redist/xmlscan/test.rb
-- redist/xmlscan/tests
-- redist/xmlscan/THANKS
 - redist/xmlscan/doc/changes.html
 - redist/xmlscan/doc/changes.rd
 - redist/xmlscan/doc/en
-- redist/xmlscan/doc/ja
-- redist/xmlscan/doc/src
 - redist/xmlscan/doc/en/conformance.html
 - redist/xmlscan/doc/en/conformance.rd
 - redist/xmlscan/doc/en/manual.html
 - redist/xmlscan/doc/en/manual.rd
+- redist/xmlscan/doc/ja
 - redist/xmlscan/doc/ja/conformance.ja.html
 - redist/xmlscan/doc/ja/conformance.ja.rd
 - redist/xmlscan/doc/ja/manual.ja.html
 - redist/xmlscan/doc/ja/manual.ja.rd
+- redist/xmlscan/doc/src
 - redist/xmlscan/doc/src/conformance.rd.src
 - redist/xmlscan/doc/src/langsplit.rb
 - redist/xmlscan/doc/src/Makefile
 - redist/xmlscan/doc/src/manual.rd.src
+- redist/xmlscan/install.rb
+- redist/xmlscan/lib
 - redist/xmlscan/lib/xmlscan
 - redist/xmlscan/lib/xmlscan/encoding.rb
 - redist/xmlscan/lib/xmlscan/htmlscan.rb
@@ -165,17 +158,17 @@ files:
 - redist/xmlscan/lib/xmlscan/version.rb
 - redist/xmlscan/lib/xmlscan/visitor.rb
 - redist/xmlscan/lib/xmlscan/xmlchar.rb
+- redist/xmlscan/memo
 - redist/xmlscan/memo/CONFORMANCE
 - redist/xmlscan/memo/contentspec.ry
 - redist/xmlscan/memo/PRODUCTIONS
+- redist/xmlscan/README
+- redist/xmlscan/samples
 - redist/xmlscan/samples/chibixml.rb
 - redist/xmlscan/samples/getxmlchar.rb
 - redist/xmlscan/samples/rexml.rb
 - redist/xmlscan/samples/xmlbench
-- redist/xmlscan/samples/xmlbench.rb
-- redist/xmlscan/samples/xmlconftest.rb
 - redist/xmlscan/samples/xmlbench/parser
-- redist/xmlscan/samples/xmlbench/xmlbench-lib.rb
 - redist/xmlscan/samples/xmlbench/parser/chibixml.rb
 - redist/xmlscan/samples/xmlbench/parser/nqxml.rb
 - redist/xmlscan/samples/xmlbench/parser/rexml.rb
@@ -184,6 +177,11 @@ files:
 - redist/xmlscan/samples/xmlbench/parser/xmlscan-chibixml.rb
 - redist/xmlscan/samples/xmlbench/parser/xmlscan-rexml.rb
 - redist/xmlscan/samples/xmlbench/parser/xmlscan.rb
+- redist/xmlscan/samples/xmlbench/xmlbench-lib.rb
+- redist/xmlscan/samples/xmlbench.rb
+- redist/xmlscan/samples/xmlconftest.rb
+- redist/xmlscan/test.rb
+- redist/xmlscan/tests
 - redist/xmlscan/tests/deftestcase.rb
 - redist/xmlscan/tests/runtest.rb
 - redist/xmlscan/tests/testall.rb
@@ -194,6 +192,7 @@ files:
 - redist/xmlscan/tests/testscanner.rb
 - redist/xmlscan/tests/testxmlchar.rb
 - redist/xmlscan/tests/visitor.rb
+- redist/xmlscan/THANKS
 - README
 - CHANGELOG
 - MIT-LICENSE

data/lib/rgen/find_helper.rb

@@ -1,68 +0,0 @@
-module RGen
-
-module FindHelper
-	
-	# Finds and returns model elements in the environment.
-	# 
-	# The search description argument must be a hash specifying attribute/value pairs.
-	# Only model elements are returned which respond to the specified attribute methods
-	# and return the specified values as result of these attribute methods.
-	# 
-	# As a special hash key :class can be used to look for model elements of a specific
-	# class. In this case an array of possible classes can optionally be given.
-	# 
-	def find(desc)
-		result = []
-		classes = desc[:class] if desc[:class] and desc[:class].is_a?(Array)
-		classes = [ desc[:class] ] if !classes and desc[:class]
-		each {|e|
-			failed = false
-			failed = true if classes and !classes.any?{ |c| e.is_a?(c) }
-			desc.each_pair { |k,v|
-				failed = true if k != :class and ( !e.respond_to?(k) or e.send(k) != v )
-			}
-			result << e unless failed
-		}
-		result
-	end
-	
-	def findIndex(index_method)
-		index = FindIndex.new(index_method)
-		each { |e|
-			index.add(e)
-		}
-		index
-	end
-
-	class FindIndex
-	
-		def initialize(index_method)
-			@index_method = index_method.to_sym
-			@index = {}
-			@non_indexed = [].extend(FindHelper)
-		end
-		
-		def add(element)
-			if element.respond_to?(@index_method)
-				val = element.send(@index_method)
-				@index[val] ||= [].extend(FindHelper)
-				@index[val] << element
-			end
-			@non_indexed << element
-		end
-		
-		def find(desc)
-			if (desc.keys.include?(@index_method))
-				val = desc.delete(@index_method)		
-				return [] unless @index[val]
-				return @index[val].find(desc)
-			else
-				return @non_indexed.find(desc)
-			end
-		end
-		
-	end
-	
-end
-
-end