sfp 0.3.5 → 0.3.6

data/lib/sfp/Sfplib.rb

@@ -1,12 +1,11 @@
 module Sfp
 	module SfpLangHelper
-		attr_accessor :root_dir, :home_dir
+		attr_accessor :root_dir, :home_dir, :constraint_next_id
 		attr_reader :root, :used_classes, :arrays, :conformant
 
 		def init
 			@root = Hash.new
 			@now = @root
-			@id = 0
 			@root['Object'] = { '_self' => 'Object', '_context' => 'class', '_parent' => @root }
 			@unexpanded_classes = Array.new
 			@used_classes = Array.new
@@ -15,8 +14,8 @@ module Sfp
 		end
 
 		def next_id
-			nid = "c" + @id.to_s
-			@id += 1
+			nid = "c#{@constraint_next_id}"
+			@constraint_next_id += 1
 			return nid
 		end
 	
@@ -48,25 +47,25 @@ module Sfp
 
 			raise Exception, 'File not found: ' + file if not File.exist?(filepath)
 
-			new_home_dir = File.expand_path(File.dirname(filepath))
-			parser = Sfp::Parser.new({:root_dir => @root_dir, :home_dir => new_home_dir})
+			parser = Sfp::Parser.new({ :root_dir => @root_dir,
+			                           :home_dir => File.expand_path(File.dirname(filepath)),
+			                           :constraint_next_id => @constraint_next_id })
 			parser.parse(File.read(filepath))
-
-			parser.root.each_pair { |key,val|
-				if val['_context'] == 'class' or val['_context'] == 'composite'
-					@root[key] = val
-				elsif val['_context'] == 'state' or val['_context'] == 'constraint'
-					if @root.has_key?(key)
-						if @root[key]['_context'] != val['_context']
-							@root[key] = val
-						else
-							val['_context'].each_pair { |k2,v2| @root[key][k2] = v2 }
-						end
+			parser.root.each_pair do |key,val|
+				if val.is_a?(Hash)
+					if val['_context'] == 'state' and @root.has_key?(key) and @root[key]['_context'] == 'state'
+						val.each_pair { |k2,v2| @root[key][k2] = v2 if k2[0,1] != '_' }
+					elsif val['_context'] == 'constraint' and @root.has_key?(key) and @root[key]['_context'] == 'constraint'
+						val.each_pair { |k2,v2| @root[key][k2] = v2 if k2[0,1] != '_' }
 					else
 						@root[key] = val
+						val['_parent'] = @root if val['_context'] != 'state'
 					end
+				else
+					@root[key] = val
 				end
-			}
+			end
+			@constraint_next_id = parser.constraint_next_id
 		end
 	
 		def goto_parent(remove_parent=false)
@@ -76,20 +75,22 @@ module Sfp
 			return n
 		end
 
-		def expand_classes
-			@unexpanded_classes.each { |c|
-				sclass = @root.at?(c['_extends'])
-				c.inherits( sclass )
-				c['_super'] = (sclass.has_key?('_super') ? sclass['_super'].clone : Array.new)
-				c['_super'] << c['_extends']
-				if sclass['_finals'].is_a?(Array)
-					if c['_finals'].is_a?(Array)
-						c['_finals'].concat(sclass['_finals'])
-					else
-						c['_finals'] = sclass['_finals']
-					end
+		def expand_class(c)
+			sclass = @root.at?(c['_extends'])
+			c.inherits( sclass )
+			c['_super'] = (sclass.has_key?('_super') ? sclass['_super'].clone : Array.new)
+			c['_super'] << c['_extends']
+			if sclass['_finals'].is_a?(Array)
+				if c['_finals'].is_a?(Array)
+					c['_finals'].concat(sclass['_finals'])
+				else
+					c['_finals'] = sclass['_finals']
 				end
-			}
+			end
+		end
+
+		def expand_classes
+			@unexpanded_classes.each { |c| expand_class(c) }
 		end
 
 		def expand_object(obj)

data/lib/sfp/parser.rb

@@ -1,136 +1,50 @@
-module Sfp
-	# main class which processes configuration description in SFP language either
-	# in file or as a string
-	class Parser
-		# enable this class to process SFP into FDR (SAS+)
-		include Sfp::SasTranslator
-
-		attr_accessor :root_dir, :home_dir, :conformant
-		attr_reader :root
-
-		def initialize(params={})
-			@root_dir = (params[:root_dir].is_a?(String) ?
-			             params[:root_dir].strip :
-			             nil)
-			@home_dir = (params[:home_dir].is_a?(String) ?
-			             params[:home_dir].strip :
-			             nil)
-			@root = params[:root]
-			@conformant = !!params[:conformant]
-		end
-
-		# @param string : a string in SFP language
-		def parse(string)
-			lexer = SfpLang::Lexer.new(string)
-			tokens = ANTLR3::CommonTokenStream.new(lexer)
-			parser = SfpLang::Parser.new(tokens)
-			parser.root_dir = @root_dir
-			parser.home_dir = @home_dir
-			parser.sfp
-			@root = parser.root
-			@conformant = parser.conformant
-			@parser_arrays = parser.arrays
-		end
-
-		def to_json(params={})
-			return 'null' if @root.nil?
-			return Sfp::Helper.to_pretty_json(@root) if params[:pretty]
-			return Sfp::Helper.to_json(@root)
-		end
-
-		def self.parse_file(filepath)
-			homedir = File.expand_path(File.dirname(filepath))
-			parser = Sfp::Parser.new({:home_dir => homedir})
-			parser.parse(File.read(filepath))
-			parser.root
-		end
-
-=begin
-		# Parse SFP file and return its JSON representation
-		def self.parse_file(file)
-			return file_to_sfp(file)
-		end
-
-		def self.file_to_sfp(file)
-			parser = Parser.new
-			parser.parse_file(file)
-			return parser.to_sfp
-		end
-
-		def self.to_sfp(string)
-			parser = Parser.new
-			parser.parse(string)
-			return parser.to_sfp
-		end
-
-		# parse SFP file
-		def parse_file(file)
-			f = File.open(file, 'rb')
-			lexer = SFP::Lexer.new(f)
-			tokens = ANTLR3::CommonTokenStream.new(lexer)
-			parser = SFP::Parser.new(tokens)
-			parser.root_dir = (@root_dir == nil or @root_dir == '' ?
-					File.expand_path('.') : @root_dir)
-			parser.home_dir = File.dirname(f.path)
-			parser.sfp
-			@conformant = parser.conformant
-			@root = parser.root
-			@parser_arrays = parser.arrays
-		end
-
-		# parse SFP in a string
-		def parse(text)
-			lexer = SFP::Lexer.new(text)
-			tokens = ANTLR3::CommonTokenStream.new(lexer)
-			parser = SFP::Parser.new(tokens)
-			parser.root_dir = (@root_dir == nil or @root_dir == '' ?
-					File.expand_path(File.dirname('.')) : @root_dir)
-			parser.home_dir = parser.root_dir
-			parser.sfp
-			@root = parser.root
-			@parser_arrays = parser.arrays
-		end
-
-		# dump the parsed specification into standard output
-		def dump(root=nil)
-			return if root == nil
-			root = Nuri::Sfp.deep_clone(@root)
-			root.accept(ParentEliminator.new)
-			puts JSON.pretty_generate(root)
-		end
-
-		def self.dump(root)
-			return if root == nil
-			root = Nuri::Sfp.deep_clone(root)
-			root.accept(ParentEliminator.new)
-			puts JSON.pretty_generate(root)
-		end
-
-		def to_sfp
-			@root
-		end
-
-		def to_json
-			root = self.to_sfp
-			return if root == nil
-			root = Nuri::Sfp.deep_clone(root)
-			return Nuri::Sfp.to_json(root)
-		end
-=end
+# main class which processes configuration description in SFP language either
+# in file or as a string
+class Sfp::Parser
+	# enable this class to process SFP into FDR (SAS+)
+	include Sfp::SasTranslator
+
+	attr_accessor :root_dir, :home_dir, :conformant
+	attr_reader :root, :constraint_next_id
+
+	def initialize(params={})
+		@root_dir = (params[:root_dir].is_a?(String) ?
+		             params[:root_dir].strip :
+		             nil)
+		@home_dir = (params[:home_dir].is_a?(String) ?
+		             params[:home_dir].strip :
+		             nil)
+		@root = params[:root]
+		@conformant = !!params[:conformant]
+		@constraint_next_id = (params[:constraint_next_id] ? params[:constraint_next_id] : 0)
 	end
 
-=begin
-	def self.to_json(sfp)
-		root = Sfp::Helper.deep_clone(sfp)
-		root.accept(Nuri::Sfp::ParentEliminator.new)
-		return JSON.generate(root)
+	# @param string : a string in SFP language
+	def parse(string, options={})
+		lexer = SfpLang::Lexer.new(string)
+		tokens = ANTLR3::CommonTokenStream.new(lexer)
+		parser = SfpLang::Parser.new(tokens)
+		parser.root_dir = @root_dir
+		parser.home_dir = @home_dir
+		parser.constraint_next_id = @constraint_next_id
+		parser.sfp
+		@constraint_next_id = parser.constraint_next_id
+		@root = parser.root
+		@conformant = parser.conformant
+		@parser_arrays = parser.arrays
 	end
 
-	def self.to_pretty_json(sfp)
-		root = Nuri::Sfp.deep_clone(sfp)
-		root.accept(Nuri::Sfp::ParentEliminator.new)
-		return JSON.pretty_generate(root)
+	def to_json(params={})
+		return 'null' if @root.nil?
+		return Sfp::Helper.to_pretty_json(@root) if params[:pretty]
+		return Sfp::Helper.to_json(@root)
 	end
-=end
 
+	def self.parse_file(filepath, options={})
+		#homedir = File.expand_path(File.dirname(filepath))
+		options[:home_dir] = File.expand_path(File.dirname(filepath)) if !options[:home_dir]
+		parser = Sfp::Parser.new(options) #{:home_dir => homedir})
+		parser.parse(File.read(filepath))
+		parser.root
+	end
 end

data/lib/sfp/sas_translator.rb

@@ -162,15 +162,11 @@ module Sfp
 				end
 
 				### process all procedures
-				@variables.each_value { |var|
+				@variables.each_value do |var|
 					if var.is_final
-						var.init.each { |k,v|
-							if v.is_a?(Hash) and v.isprocedure
-								process_procedure(v, var.init)
-							end
-						}
+						var.init.each { |k,v| process_procedure(v, var.init) if v.is_a?(Hash) and v.isprocedure }
 					end
-				}
+				end
 				self.reset_operators_name
 
 				### process sometime modalities ###
@@ -304,7 +300,7 @@ module Sfp
 				postprocess_simple_global_constraint_to_operator(operator).each { |op|
 					@operators[op.name] = op
 				}
-			end
+			end if @operators.is_a?(Hash)
 		end
 
 		def postprocess_simple_global_constraint_to_operator(operator)
@@ -701,12 +697,10 @@ module Sfp
 			return map
 		end
 
-		def and_equals_constraint_to_map(constraint)
-			map = Hash.new
-			constraint.each { |k,v|
-				next if k[0,1] == '_'
-				map[k] = v['_value'] if v['_type'] == 'equals'
-			}
+		def and_equals_constraint_to_map(c)
+			return { c['_self'] => c['_value'] } if c['_type'] == 'equals'
+			map = {}
+			c.each { |k,v| map[k] = v['_value'] if k[0,1] != '_' and v['_type'] == 'equals' }
 			return map
 		end
 
@@ -790,18 +784,7 @@ module Sfp
 
 			operators = ground_procedure_parameters(procedure)
 			if operators != nil
-				invalid_operators = []
-				operators.each do |op|
-					#begin
-						process_operator(op)
-					#rescue UndefinedValueException
-					#	invalid_operators << op
-					#	puts "TODO -- invalid operator: " + op['_self'].to_s
-					#end
-				end
-				#operators.delete_if { |op| not invalid_operators.index(op).nil? }
-			else
-#puts 'proc: ' + procedure.ref + ' cannot be grounded'
+				operators.each { |op| process_operator(op) }
 			end
 			# remove the procedure because we don't need it anymore
 			object.delete(procedure['_self'])
@@ -819,7 +802,14 @@ module Sfp
 					return nil
 				end
 				params[k] = Array.new
-				type = (v.isnull ? v['_isa'] : (v.isset ? "(#{v['_isa']})" : nil))
+				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)
 				@types[ type ].each { |val| params[k] << val if not (val.is_a?(Hash) and val.isnull)	}
@@ -1664,9 +1654,12 @@ module Sfp
 	
 			def visit(name, value, obj)
 				return if name[0,1] == '_' and name != '_value' and name != '_template'
+				# substituting left side
 				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
 							obj.delete(name)
@@ -1675,6 +1668,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)
@@ -1705,12 +1699,15 @@ module Sfp
 					#puts "==>> " + obj.ref.push(name)
 				end
 				# ------ END of HACK! ----
+
+				# substituting right side
 				if value.is_a?(String) and value.isref
 					map.each { |k,v|
 						if value == k
 							obj[name] = v
 							break
-						elsif value.length > k.length and value[k.length,1] == '.' and value[0,k.length] == k
+						elsif value.length > k.length and value[k.length,1] == '.' and value[0,k.length] == k and
+						  not(v.is_a?(Sfp::Undefined) or v.is_a?(Sfp::Unknown))
 							obj[name] = v + value[k.length, (value.length-k.length)]
 							break
 						end

data/sfp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfp'
-	s.version		= '0.3.5'
-	s.date			= '2013-07-15'
+	s.version		= '0.3.6'
+	s.date			= '2013-08-05'
 	s.summary		= 'SFP Parser'
 	s.description	= 'A Ruby API and script for SFP language parser'
 	s.authors		= ['Herry']
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 	s.rubyforge_project = 'sfp'
 
 	s.add_dependency 'json', '~> 1.7.5'
-	s.add_dependency 'antlr3', '~> 1.8.12'
+	s.add_dependency 'antlr3', '~> 1.9.0'
 end	

data/src/SfpLang.g

@@ -38,11 +38,17 @@ TODO:
 
 sfp 
 	:	{	self.init	}
-		NL* include* header*
-		{	self.expand_classes	}
-		(object_def NL* | state | constraint | goal_constraint | composite)*
+		NL*
+		//{	self.expand_classes	}
+		( (object_def | state | constraints) NL* | include | class_def | procedure )*
+		// | goal_constraint | composite)*
 	;
 
+constraints
+	:	goal_constraint
+	|	global_constraint
+	|	sometime_constraint
+	;
 
 /*mmutation
 	:	reference equals_op value NL+
@@ -72,12 +78,12 @@ include_file
 	;
 	
 header
-	:	class_definition
+	:	class_def
 	|	procedure
 	;
 
 state
-	:	ID 'state'
+	:	ID 'state' NL*
 		{
 			@now[$ID.text] = { '_self' => $ID.text,
 				'_context' => 'state',
@@ -87,7 +93,7 @@ state
 		}
 		'{' NL*
 		attribute*
-		'}' NL*
+		'}'
 		{	self.goto_parent(true)	}
 	;
 
@@ -104,7 +110,7 @@ composite
 		{	self.goto_parent(true)	}
 	;
 
-class_definition
+class_def
 	:	('class'|'schema') ID
 		{
 			@now[$ID.text] = { '_self' => $ID.text,
@@ -124,6 +130,7 @@ class_definition
 				@now['_extends'] = '$.Object'
 				@now['_super'] = ['$.Object']
 			end
+			expand_class(@now)
 			self.goto_parent()
 		}
 	;
@@ -263,7 +270,7 @@ object_def
 	;
 
 object_body
-	:	'{' NL* ( object_attribute | state_dependency | operator )* '}'
+	:	'{' NL* ( object_attribute | procedure )* '}'
 	;
 
 object_attribute
@@ -290,27 +297,6 @@ dep_effect
 		)
 	;
 
-operator
-	:	'operator' ID '{' NL*
-		{
-			@now[$ID.text] = { '_self' => $ID.text,
-				'_context' => 'operator',
-				'_parent' => @now,
-				'_cost' => 1,
-				'_condition' => { '_context' => 'constraint' },
-				'_effect' => { '_context' => 'effect' }
-			}
-			@now = @now[$ID.text]
-		}
-		(	'cost' equals_op NUMBER NL+
-			{	@now['_cost'] = $NUMBER.text.to_i	}
-		)?
-		/*op_param**/
-		op_conditions? op_effects
-		'}' NL+
-		{	self.goto_parent()	}
-	;
-
 op_param
 	:	ID equals_op reference NL+
 		{	@now[$ID.text] = $reference.val	}
@@ -369,7 +355,13 @@ parameters
 	;
 	
 parameter
-	:	ID reference_type
+	:	ID ':' path
+		{
+			@now[$ID.text] = { '_context' => 'any_value',
+				'_isa' => self.to_ref($path.text)
+			}
+		}
+	|	ID reference_type
 		{	@now[$ID.text] = $reference_type.val	}
 	|	ID 'areall' path
 		{
@@ -424,10 +416,31 @@ goal_constraint
 			}
 			@now = @now['goal']
 		}
-		'{' NL* goal_body* '}' NL+
+		'{' NL* goal_body* '}'
+		{	self.goto_parent()	}
+	;
+
+global_constraint
+	:	('global'|'always') 'constraint'? NL*
+		{
+			@now['global'] = self.create_constraint('global', 'and') if !@now.has_key?('global')
+			@now = @now['global']
+		}
+		'{' NL* constraint_body '}'
 		{	self.goto_parent()	}
 	;
 
+sometime_constraint
+	:	'sometime' 'constraint'? NL*
+		{
+			@now['sometime'] = self.create_constraint('sometime', 'or') if !@now.has_key?('sometime')
+			@now = @now['sometime']
+		}
+		'{' NL* constraint_body '}'
+		{	self.goto_parent()	}
+	;
+
+
 goal_body
 	:	(
 			(	constraint_statement
@@ -439,11 +452,11 @@ goal_body
 			|	constraint_class_quantification
 			)
 		NL+)
-	|	'always' NL*
+	|	('always'|'global') NL*
 		{
-			@now['always'] = self.create_constraint('always', 'and') if
-				not @now.has_key?('always')
-			@now = @now['always']
+			@now['global'] = self.create_constraint('global', 'and') if
+				not @now.has_key?('global')
+			@now = @now['global']
 		}
 		'{' NL* constraint_body '}' NL+
 		{	self.goto_parent()	}
@@ -520,12 +533,12 @@ nested_constraint
 	;
 
 constraint
-	:	ID 'constraint'
+	:	'constraint' ID
 		{
 			@now[$ID.text] = self.create_constraint($ID.text, 'and')
 			@now = @now[$ID.text]
 		}
-		'{' NL* constraint_body '}' NL+
+		'{' NL* constraint_body '}'
 		{	self.goto_parent()	}
 	;
 
@@ -1015,7 +1028,7 @@ BOOLEAN
 	|	'no'
 	;
 
-ID	:	('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'-')*
+ID	:	('a'..'z'|'A'..'Z')('a'..'z'|'A'..'Z'|'0'..'9'|'_')*
 	;
 
 NUMBER
@@ -1039,7 +1052,7 @@ MULTILINE_STRING
 	:	'r"' ( options {greedy=false;} : .)* '"'
 	;
 
-NL	:	'\r'? '\n'
+NL	:	('\r'? '\n'|';')
 	;
 
 WS	:   ( ' ' | '\t' ) {$channel=HIDDEN;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20938540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,28 @@ dependencies:
         version: 1.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *20938540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: antlr3
-  requirement: &20938040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.12
+        version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *20938040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 description: A Ruby API and script for SFP language parser
 email: herry13@gmail.com
 executables:
@@ -79,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sfp
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: SFP Parser