sfp 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aaa593d3387a397e9ec0ca4a44adfa88016ff00
-  data.tar.gz: 443fa1844bef24bb4c1ded0822d0519d600d481c
+  metadata.gz: 23b018fd1c5d9bf2cff7ef5902e504f3e3966798
+  data.tar.gz: aa1242187f4b5010a93adc6efa813571c318aba9
 SHA512:
-  metadata.gz: 721a5319c5ede930324912678407614473f1fdcf2014c00f3622069f1c04e9ec3881e63bcd6a1fb4a8351924d67475c9a0e0d258217d9915572c517e5b7cb2d8
-  data.tar.gz: eb70b081e1d8618e7de550ab06001b77c6beb5cbc89e90a9c87d84b08dac57c8b194cf4c31c15ff8cc3684537650fbd9fd62bd1cb69687f65f8ec004df9e8a3a
+  metadata.gz: e2893d324135fc4dda7a361e48a87faf2ebdf14202c6a8a31940484e63aac0a6f8255b7b9d712965293b7fa1a668af60839511e425faa05f8c4c5f81bb27db4d
+  data.tar.gz: 131dcf2321a6f6b558cbef77155b721d647f7658fc856b7f839282c6a1e407535ddaba54da5fec4858c69ecd1c1cda1503f9f8f4bb67d1640e7c5e2a47832975

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/sfp/sas_translator.rb

@@ -291,7 +291,6 @@ module Sfp
 		# actions. Then reduce the size of their domain by 1 only i.e. the possible
 		# value is only their initial value.
 		# BUGGY! -- operator's effects may contain other object's variable
-=begin
 		def identify_immutable_variables
 			def is_this(ref)
 				ref.length > 7 and (ref[0,7] == '$.this.' or ref[0,7] == '$.self.')
@@ -325,7 +324,6 @@ module Sfp
 				end
 			end
 		end
-=end
 
 		#####
 		# Method for postprocessing simple global constraints
@@ -916,13 +914,18 @@ module Sfp
 			params = Hash.new
 			procedure.each { |k,v|
 				next if k[0,1] == '_'
-				# if the specified parameter does not have any value,
-				# then it's invalid procedure
-				if not @types.has_key?( v['_isa'] )
-					return nil
-				end
-				params[k] = Array.new
-				type = case v['_context']
+### debug
+#puts procedure.ref
+#p = Sfp::Helper.deep_clone(procedure)
+#p.accept(Sfp::Visitor::ParentEliminator.new)
+#p.delete('_parent')
+#puts JSON.pretty_generate(p)
+### end debug
+				type = case v
+				when Sfp::Undefined
+					v.type
+				when Hash
+					case v['_context']
 					when 'null', 'any_value'
 						v['_isa']
 					when 'set'
@@ -930,11 +933,33 @@ module Sfp
 					else
 						nil
 					end
-				next if type == nil
-				raise TypeNotFoundException, type if not @types.has_key?(type)
-				@types[ type ].each { |val| params[k] << val if not (val.is_a?(Hash) and val.isnull) and
+				else
+					return nil
+				end
+
+				#if not @types.has_key?( v['_isa'] )
+				#	return nil
+				#end
+				#type = case v['_context']
+				#	when 'null', 'any_value'
+				#		v['_isa']
+				#	when 'set'
+				#		"(#{v['_isa']})"
+				#	else
+				#		nil
+				#	end
+
+				#next if type == nil
+				#raise TypeNotFoundException, type if not @types.has_key?(type)
+
+				# if the specified parameter does not have any value,
+				# then it's invalid procedure (should print a warning)
+				return nil if not @types.has_key?(type)
+
+				params[k] = Array.new
+				@types[ type ].each { |val| params[k] << val if
+					not (val.is_a?(Hash) and val.isnull) and
 					!val.is_a?(Sfp::Undefined) and !val.is_a?(Sfp::Unknown) }
-				#puts k.to_s + ": " + params[k].length.to_s
 			}
 			# combinatorial method for all possible values of parameters
 			# using recursive method
@@ -1788,6 +1813,7 @@ module Sfp
 				if name[0,1] != '_'
 					modified = false
 					map.each { |k,v|
+						#puts k + ',' + name if v.is_a?(Sfp::Undefined) or v.is_a?(Sfp::Unknown)
 						next if v.is_a?(Sfp::Undefined) or v.is_a?(Sfp::Unknown)
 						if name == k
 							obj[v] = value
@@ -1797,6 +1823,7 @@ module Sfp
 							modified = true
 							break
 						elsif name.length > k.length and name[k.length,1] == '.' and name[0, k.length] == k
+							#next if v.is_a?(Sfp::Undefined) or v.is_a?(Sfp::Unknown)
 							grounded = v + name[k.length, (name.length-k.length)]
 							obj[grounded] = value
 							obj.delete(name)
@@ -1819,11 +1846,9 @@ module Sfp
 						value['_self'] = name if value.is_a?(Hash)
 					end
 				end
-				# TODO
-				# ----- HACK! -----
-				# these lines should handle nested 'iterator'
+				# TODO ----- HACK! -----
 				if obj.is_a?(Hash) and obj.isconstraint and obj['_type'] == 'iterator' and
-				   value.is_a?(String) and value.isref and map.has_key?(value)
+						value.is_a?(String) and value.isref and map.has_key?(value)
 					obj[name] = value = map[value]
 					#puts map[value].inspect
 					#puts "==>> " + obj.ref.push(name)
@@ -2054,12 +2079,32 @@ module Sfp
 		def dump(stream, root, variables)
 			prevails = self.values.select { |p| p.post.nil? }
 			preposts = self.values.select { |p| not p.post.nil? }
+=begin
+			pre_lines = []
+			prevails.each do |p|
+				line = p.to_sas(root, variables)
+				return if line[-1] == ' '
+				pre_lines << line
+			end
+			prepost_lines = []
+			preposts.each do |p|
+				line = p.to_sas(root, variables, false)
+				return if line [-1] == ' '
+				prepost_lines << line
+			end
+=end
 
 			stream.write "begin_operator\n#{@name}"
 			@params.each do |key,val|
 				stream.write " #{key}=#{val}" if key != '$.this'
 			end if @params.is_a?(Hash)
 
+=begin
+			stream.write "\n#{pre_lines.length}"
+			stream.write "\n#{pre_lines.join("\n")}" if pre_lines.length > 0
+			stream.write "\n#{prepost_lines.length}\n"
+			stream.write "#{prepost_lines.join("\n")}\n" if prepost_lines.length > 0
+=end
 			stream.write "\n#{prevails.length}\n"
 			prevails.each { |p| p.dump(stream, root, variables) }
 
@@ -2094,6 +2139,9 @@ module Sfp
 				if not p['post'].nil?
 					sfw['effect'][p['name']] = (p['post'].is_a?(Sfp::Null) ? nil : p['post'])
 				end
+
+				#sfw['condition'][ p['name'] ] = p['pre'] if p['pre'] != nil
+				#sfw['effect'][ p['name'] ] = p['post'] if p['post'] != nil
 			end
 			return sfw
 		end
@@ -2219,10 +2267,10 @@ module Sfp
 			post = Sfp::Null.new if @post.is_a?(Hash) and @post.isnull
 
 			return {
-				'name' => @var.name,
-				'pre' => pre,
-				'post' => post
-			}
+					'name' => @var.name,
+					'pre' => pre,
+					'post' => post
+				}
 		end
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr3
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sfp
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: SFP Parser