rubymm 0.1.0-java → 0.1.2-java

data/lib/rubymm.rb

@@ -4,4 +4,5 @@ Dir[curr_dir+"/jars/*.jar"].each do |jar|
 end
 
 require 'rubymm/metamodel'
+require 'rubymm/query'
 require 'rubymm/parser'

data/lib/rubymm/metamodel.rb

@@ -5,26 +5,210 @@ module RubyMM
 	class Value < RGen::MetamodelBuilder::MMBase
 	end
 
+	class Statement < Value
+	end
+
+	class IfStatement < Statement
+		contains_one_uni 'condition', Value
+		contains_many_uni 'body', Value
+	end
+
 	class Block < Value
-		has_many 'contents', Value
+		contains_many_uni 'contents', Value
 	end 
 
 	class Call < Value
 		has_attr 'name', String
-		has_many 'args', Value
-		has_one 'receiver', Value
+		contains_many_uni 'args', Value
+		contains_one_uni 'receiver', Value
+		has_attr 'implicit_receiver', Boolean
+
+		module Methods
+			def inspect
+				"Call{name=#{name},args=#{args},receiver=#{receiver.class},implicit_receiver=#{implicit_receiver}}"
+			end
+		end
+
+		include Methods
 	end
 
-	class Def < RGen::MetamodelBuilder::MMBase
+	class Def < Value
 		has_attr 'name', String
-		has_one 'body', Value
+		contains_one_uni 'body', Value
+		has_attr 'onself',Boolean
 	end
 
 	class Literal < Value
+		module Methods
+
+			def to_s
+				value.to_s
+			end
+
+			def inspect
+				"#{self.class}[#{to_s}]"
+			end
+
+		end
+
+		include Methods
+	end
+
+	class BooleanLiteral < Literal
+		has_attr 'value', Boolean
 	end
 
 	class IntLiteral < Literal
 		has_attr 'value', Integer
 	end
 
+	def self.bool(value)
+		BooleanLiteral.build(value)
+	end
+
+	def self.int(value)
+		IntLiteral.build(value)
+	end
+
+	class StringLiteral < Literal
+		has_attr 'value', String
+		has_attr 'dynamic', Boolean
+		contains_many_uni 'pieces', Value # only for dynamic strings
+	end
+
+	def self.string(value)
+		StringLiteral.build(value)
+	end
+
+	class NilLiteral < Literal
+	end
+
+	class Constant < Value
+		has_attr 'name', String
+		contains_one_uni 'container',Constant
+		has_one 'top_container',Constant, :derived => true
+
+		module Methods
+			def top_container_derived
+				return nil unless container
+				return container if not container.container
+				container.top_container
+			end
+
+			def to_s
+				return "#{name}" unless container
+				"#{container}::#{name}"
+			end
+
+			def inspect
+				'Constant{'+self.to_s+'}'
+			end
+		end
+		include Methods
+	end
+
+	def self.constant(first_part,*other_parts)
+		cont = Constant.build(first_part)
+
+		return cont if other_parts.count == 0
+
+		new_first_part, *new_other_parts = other_parts
+
+		internal_constant = constant(new_first_part, *new_other_parts)
+		if internal_constant.container
+			internal_constant.top_container.container = cont
+		else
+			internal_constant.container = cont
+		end
+
+		internal_constant
+	end
+
+	class ModuleDecl < Value
+		contains_one_uni 'defname', Constant
+		contains_many_uni 'contents', Value
+	end
+
+	class ClassDecl < Value
+		contains_one_uni 'defname', Constant
+		contains_one_uni 'super_class',Constant
+		contains_many_uni 'contents', Value
+	end
+
+	class Symbol < Value
+		has_attr 'name', String
+	end
+
+	class VarAssignement < Value
+		has_attr 'name_assigned', String
+		contains_one_uni 'value', Value
+	end
+
+	class LocalVarAssignment < VarAssignement
+	end
+
+	class GlobalVarAssignment < VarAssignement
+	end
+
+	class InstanceVarAssignement < VarAssignement
+	end
+
+	class VarAccess < Value
+		has_attr 'name', String
+
+		module Methods
+			def to_s
+				name
+			end
+
+			def inspect
+				"#{self.class}{#{self.to_s}}"
+			end
+		end
+		include Methods
+	end
+
+	class LocalVarAccess < VarAccess
+	end
+
+	def self.localvarac(name)
+		lva = LocalVarAccess.new
+		lva.name = name
+		lva
+	end
+
+	class GlobalVarAccess < VarAccess
+	end
+
+	class InstanceVarAccess < VarAccess
+	end
+
+	class HashPair < RGen::MetamodelBuilder::MMBase
+		contains_one_uni 'key', Value
+		contains_one_uni 'value', Value
+	end
+
+	class HashLiteral < Literal
+		contains_many_uni 'pairs', HashPair
+	end
+
+	class ArrayLiteral < Literal
+		contains_many_uni 'values', Value
+	end
+
+	class BeginRescue < Value
+		contains_one_uni 'body',Value
+		contains_one_uni 'rescue_body',Value
+	end
+
+	class ElementAssignement < Value
+		contains_one_uni 'array',Value
+		contains_one_uni 'element',Value
+		contains_one_uni 'value',Value
+	end
+
+	class Return < Statement
+		contains_one_uni 'value',Value
+	end
+
 end

data/lib/rubymm/parser.rb

@@ -4,11 +4,18 @@ require 'java'
 require 'emf_jruby'
 
 java_import org.jrubyparser.ast.ArrayNode
+java_import org.jrubyparser.ast.ListNode
 
 module RubyMM
 
+def self.parse_file(path)
+	content = IO.read(path)
+	self.parse(content)
+end
+
 def self.parse(code)
 	tree = JRubyParser.parse(code)
+	#puts "Code: #{code} Root: #{tree}"
 	tree_to_model(tree)
 end
 
@@ -19,7 +26,22 @@ def self.tree_to_model(tree)
 	node_to_model tree.body
 end
 
+def self.body_node_to_contents(body_node,container_node)
+	body = node_to_model(body_node)
+	if body
+		if body.is_a? RubyMM::Block	
+			body.contents.each do |el|
+				container_node.contents = container_node.contents << el 
+			end
+		else
+			container_node.contents = container_node.contents << body
+		end
+	end
+end
+
 def self.node_to_model(node)
+	return nil if node==nil
+	#puts "#{node} #{node.node_type.name}"
 	case node.node_type.name
 	when 'NEWLINENODE'
 		node_to_model node.next_node
@@ -28,12 +50,33 @@ def self.node_to_model(node)
 		model.name = node.name
 		model.receiver = node_to_model node.receiver
 		model.args = args_to_model node.args
+		model.implicit_receiver = false
 		model
+	when 'VCALLNODE'
+		model = RubyMM::Call.new
+		model.name = node.name
+		#model.receiver = node_to_model node.receiver
+		#model.args = args_to_model node.args
+		model.implicit_receiver = false
+		model
+	when 'FCALLNODE'
+		model = RubyMM::Call.new
+		model.name = node.name
+		#model.receiver = node_to_model node.receiver
+		model.args = args_to_model node.args
+		model.implicit_receiver = true
+		model		
 	when 'DEFNNODE'
 		model = RubyMM::Def.new
 		model.name = node.name
-		#puts "Body #{node_to_model node.body}"
 		model.body = node_to_model node.body
+		model.onself = false
+		model
+	when 'DEFSNODE'
+		model = RubyMM::Def.new
+		model.name = node.name
+		model.body = node_to_model node.body
+		model.onself = true
 		model
 	when 'BLOCKNODE'
 		model = RubyMM::Block.new		
@@ -48,6 +91,130 @@ def self.node_to_model(node)
 		model = RubyMM::IntLiteral.new
 		model.value = node.value
 		model
+	when 'STRNODE'
+		model = RubyMM::StringLiteral.new
+		model.value = node.value
+		model.dynamic = false
+		model
+	when 'DSTRNODE'
+		model = RubyMM::StringLiteral.new
+		#model.value = node.value
+		model.dynamic = true
+		for i in 0..(node.size-1)
+			model.pieces = model.pieces << node_to_model(node.get i)
+		end
+		model
+	when 'EVSTRNODE'
+		node_to_model(node.body)
+	when 'CLASSNODE'
+		model = RubyMM::ClassDecl.new
+		model.defname = node_to_model(node.getCPath)
+		model.super_class = node_to_model(node.super)
+		body_node_to_contents(node.body_node,model)
+		model
+	when 'MODULENODE'
+		model = RubyMM::ModuleDecl.new
+		model.defname = node_to_model(node.getCPath)
+		body_node_to_contents(node.body_node,model)
+		model
+	when 'NILNODE'
+		if node.is_a? Java::OrgJrubyparserAst::NilImplicitNode
+			return nil
+		else
+			RubyMM::NilLiteral.new
+		end
+	when 'COLON2NODE'
+		model = RubyMM::Constant.new
+		model.name = node.name
+		model.container = node_to_model(node.left_node)
+ 		model
+ 	when 'SYMBOLNODE'
+ 		model = RubyMM::Symbol.new
+ 		model.name = node.name
+ 		model
+ 	when 'CONSTNODE'
+ 		model = RubyMM::Constant.new
+ 		model.name = node.name
+ 		model
+ 	when 'LOCALASGNNODE'
+ 		model = RubyMM::LocalVarAssignment.new
+ 		model.name_assigned = node.name
+ 		model.value = node_to_model(node.value)
+ 		model
+ 	when 'LOCALVARNODE'
+ 		model = RubyMM::LocalVarAccess.new
+ 		model.name = node.name
+ 		model
+ 	when 'FALSENODE'
+ 		model = RubyMM::BooleanLiteral.new
+ 		model.value = false
+ 		model
+ 	when 'TRUENODE'
+ 		model = RubyMM::BooleanLiteral.new
+ 		model.value = true
+ 		model
+ 	when 'IFNODE'
+ 		model = RubyMM::IfStatement.new
+ 		model
+ 	when 'GLOBALVARNODE'
+ 		model = RubyMM::GlobalVarAccess.new
+ 		model.name = node.name[1..-1]
+ 		model
+ 	when 'GLOBALASGNNODE'
+ 		model = RubyMM::GlobalVarAssignment.new
+ 		model.name_assigned = node.name[1..-1]
+ 		model.value = node_to_model(node.value)
+ 		model
+ 	when 'HASHNODE'
+ 		model = RubyMM::HashLiteral.new
+ 		count = node.get_list_node.count / 2
+ 		for i in 0..(count-1)
+ 			k_node = node.get_list_node[i*2]
+ 			k = node_to_model(k_node)
+ 			v_node = node.get_list_node[i*2 +1]
+ 			v = node_to_model(v_node)
+ 			pair = RubyMM::HashPair.build key: k, value: v
+ 			model.pairs = model.pairs << pair
+ 		end
+ 		model
+ 	when 'ARRAYNODE'
+ 		model = RubyMM::ArrayLiteral.new
+ 		for i in 0..(node.count-1)
+ 			v_node = node[i]
+ 			v = node_to_model(v_node)
+ 			model.values = model.values << v
+ 		end
+ 		model
+ 	when 'ZARRAYNODE'
+ 		RubyMM::ArrayLiteral.new
+ 	when 'BEGINNODE'
+ 		model = RubyMM::BeginRescue.new
+ 		rescue_node = node.body
+ 		raise 'AssertionFailed' unless rescue_node.node_type.name=='RESCUENODE'
+ 		model.body = node_to_model(rescue_node.body)
+ 		rescue_body_node = rescue_node.rescue
+ 		raise 'AssertionFailed' unless rescue_body_node.node_type.name=='RESCUEBODYNODE'
+ 		model.rescue_body = node_to_model(rescue_body_node.body)
+ 		model
+ 	when 'ATTRASSIGNNODE'
+ 		model = RubyMM::ElementAssignement.new
+ 		model.array = node_to_model(node.receiver)
+ 		model.element = node_to_model(node.args[0])
+ 		model.value = node_to_model(node.args[1])
+ 		model
+ 	when 'INSTASGNNODE'
+ 		model = RubyMM::InstanceVarAssignement.new
+ 		model.name_assigned = node.name[1..-1]
+ 		model.value = node_to_model(node.value)
+ 		model
+ 	when 'INSTVARNODE'
+ 		RubyMM::InstanceVarAccess.build node.name[1..-1]
+ 	when 'RETURNNODE'
+ 		model = RubyMM::Return.new
+ 		model.value = node_to_model(node.value)
+ 		model
+ 	when 'CONSTDECLNODE'
+ 		raise 'Const decl node: not implemented'
 	else		
 		raise "I don't know how to deal with #{node.node_type.name}"
 	end
@@ -62,6 +229,12 @@ def self.args_to_model(args_node)
 			args << node_to_model(args_node.get i)
 		end
 		args
+	elsif args_node.is_a? ListNode 
+		for i in 0..(args_node.size-1) 
+			#puts "DEALING WITH #{i} #{args_node.get i} #{(args_node.get i).class}"
+			args << node_to_model(args_node.get i)
+		end
+		args		
 	else 
 		raise "I don't know how to deal with #{args_node.class}"
 	end

data/lib/rubymm/query.rb

@@ -0,0 +1,21 @@
+module RubyMM
+
+	def self.is_call(node,name=nil,args=nil)
+		return false unless node.is_a? RubyMM::Call
+		return false if name and node.name!=name
+		if args
+			return false if args.count != node.args.count
+			for i in 0..(args.count-1)
+				return false unless args[i].eql?(node.args[i])
+			end
+		end
+		true
+	end
+
+	def self.is_def(node,name=nil)
+		return false unless node.is_a? RubyMM::Def
+		return false if name and node.name!=name
+		true
+	end
+
+end

metadata

@@ -1,31 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rubymm
 version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease:
-  version: 0.1.0
 platform: java
 authors:
 - Federico Tomassetti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -33,17 +31,15 @@ dependencies:
   name: emf_jruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -51,17 +47,15 @@ dependencies:
   name: jruby-parser
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -71,17 +65,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- "./lib/rubymm.rb"
-- "./lib/rubymm/metamodel.rb"
-- "./lib/rubymm/parser.rb"
-- "./lib/jars/com.google.collect_1.0.0.v201105210816.jar"
-- "./lib/jars/com.google.inject_2.0.0.v201105231817.jar"
-- "./lib/jars/com.ibm.icu_4.4.2.v20110208.jar"
-- "./lib/jars/org.apache.commons.lang_2.4.0.v201005080502.jar"
-- "./lib/jars/org.apache.commons.logging_1.1.1.jar"
-- "./lib/jars/org.apache.log4j_1.2.16.jar"
-- "./lib/jars/org.eclipse.core.runtime.compatibility_3.2.100.v20100505.jar"
-- "./lib/jars/org.eclipse.core.runtime_3.7.0.v20110110.jar"
+- ./lib/rubymm.rb
+- ./lib/rubymm/metamodel.rb
+- ./lib/rubymm/query.rb
+- ./lib/rubymm/parser.rb
+- ./lib/jars/org.apache.commons.lang_2.4.0.v201005080502.jar
+- ./lib/jars/com.google.collect_1.0.0.v201105210816.jar
+- ./lib/jars/com.google.inject_2.0.0.v201105231817.jar
+- ./lib/jars/org.eclipse.core.runtime_3.7.0.v20110110.jar
+- ./lib/jars/org.apache.commons.logging_1.1.1.jar
+- ./lib/jars/org.apache.log4j_1.2.16.jar
+- ./lib/jars/org.eclipse.core.runtime.compatibility_3.2.100.v20100505.jar
+- ./lib/jars/com.ibm.icu_4.4.2.v20110208.jar
 homepage: http://federico-tomassetti.it
 licenses: []
 post_install_message:
@@ -90,17 +85,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: