codemodels 0.2.3-java → 0.2.5-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: db4711f37b0bf8dbdc6c9cc22e232312889dcd17
+  data.tar.gz: 55535f102297a1c548586fb5016f9b27abcb7198
+SHA512:
+  metadata.gz: 60e734f24988aafcf5d07dc7524e74dfbc0010a37aab4ec32f38fa594afd4f60650eede7cd147c8bdede81e9dfb536ea4a5a00d81bd385950bd6a0b8216b9db4
+  data.tar.gz: 8bd823ea12998d2bfaa51da2352c256c29936c75349273b49d608c85c40a8f84efbdbf16824fe0e7154516321f616cb94c924f9e95358836bdaef8cfdd536f98

data/codemodels.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('json')
   s.add_dependency('rgen')
+  s.add_dependency('rgen_ext')
 
   s.add_development_dependency "bundler", "1.3.5"
   s.add_development_dependency "rake"  

data/lib/codemodels/artifact.rb

@@ -0,0 +1,108 @@
+require 'codemodels/position'
+
+module CodeModels
+
+class AbstractArtifact
+
+	def point_to_absolute(point)
+		offset = absolute_start
+		p = SourcePoint.new
+		p.line   = point.line  + offset.line - 1
+		p.column = point.column
+		p.column  += offset.column-1 if point.line==1
+		p
+	end
+
+	def position_to_absolute(position)
+		pos = SourcePosition.new
+		pos.begin_point = point_to_absolute(position.begin_point)
+		pos.end_point = point_to_absolute(position.end_point)
+		pos
+	end
+
+end
+
+class EmbeddedArtifact < AbstractArtifact
+	attr_accessor :host_artifact
+	attr_accessor :position_in_host
+
+	def absolute_start
+		p = host_artifact.absolute_start
+		p.line += position_in_host.begin_point.line-1
+		if position_in_host.begin_point.line==1			
+			# if I am on the first line of my "host", its column
+			# matters because there are not newlines to reset the column
+			# counter
+			p.column += position_in_host.begin_point.column-1 
+		else
+			p.column = position_in_host.begin_point.column
+		end
+		p
+	end
+
+	def to_s
+		"Embedded in (#{@host_artifact.to_s}) at #{position_in_host}"
+	end
+
+	def final_host
+		host_artifact.final_host
+	end
+
+	def code
+		position_in_host.get_string(host_artifact.code)
+	end
+
+	def embedded?
+		true
+	end
+
+	def embedding_level
+		@host_artifact.embedding_level+1
+	end	
+
+end
+
+class FileArtifact < AbstractArtifact
+	attr_reader :filename
+	attr_reader :code
+
+	def initialize(filename,code)
+		@filename = filename
+		@code = code
+	end
+
+	def absolute_start
+		sp = SourcePoint.new
+		sp.line   = 1
+		sp.column = 1
+		sp
+	end
+
+	def to_s
+		"File #{filename}"
+	end
+
+	def final_host
+		self
+	end
+
+	def embedded?
+		false
+	end
+
+	def embedding_level
+		0
+	end
+
+	def eql?(other)
+		return false unless other.is_a?(FileArtifact)
+		self.filename==other.filename && self.code==other.code
+	end
+
+	def ==(other)
+		self.eql?(other)
+	end
+	
+end
+
+end

data/lib/codemodels/comparison.rb

@@ -0,0 +1,23 @@
+module CodeModels
+
+module ComparisonModule
+
+	def eql?(other)
+		return false unless RGen::Ext::Comparison::DeepComparator.eql?(self,other)
+		if self.respond_to?(:source) || other.respond_to?(:source)
+			return false if (self.source==nil) != (other.source==nil)
+			return true if self.source==nil
+			return false if (self.source.position==nil) != (other.source.position==nil)				
+			return true if self.source.position==nil
+			return self.source.position(:absolute)==other.source.position(:absolute)
+		end
+		true
+	end
+
+	def ==(other)
+		eql? other
+	end
+
+end
+
+end

data/lib/codemodels/metamodel.rb

@@ -1,17 +1,25 @@
 require 'rgen/metamodel_builder'
+require 'rgen/ext'
 require 'codemodels/source_info'
 require 'codemodels/navigation'
 require 'codemodels/info_extraction'
 require 'codemodels/serialization'
+require 'codemodels/comparison'
 
 module CodeModels
 
 # All AST nodes built with CodeModels should derive from this one
 class CodeModelsAstNode < RGen::MetamodelBuilder::MMBase
+
+	class << self
+		include RGen::Ext::InstantiationExtensions
+	end
+
 	include SourceInfoExtensions
 	include ForeignAstExtensions
 	include HostPositionExtensions
 	include NavigationExtensions
+	include ComparisonModule
 	include InfoExtraction::InfoExtractionFunctionalities
 	include Serialization::SerializationFunctionalities
 end

data/lib/codemodels/navigation.rb

@@ -9,7 +9,7 @@ module NavigationExtensions
 		# Awful hack to forbid the same reference is visited twice when
 		# two references with the same name are found
 		already_used_references = []
-		ecore.eAllReferences.select {|r| r.containment}.each do |ref|
+		ecore.eAllReferences.sort_by{|r| r.name}.select {|r| r.containment}.each do |ref|
 			#raise "Too many features with name #{ref.name}. Count: #{features_by_name(ref.name).count}" if features_by_name(ref.name).count!=1
 			unless already_used_references.include?(ref.name)
 				res = self.send(ref.name.to_sym)
@@ -49,6 +49,14 @@ module NavigationExtensions
 		end
 	end
 
+	def values_map(flags=nil)
+		if flags.include?(:deep)
+			collect_values_with_count_subtree(flags[:also_foreign])
+		else
+			collect_values_with_count
+		end
+	end
+
 	def collect_values_with_count
 		values = Hash.new {|h,k| h[k]=0}
 		self.class.ecore.eAllAttributes.each do |a|
@@ -95,15 +103,21 @@ module NavigationExtensions
 	end
 
 	def container(flag=nil)
-		also_foreign = (flag==:also_foreign)
-		return self.eContainer if self.eContainer
-		if also_foreign
-			self.foreign_container
+		# a foreign child could have its own parent in the foreign ast, which is not part of the complexive AST
+		# the foreign parent has therefore the precedence.
+		also_foreign = (flag==:also_foreign)		
+		if also_foreign && self.foreign_container
+			return self.foreign_container
 		else
-			nil
+			return self.eContainer
 		end
 	end
 
+	def root(flag=nil)
+		return self unless self.container(flag)
+		self.container(flag).root(flag)
+	end
+
 	def all_children_also_foreign
 		all_children(:also_foreign)
 	end
@@ -113,7 +127,11 @@ module NavigationExtensions
 	end		
 
 	def traverse_also_foreign(&block)
-		traverse(:also_foreign,block)
+		traverse(:also_foreign,&block)
+	end
+
+	def container_also_foreign
+		container(:also_foreign)
 	end
 
 end

data/lib/codemodels/parsing.rb

@@ -17,7 +17,7 @@ class ParsingError < Exception
  	def initialize(node,msg,line=nil)
  		@node = node
  		@msg = msg
- 		@line = lin
+ 		@line = line
  	end
 
  	def to_s

data/lib/codemodels/position.rb

@@ -0,0 +1,156 @@
+module CodeModels
+
+class SourcePoint
+	include Comparable
+	
+	attr_accessor :line, :column
+
+	def self.from_code_index(code,index)
+		l = line(code,index)
+		c = column(code,index)
+		SourcePoint.new(l,c)
+	end
+
+	def initialize(line=nil,column=nil)
+		self.line= line
+		self.column= column
+	end
+
+	def line=(v)
+		raise "Unvalid line #{v}" if v && v<1
+		@line   = v
+	end
+
+	def column=(v)
+		# is valid only for newlines
+		raise "Unvalid column #{v}" if v && v<0
+		@column = v
+	end
+
+	def eql?(other)
+		other.line==line && other.column==column
+	end
+
+	def ==(other)
+		self.eql?(other)
+	end
+
+	def to_s
+		"Line #{@line}, Col #{@column}"
+	end
+
+	def to_absolute_index(s)
+		index = 0
+		lines = s.lines
+		(@line-1).times do
+			index+=lines.next.length
+		end
+		index+=@column
+		index-=1
+		index
+		
+		# current_line = lines.next
+		# i=0
+		# c=0
+		# while c<@column
+		# 	c += current_line[i]=='\t' ? COLUMNS_FOR_TAB : 1
+		# 	i += 1
+		# end
+
+		# index+=c
+		# index-=1
+		# index		
+	end
+
+	def <=>(other)
+		lc = self.line<=>other.line
+		if lc==0
+			self.column<=>other.column
+		else
+			lc
+		end
+	end
+
+	private
+
+	def self.line(code,index)
+		piece = code[0..index]		
+		return piece.lines.count+1 if code[index]=="\n"
+		piece.lines.count
+	end
+
+	def self.column(code,index)
+		piece = code[0..index]
+		last_line = nil
+		piece.lines.each{|l| last_line=l}
+		return 0 if code[index]=="\n"
+		last_line.length
+	end
+end
+
+class SourcePosition
+	attr_accessor :begin_point, :end_point
+
+	def self.from_code_indexes(code,begin_index,end_index)
+		SourcePosition.new(SourcePoint.from_code_index(code,begin_index),SourcePoint.from_code_index(code,end_index))
+	end
+
+	def initialize(begin_point=nil,end_point=nil)
+		@begin_point = begin_point
+		@end_point = end_point
+	end
+
+	def begin_line=(line)
+		@begin_point=SourcePoint.new unless @begin_point
+		@begin_point.line = line
+	end
+
+	def begin_column=(column)
+		@begin_point=SourcePoint.new unless @begin_point
+		@begin_point.column = column
+	end
+
+	def eql?(other)
+		return false unless other.respond_to?(:begin_point)
+		return false unless other.respond_to?(:end_point)
+		other.begin_point==begin_point && other.end_point==end_point
+	end
+
+	def ==(other)
+		self.eql?(other)
+	end
+
+	def to_s
+		"from #{@begin_point} to #{@end_point}"
+	end
+
+	def get_string(s)
+		as = @begin_point.to_absolute_index(s)
+		ae = @end_point.to_absolute_index(s)
+		s[as..ae]
+	end
+
+	def begin_line
+		@begin_point.line
+	end
+
+	def end_line
+		@end_point.line
+	end
+
+	def begin_column
+		@begin_point.column
+	end
+
+	def end_column
+		@end_point.column
+	end	
+
+	def include?(other)
+		(self.begin_point <= other.begin_point) && (self.end_point >= other.end_point)
+	end
+
+end
+
+
+end

data/lib/codemodels/serialization.rb

@@ -1,4 +1,4 @@
-# This code permit to transform RGen-Objects in Hash objects
+# This code permit to transform AstNode in Hash objects
 # containing lists and single values
 
 require 'json'
@@ -23,10 +23,10 @@ module SerializationFunctionalities
 			end
 		end
 		e_class = e_object.class.ecore
-		e_class.eAllAttributes.each do |a|		
+		e_class.eAllAttributes.sort_by { |a| a.name }.each do |a|		
 			jsonize_attr_value(map,a)
 		end
-		e_class.eAllReferences.each do |r|
+		e_class.eAllReferences.sort_by { |r| r.name }.each do |r|
 			id = jsonize_ref_value(map,r,adapters,serialization_memory)
 		end
 		if adapters.has_key? type
@@ -39,11 +39,11 @@ module SerializationFunctionalities
 
 	def source_info_to_json(source_info)
 		source_map = {}
-		if self.source.begin_pos
-			source_map['begin_pos'] = {'line'=> self.source.begin_pos.line, 'column'=>self.source.begin_pos.column}
+		if self.source.begin_point
+			source_map['begin_point'] = {'line'=> self.source.begin_point.line, 'column'=>self.source.begin_point.column}
 		end				
-		if self.source.end_pos
-			source_map['end_pos'] = {'line'=> self.source.end_pos.line, 'column'=>self.source.end_pos.column}
+		if self.source.end_point
+			source_map['end_point'] = {'line'=> self.source.end_point.line, 'column'=>self.source.end_point.column}
 		end			
 		source_map	
 	end

data/lib/codemodels/source_info.rb

@@ -1,130 +1,94 @@
 require 'rgen/metamodel_builder'
 require 'codemodels/language'
+require 'codemodels/position'
+require 'codemodels/artifact'
 
 module CodeModels
 
-class AbstractArtifact
-
-	def point_to_absolute(point)
-		offset = absolute_start
-		p = SourcePoint.new
-		p.line   = point.line  + offset.line - 1
-		p.column = point.column
-		p.column  += offset.column-1 if point.line==1
-		p
-	end
-
-	def position_to_absolute(position)
-		pos = SourcePosition.new
-		pos.begin_point = point_to_absolute(position.begin_point)
-		pos.end_point = point_to_absolute(position.end_point)
-		pos
-	end
-
-end
+class SourceInfo
+	attr_accessor :artifact
+	attr_accessor :position
 
-class EmbeddedArtifact < AbstractArtifact
-	attr_accessor :host_artifact
-	attr_accessor :position_in_host
-
-	def absolute_start
-		p = host_artifact.absolute_start
-		p.line   += position_in_host.begin_point.line-1
-		if position_in_host.begin_point.line==1			
-			# if I am on the first line of my "host", its column
-			# matters because there are not newlines to reset the column
-			# counter
-			p.column += position_in_host.begin_point.column-1 
+	def artifact(scope=:relative)
+		case scope
+		when :relative
+			@artifact
+		when :absolute
+			@artifact.final_host
 		else
-			p.column = position_in_host.begin_point.column
+			raise "unvalid scope"
 		end
-		p
 	end
 
-end
-
-class FileArtifact < AbstractArtifact
-	attr_accessor :filename
-
-	def absolute_start
-		sp = SourcePoint.new
-		sp.line   = 1
-		sp.column = 1
-		sp
+	def code
+		position(:absolute).get_string(artifact.final_host.code)
 	end
-end
-
-class SourcePoint
-	attr_accessor :line, :column
 
-	def initialize(line=nil,column=nil)
-		@line   = line
-		@column = column
+	def position=(value)
+		raise "Not assignable #{value} (#{value.class})" unless value.is_a?(SourcePosition)
+		@position = value
 	end
 
-	def eql?(other)
-		other.line==line && other.column==column
+	def begin_point=(data)
+		point = data_to_point(data)
+		@position = SourcePosition.new unless @position
+		@position.begin_point = point
 	end
 
-	def ==(other)
-		self.eql?(other)
+	def end_point=(data)
+		point = data_to_point(data)
+		@position = SourcePosition.new unless @position
+		@position.end_point = point		
 	end
-end
 
-class SourcePosition
-	attr_accessor :begin_point, :end_point
-
-	def initialize(begin_point=nil,end_point=nil)
-		@begin_point = begin_point
-		@end_point = end_point
+	def begin_line(flag=:relative)
+		position.begin_point.line
 	end
 
-	def begin_line=(line)
-		@begin_point=SourcePoint.new unless @begin_point
-		@begin_point.line = line
-	end
+	def end_line(flag=:relative)
+		position(flag).end_point.line
+	end	
 
-	def begin_column=(column)
-		@begin_point=SourcePoint.new unless @begin_point
-		@begin_point.column = column
+	def begin_column(flag=:relative)
+		position(flag).begin_point.column
 	end
 
-	def eql?(other)
-		other.begin_point==begin_point && other.end_point==end_point
+	def end_column(flag=:relative)
+		position(flag).end_point.column
 	end
 
-	def ==(other)
-		self.eql?(other)
+	def begin_point(flag=:relative)
+		position(flag).begin_point
 	end
-end
 
-class SourceInfo
-	attr_accessor :artifact
-	attr_accessor :position
-
-	def to_code
-		raise "Unimplemented"
+	def end_point(flag=:relative)
+		position(flag).end_point
 	end
 
-	def begin_point=(data)
-		point = data_to_point(data)
-		@position = SourcePosition.new unless @position
-		@position.begin_point = point
+	def position(flag=:relative)
+		value = if flag==:relative
+			@position
+		elsif flag==:absolute
+			absolute_position
+		else
+			raise "unvalid value #{flag}"
+		end	
+		raise "Returning not a position #{value} (#{value.class})" unless value.is_a?(SourcePosition)
+		value
 	end
 
-	def end_point=(data)
-		point = data_to_point(data)
-		@position = SourcePosition.new unless @position
-		@position.end_point = point		
+	def absolute_position
+		raise "#{self} is not placed in any artifact" unless @artifact
+		@artifact.position_to_absolute(@position)
 	end
 
-	def begin_line
-		position.begin_point.line
+	def embedded?
+		@artifact.embedded?
 	end
 
-	def end_line
-		position.end_point.line
-	end	
+	def embedding_level
+		@artifact.embedding_level
+	end
 
 	private
 

data/lib/codemodels/version.rb

@@ -1,3 +1,3 @@
 module CodeModels
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

data/test/test_foreign_navigation.rb

@@ -60,12 +60,34 @@ def test_all_children_deep_also_foreign
 	assert_equal [],							@c2.all_children_deep_also_foreign
 end
 
-def traverse_also_foreign
+def test_traverse_also_foreign
 	ids = []
-	CodeModels.traverse_also_foreign(@a1) do |n|
+	@a1.traverse_also_foreign do |n|
 		ids << n.id
 	end
 	assert_equal ['a1','b4','b5','c1','b1','b2','b3','c2'],ids
 end
 
+def test_container_also_foreign
+	assert_equal nil,@a1.container_also_foreign
+	assert_equal @c1,@b1.container_also_foreign
+	assert_equal @b1,@b2.container_also_foreign
+	assert_equal @b1,@b3.container_also_foreign
+	assert_equal @a1,@b4.container_also_foreign
+	assert_equal @b4,@b5.container_also_foreign
+	assert_equal @a1,@c1.container_also_foreign
+	assert_equal @a1,@c2.container_also_foreign
+end
+
+def test_root
+	assert_equal @a1,@a1.root(:also_foreign)
+	assert_equal @a1,@b1.root(:also_foreign)
+	assert_equal @a1,@b2.root(:also_foreign)
+	assert_equal @a1,@b3.root(:also_foreign)
+	assert_equal @a1,@b4.root(:also_foreign)
+	assert_equal @a1,@b5.root(:also_foreign)
+	assert_equal @a1,@c1.root(:also_foreign)
+	assert_equal @a1,@c2.root(:also_foreign)
+end
+
 end

data/test/test_metamodel.rb

@@ -17,7 +17,7 @@ def setup
 	ea3_pos.begin_line = 1
 	ea3_pos.begin_column = 2
 
-	@fa1 = FileArtifact.new
+	@fa1 = FileArtifact.new("pippo.txt","...code...")
 	
 	@ea1 = EmbeddedArtifact.new
 	@ea1.host_artifact = @fa1

data/test/test_rgen_ext.rb

@@ -107,23 +107,17 @@ def test_equal_wit_children
 	assert_equal false, d1==d2 # a child is different
 end
 
-def test_build_with_one_attribute
-	c = C.build(1)
-	assert_equal 1,c.id
-end
-
 class McWithTwoAttrs < RGen::MetamodelBuilder::MMBase
+	include ComparisonModule
+	class << self
+		include RGen::Ext::InstantiationExtensions
+	end
 	has_attr 'i',Integer
 	has_attr 's',String
 end
 
-def test_build_with_multiple_attributes
-	c = McWithTwoAttrs.build i: 27, s: 'Federico'
-	assert_equal 27,c.i
-	assert_equal 'Federico',c.s
-end
-
 class McWithNonContRef < RGen::MetamodelBuilder::MMBase
+	include ComparisonModule
 	has_one 'mcwta',McWithTwoAttrs
 end
 
@@ -153,6 +147,7 @@ def test_equal_with_nil_ref
 end
 
 class McWithNonContRefMany < RGen::MetamodelBuilder::MMBase
+	include ComparisonModule
 	has_many 'mcwtas',McWithTwoAttrs
 end
 

data/test/test_source_info.rb

@@ -0,0 +1,139 @@
+require 'test_helper'
+
+class TestSourceInfo < Test::Unit::TestCase
+
+include CodeModels
+
+def setup
+
+end
+
+def test_source_point_from_code_index
+	code = "first line\nsecond line\nthird line\n"
+	
+	# first line
+	assert_equal SourcePoint.new(1,1),SourcePoint.from_code_index(code,0)
+	assert_equal SourcePoint.new(1,2),SourcePoint.from_code_index(code,1)
+	assert_equal SourcePoint.new(1,3),SourcePoint.from_code_index(code,2)
+	assert_equal SourcePoint.new(1,9),SourcePoint.from_code_index(code,8)
+	assert_equal SourcePoint.new(1,10),SourcePoint.from_code_index(code,9)
+
+	# new line
+	assert_equal SourcePoint.new(2,0),SourcePoint.from_code_index(code,10)
+
+	# second line
+	assert_equal SourcePoint.new(2,1),SourcePoint.from_code_index(code,11)
+	assert_equal SourcePoint.new(2,2),SourcePoint.from_code_index(code,12)
+	assert_equal SourcePoint.new(2,10),SourcePoint.from_code_index(code,20)
+	assert_equal SourcePoint.new(2,11),SourcePoint.from_code_index(code,21)
+
+	# new line
+	assert_equal SourcePoint.new(3,0),SourcePoint.from_code_index(code,22)	
+
+	# third line
+	assert_equal SourcePoint.new(3,1),SourcePoint.from_code_index(code,23)
+	assert_equal SourcePoint.new(3,10),SourcePoint.from_code_index(code,32)
+
+	# new line
+	assert_equal SourcePoint.new(4,0),SourcePoint.from_code_index(code,33)
+end
+
+def test_source_point_absolute_index
+	code = "first line\nsecond line\nthird line\n"
+	p1 = SourcePoint.new(1,1)	
+	p2 = SourcePoint.new(1,5)
+	p3 = SourcePoint.new(1,10)
+	p4 = SourcePoint.new(2,6)
+	p5 = SourcePoint.new(2,2)
+	p7 = SourcePoint.new(3,1)
+	p8 = SourcePoint.new(3,10)
+
+	assert_equal 0,p1.to_absolute_index(code)
+	assert_equal 4,p2.to_absolute_index(code)
+	assert_equal 9,p3.to_absolute_index(code)
+	assert_equal 16,p4.to_absolute_index(code)
+	assert_equal 12,p5.to_absolute_index(code)
+	assert_equal 23,p7.to_absolute_index(code)
+	assert_equal 32,p8.to_absolute_index(code)
+end
+
+def test_source_position_get_string
+	code = "first line\nsecond line\nthird line\n"
+
+	p1 = SourcePoint.new(1,1)
+	p2 = SourcePoint.new(1,5)
+	pos1 = SourcePosition.new(p1,p2)
+	assert_equal "first",pos1.get_string(code)
+
+	p3 = SourcePoint.new(1,10)
+	pos2 = SourcePosition.new(p1,p3)
+	assert_equal "first line",pos2.get_string(code)
+
+	p4 = SourcePoint.new(2,6)
+	pos3 = SourcePosition.new(p1,p4)
+	assert_equal "first line\nsecond",pos3.get_string(code)
+
+	p5 = SourcePoint.new(2,2)
+	p6 = SourcePoint.new(2,6)
+	pos4 = SourcePosition.new(p5,p6)
+	assert_equal "econd",pos4.get_string(code)
+
+	p7 = SourcePoint.new(3,1)
+	p8 = SourcePoint.new(3,10)
+	pos5 = SourcePosition.new(p7,p8)
+	assert_equal "third line",pos5.get_string(code)
+end
+
+def test_source_point_comparison
+	p1 = SourcePoint.new(1,1)
+	p2 = SourcePoint.new(1,1)
+	p3 = SourcePoint.new(1,3)
+	p4 = SourcePoint.new(2,1)
+	p5 = SourcePoint.new(2,6)
+
+	assert_equal  0,p1<=>p1
+	assert_equal  0,p1<=>p2
+	assert_equal -1,p1<=>p3
+	assert_equal -1,p1<=>p4
+	assert_equal -1,p1<=>p5
+
+	assert_equal  0,p2<=>p1
+	assert_equal  0,p2<=>p2
+	assert_equal -1,p2<=>p3
+	assert_equal -1,p2<=>p4
+	assert_equal -1,p2<=>p5	
+
+	assert_equal  1,p3<=>p1
+	assert_equal  1,p3<=>p2
+	assert_equal  0,p3<=>p3
+	assert_equal -1,p3<=>p4
+	assert_equal -1,p3<=>p5	
+
+	assert_equal  1,p4<=>p1
+	assert_equal  1,p4<=>p2
+	assert_equal  1,p4<=>p3
+	assert_equal  0,p4<=>p4
+	assert_equal -1,p4<=>p5	
+
+	assert_equal  1,p5<=>p1
+	assert_equal  1,p5<=>p2
+	assert_equal  1,p5<=>p3
+	assert_equal  1,p5<=>p4
+	assert_equal  0,p5<=>p5	
+end
+
+def test_source_position_include
+	p1 = SourcePoint.new(1,1)
+	p2 = SourcePoint.new(1,1)
+	p3 = SourcePoint.new(1,3)
+	p4 = SourcePoint.new(2,1)
+	p5 = SourcePoint.new(2,6)
+
+	assert_equal true,SourcePosition.new(p1,p2).include?(SourcePosition.new(p2,p1))
+	assert_equal true,SourcePosition.new(p1,p5).include?(SourcePosition.new(p3,p4))
+	assert_equal true,SourcePosition.new(p3,p5).include?(SourcePosition.new(p4,SourcePoint.new(2,2)))
+	assert_equal false,SourcePosition.new(p3,p4).include?(SourcePosition.new(p4,p5))
+	assert_equal false,SourcePosition.new(p1,p4).include?(SourcePosition.new(p1,p5))
+end
+
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codemodels
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.2.3
+  version: 0.2.5
 platform: java
 authors:
 - Federico Tomassetti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -18,13 +17,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -34,13 +31,25 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rgen_ext
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -50,13 +59,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.5
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.5
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -66,13 +73,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -82,13 +87,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 description: Library to build models of code of different languages in a uniform way.
@@ -104,6 +107,8 @@ files:
 - Rakefile
 - codemodels.gemspec
 - lib/codemodels.rb
+- lib/codemodels/artifact.rb
+- lib/codemodels/comparison.rb
 - lib/codemodels/info_extraction.rb
 - lib/codemodels/language.rb
 - lib/codemodels/metamodel.rb
@@ -111,7 +116,7 @@ files:
 - lib/codemodels/monkey_patching.rb
 - lib/codemodels/navigation.rb
 - lib/codemodels/parsing.rb
-- lib/codemodels/rgen_ext.rb
+- lib/codemodels/position.rb
 - lib/codemodels/serialization.rb
 - lib/codemodels/source_info.rb
 - lib/codemodels/version.rb
@@ -125,9 +130,11 @@ files:
 - test/test_monkey_patching.rb
 - test/test_rgen_ext.rb
 - test/test_serialization.rb
+- test/test_source_info.rb
 homepage: https://github.com/ftomassetti/codemodels
 licenses:
 - Apache v2
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -136,25 +143,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Library to build models of code
 test_files:
 - test/data/node_setCompleted.json
@@ -167,3 +166,4 @@ test_files:
 - test/test_monkey_patching.rb
 - test/test_rgen_ext.rb
 - test/test_serialization.rb
+- test/test_source_info.rb

data/lib/codemodels/rgen_ext.rb

@@ -1,133 +0,0 @@
-# Extensions to RGen objects
-
-require 'rgen/metamodel_builder'
-
-class RGen::MetamodelBuilder::MMBase
-
-	module ClassAddOn
-
-		def build(values={})
-			instance = self.new
-			if values.is_a? Hash
-				values.each do |k,v|
-					attribute = self.ecore.eAllAttributes.find {|x| x.name==k.to_s}
-					reference = self.ecore.eAllReferences.find {|x| x.name==k.to_s}
-					raise "UnexistingFeature #{k}" unless (attribute or reference)
-					setter = (k.to_s+'=').to_sym
-					instance.send setter, v
-				end
-			else
-				raise "SingleAttributeRequired" if self.ecore.eAllAttributes.count!=1
-				attribute = self.ecore.eAllAttributes[0]
-				set_attr(instance,attribute,values)
-			end
-			instance
-		end
-
-		private
-
-		def set_attr(instance,attribute,value)
-			setter = (attribute.name+'=').to_sym
-			instance.send setter, value
-		end
-	end
-
-	module SingletonAddOn
-
-		# It does not check references, it is needed to avoid infinite recursion
-		def shallow_eql?(other)
-			return false if other==nil
-			return false unless self.class==other.class
-			self.class.ecore.eAllAttributes.each do |attrib|
-				raise "Attrib <nil> for class #{self.class.ecore.name}" unless attrib
-				self_value  = self.get(attrib)
-				other_value = other.get(attrib)
-				return false unless self_value == other_value
-			end
-			true
-		end
-
-		def eql?(other)
-			# it should ignore relations which has as opposite a containement
-			return false unless self.shallow_eql?(other)
-			self.class.ecore.eAllReferences.each do |ref|
-				self_value = self.get(ref)
-				other_value = other.get(ref)
-				to_ignore = ref.getEOpposite and ref.getEOpposite.containment
-				unless to_ignore
-					if ref.containment
-						return false unless self_value == other_value
-					else
-						if (self_value.is_a? Array) or (other_value.is_a? Array)
-							return false unless self_value.count==other_value.count
-							for i in 0..(self_value.count-1)
-								unless self_value[i].shallow_eql?(other_value[i])
-									return false 
-								end
-							end
-						else  
-							if self_value==nil
-								return false unless other_value==nil
-							else
-								return false unless self_value.shallow_eql?(other_value)
-							end
-						end
-					end
-				end						
-			end
-			true
-		end
-
-		def ==(other)
-			eql? other
-		end
-	
-		def get(attr_or_ref)
-			getter = (attr_or_ref.name).to_sym
-			send getter
-		end
-
-		def features_by_name(name)
-			features = []
-			ecore = self.class.ecore
-			ecore.eAllAttributes.select {|a| a.name==name}.each do |a|
-				features << a
-			end			
-			ecore.eAllReferences.select {|r| r.name==name}.each do |r|
-				features << r
-			end
-			features
-		end
-
-	end
-
-	module FixingCollidingFeatureAddOn
-		def has_attr(role, target_class=nil, raw_props={}, &block)
-			raise "Role already used #{role}" if self.ecore.eAllAttributes.find {|a| a.name==role.to_s}
-			raise "Role already used #{role}" if self.ecore.eAllReferences.find {|r| r.name==role.to_s}
-			super(role,target_class,raw_props,block)
-		end
-		def has_many_attr(role, target_class=nil, raw_props={}, &block)
-			raise "Role already used #{role}" if self.ecore.eAllAttributes.find {|a| a.name==role.to_s}
-			raise "Role already used #{role}" if self.ecore.eAllReferences.find {|r| r.name==role.to_s}
-			super(role,target_class,raw_props,block)
-		end
-		def contains_many_uni(role, target_class=nil, raw_props={}, &block)
-			raise "Role already used #{role}" if self.ecore.eAllAttributes.find {|a| a.name==role.to_s}
-			raise "Role already used #{role}" if self.ecore.eAllReferences.find {|r| r.name==role.to_s}
-			super(role,target_class,raw_props,block)
-		end
-		def contains_one_uni(role, target_class=nil, raw_props={}, &block) 
-			raise "Role already used #{role}" if self.ecore.eAllAttributes.find {|a| a.name==role.to_s}
-			raise "Role already used #{role}" if self.ecore.eAllReferences.find {|r| r.name==role.to_s}
-			super(role,target_class,raw_props,block)
-		end
-	end
-
-	class << self
-		include ClassAddOn
-	end
-
-	include FixingCollidingFeatureAddOn
-	include SingletonAddOn
-end