sfp 0.2.1 → 0.3.4

data/lib/sfp/Sfplib.rb

@@ -82,6 +82,13 @@ module Sfp
 				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
 
@@ -91,22 +98,7 @@ module Sfp
 		end
 
 		def deep_clone(value)
-			if value.is_a?(Hash)
-				result = value.clone
-				value.each { |k,v|
-					if k != '_parent'
-						result[k] = deep_clone(v)
-						result[k]['_parent'] = result if result[k].is_a?(Hash) and result[k].has_key?('_parent')
-					end
-				}
-				result
-			elsif value.is_a?(Array)
-				result = Array.new
-				value.each { |v| result << deep_clone(v) }
-				result
-			else
-				value
-			end
+			Sfp::Helper.deep_clone(value)
 		end
 	end
 
@@ -147,11 +139,20 @@ module Sfp
 					not obj.has_key?('_isa') or obj['_isa'] == nil
 			objclass = root.at?(obj['_isa'])
 			if objclass.nil? or objclass.is_a?(Sfp::Unknown) or objclass.is_a?(Sfp::Undefined)
-				raise Exception, 'Super class is not found: ' + obj['_self'] + ' < ' + obj['_isa']
+				raise Exception, "Schema #{obj['_isa']} of object #{obj['_self']} is not found!"
 			end
 			obj.inherits( objclass )
 			obj['_classes'] = (objclass.has_key?('_super') ? objclass['_super'].clone : Array.new)
 			obj['_classes'] << obj['_isa']
+
+			if objclass['_finals'].is_a?(Array)
+				if obj['_finals'].is_a?(Array)
+					obj['_finals'].concat(objclass['_finals'])
+				else
+					obj['_finals'] = objclass['_finals']
+				end
+			end
+
 			return true
 		end
 	end
@@ -163,9 +164,14 @@ module Sfp
 
 	# Instance of this class will be returned as the value of a non-exist variable
 	class Undefined
-		attr_accessor :path
-		def initialize(path=nil); @path = path; end
-		def to_s; (@path.nil? ? "<sfp::undefined>" : "<sfp::undefined[#{@path}]>"); end
+		attr_accessor :path, :type
+		def initialize(path=nil, type=nil)
+			@path = path
+			@type = type
+		end
+		def to_s
+			(@path.nil? ? "<sfp::undefined>" : "<sfp::undefined[#{@path}]>")
+		end
 	end
 
 	# Instance of this class will be return as the value of an unknown variable
@@ -175,6 +181,10 @@ module Sfp
 		def initialize(path=nil); @path = path; end
 		def to_s; (@path.nil? ? "<sfp::unknown>" : "<sfp::unknown[#{@path}]>"); end
 	end
+
+	class Any
+		def to_s; '<sfp::any>'; end
+	end
 end
 
 # return a fullpath of reference of this context

data/lib/sfp/parser.rb

@@ -6,6 +6,7 @@ module Sfp
 		include Sfp::SasTranslator
 
 		attr_accessor :root_dir, :home_dir, :conformant
+		attr_reader :root
 
 		def initialize(params={})
 			@root_dir = (params[:root_dir].is_a?(String) ?
@@ -31,6 +32,19 @@ module Sfp
 			@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)
@@ -103,12 +117,6 @@ module Sfp
 			return Nuri::Sfp.to_json(root)
 		end
 =end
-
-		def to_json(params={})
-			return '' if @root.nil?
-			return Sfp::Helper.to_pretty_json(@root) if params[:pretty]
-			return Sfp::Helper.to_json(@root)
-		end
 	end
 
 =begin

data/lib/sfp/sas_translator.rb

@@ -1346,7 +1346,7 @@ module Sfp
 				value = @init.at?(value) if isref
 				type = (isfinal ? self.isa?(value) : self.get_type(name, value, parent))
 				if type == nil
-					raise Exception, "Unrecognized type of variable: #{var_name}"
+					raise Exception, "Unrecognized type of variable: #{var_name}:#{value.class}"
 				else
 					value = null_value(type) if value == nil
 					isset = true if type[0,1] == '('
@@ -1375,6 +1375,8 @@ module Sfp
 					return type if type != nil
 				end
 =end
+				return value.type if value.is_a?(Sfp::Undefined)
+
 				type = nil
 				if parent.has_key?('_isa')
 					isa = @main.root.at?(parent['_isa'])

data/lib/sfp.rb

@@ -14,8 +14,3 @@ require libdir + '/sfp/SfpLangLexer'
 require libdir + '/sfp/visitors'
 require libdir + '/sfp/sas_translator'
 require libdir + '/sfp/parser'
-
-require libdir + '/sfp/sas'
-require libdir + '/sfp/planner'
-
-require libdir + '/sfp/executor.rb'

data/sfp.gemspec

@@ -1,23 +1,17 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfp'
-	s.version		= '0.2.1'
-	s.date			= '2013-05-15'
-	s.summary		= 'SFP Parser and Planner'
-	s.description	= 'A Ruby gem that provides a Ruby API to SFP language parser and ' +
-			  'SFP planner. It also provides a planner sript to solve a planning problem ' +
-			  'written in SFP language.'
+	s.version		= '0.3.4'
+	s.date			= '2013-07-14'
+	s.summary		= 'SFP Parser'
+	s.description	= 'A Ruby API and script for SFP language parser'
 	s.authors		= ['Herry']
 	s.email			= 'herry13@gmail.com'
 
 	s.executables << 'sfp'
-	s.files			= `git ls-files`.split("\n")
-	s.test_files	= `git ls-files -- test/*`.split("\n")
-
-	s.files.delete_if { |f| f =~ /linux\-arm/ }
-
-	`git ls-files --exclude=bin/solver/linux-arm/* -- bin/*`.split("\n") { |f| s.executables << f }
+	s.files			= `git ls-files`.split("\n").select { |n| !(n =~ /^test\/.*/) }
 
 	s.require_paths = ['lib']
+	s.license       = 'BSD'
 
 	s.homepage		= 'https://github.com/herry13/sfp-ruby'
 	s.rubyforge_project = 'sfp'

data/src/SfpLang.g

@@ -40,11 +40,11 @@ sfp
 	:	{	self.init	}
 		NL* include* header*
 		{	self.expand_classes	}
-		(mmutation | object_def NL* | state | constraint | goal_constraint | composite)*
+		(object_def NL* | state | constraint | goal_constraint | composite)*
 	;
 
 
-mmutation
+/*mmutation
 	:	reference equals_op value NL+
 		{
 			path, var = $reference.val.extract
@@ -60,6 +60,7 @@ mmutation
 			parent[var] = self.null_value
 		}
 	;
+*/
 
 include
 	:	'include' include_file NL+
@@ -136,6 +137,17 @@ extends_class returns [val]
 	;
 
 attribute
+	:	{
+			@is_final = false
+			@now['_finals'] = [] if !@now.has_key? '_finals'
+		}
+		('final' { @is_final = true })? attribute_stmt
+		{
+			@now['_finals'] << $attribute_stmt.id if @is_final and !$attribute_stmt.id.nil?
+		}
+	;
+
+attribute_stmt returns [id]
 	:	ID equals_op value NL+
 		{
 			if @now.has_key?($ID.text) and @now[$ID.text].is_a?(Hash) and
@@ -144,11 +156,18 @@ attribute
 			else
 				@now[$ID.text] = $value.val
 			end
+			$id = $ID.text
 		}
 	|	ID reference_type NL+
-		{	@now[$ID.text] = $reference_type.val	}
+		{
+			@now[$ID.text] = $reference_type.val
+			$id = $ID.text
+		}
 	|	ID set_type NL+
-		{	@now[$ID.text] = $set_type.val	}
+		{
+			@now[$ID.text] = $set_type.val
+			$id = $ID.text
+		}
 	|	ID probability_op set_value NL+
 		{ 	
 			@conformant = true
@@ -157,27 +176,72 @@ attribute
 				'_parent' => @now,
 				'_values' => $set_value.val
 			}
+			$id = $ID.text
+		}
+	|	ID ':' path NL+
+		{
+			case $path.text
+			when 'String'
+				@now[$ID.text] = { '_context' => 'any_value',
+					'_isa' => '$.String'
+				}
+			when 'Bool'
+				@now[$ID.text] = { '_context' => 'any_value',
+					'_isa' => '$.Boolean'
+				}
+			when 'Int'
+				@now[$ID.text] = { '_context' => 'any_value',
+					'_isa' => '$.Number'
+				}
+			else
+				raise Exception, "Use isa/isref for any non-primitive type (#{$path.text})."
+			end
+			$id = $ID.text
 		}
 	|	object_def NL+
+		{	$id = nil }
+	;
+
+object_schema
+	:	path('[' NUMBER { @now['_is_array'] = true } ']')?
+		{
+			@now['_isa'] = self.to_ref($path.text)
+			self.expand_object(@now)
+		}
+	;
+
+object_schemata
+	:	',' object_schema
 	;
 
 object_def
-	:	ID
+	:	{ @use_template = false }
+		ID
+		('extends' path
+		{
+			template = @root.at?($path.text)
+			raise Exception, "Object template #{$path.text} is not found!" if
+				template.is_a?(Sfp::Unknown) or template.is_a?(Sfp::Undefined)
+			raise Exception, "#{$path.text} is not an object!" if
+				!template.is_a?(Hash) or template['_context'] != 'object'
+			@now[$ID.text] = Sfp::Helper.deep_clone(template)
+			@now[$ID.text].accept(Sfp::Visitor::ParentEliminator.new)
+			@now[$ID.text]['_parent'] = @now
+			@now[$ID.text]['_self'] = $ID.text
+			@now[$ID.text].accept(Sfp::Visitor::SfpGenerator.new(@root))
+			@use_template = true
+		}
+		)?
 		{
 			@now[$ID.text] = {	'_self' => $ID.text,
 				'_context' => 'object',
 				'_parent' => @now,
 				'_isa' => '$.Object'
-			}
+			} if not @use_template
 			@now = @now[$ID.text]
 			@now['_is_array'] = false
 		}
-		('isa' path('[' NUMBER { @now['_is_array'] = true } ']')?
-		{
-			@now['_isa'] = self.to_ref($path.text)
-			self.expand_object(@now)
-		}
-		)?
+		('isa' object_schema (object_schemata)* )?
 		object_body?
 		{
 			if @now['_is_array']
@@ -280,7 +344,7 @@ op_statement
 	;
 
 procedure
-	:	'procedure' ID
+	:	('procedure'|'sub') ID
 		{
 			@now[$ID.text] = { '_self' => $ID.text,
 				'_context' => 'procedure',
@@ -862,6 +926,11 @@ value returns [val, type]
 			$val = $set_value.val
 			$type = 'Set'
 		}
+	|	'any'
+		{
+			$val = Sfp::Any.new
+			$type = 'Any'
+		}
 	;
 
 primitive_value returns [val, type]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &7789060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *7789060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: antlr3
-  requirement: &7788020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,9 +37,13 @@ dependencies:
         version: 1.8.12
   type: :runtime
   prerelease: false
-  version_requirements: *7788020
-description: A Ruby gem that provides a Ruby API to SFP language parser and SFP planner.
-  It also provides a planner sript to solve a planning problem written in SFP language.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.12
+description: A Ruby API and script for SFP language parser
 email: herry13@gmail.com
 executables:
 - sfp
@@ -45,18 +54,11 @@ files:
 - LICENSE
 - README.md
 - bin/sfp
-- bin/solver/linux-x86/downward
-- bin/solver/linux-x86/preprocess
-- bin/solver/macos/downward
-- bin/solver/macos/preprocess
 - lib/sfp.rb
 - lib/sfp/SfpLangLexer.rb
 - lib/sfp/SfpLangParser.rb
 - lib/sfp/Sfplib.rb
-- lib/sfp/executor.rb
 - lib/sfp/parser.rb
-- lib/sfp/planner.rb
-- lib/sfp/sas.rb
 - lib/sfp/sas_translator.rb
 - lib/sfp/sfw2graph.rb
 - lib/sfp/trollop.rb
@@ -65,27 +67,9 @@ files:
 - sfp.gemspec
 - src/SfpLang.g
 - src/build.sh
-- test/cloud-schemas.sfp
-- test/future/test1.sfp
-- test/nd-cloud1.sfp
-- test/nd-cloud2.sfp
-- test/nd-cloud3.sfp
-- test/nd-service1.sfp
-- test/nd-service2.sfp
-- test/run.sh
-- test/s.sfp
-- test/service-schemas.sfp
-- test/test-module1-scripts.tgz
-- test/test-module1.sfp
-- test/test1.inc
-- test/test1.sfp
-- test/test2.sfp
-- test/test3.inc
-- test/test3.sfp
-- test/test4.inc
-- test/test4.sfp
 homepage: https://github.com/herry13/sfp-ruby
-licenses: []
+licenses:
+- BSD
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -104,27 +88,8 @@ 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 and Planner
-test_files:
-- test/cloud-schemas.sfp
-- test/future/test1.sfp
-- test/nd-cloud1.sfp
-- test/nd-cloud2.sfp
-- test/nd-cloud3.sfp
-- test/nd-service1.sfp
-- test/nd-service2.sfp
-- test/run.sh
-- test/s.sfp
-- test/service-schemas.sfp
-- test/test-module1-scripts.tgz
-- test/test-module1.sfp
-- test/test1.inc
-- test/test1.sfp
-- test/test2.sfp
-- test/test3.inc
-- test/test3.sfp
-- test/test4.inc
-- test/test4.sfp
+summary: SFP Parser
+test_files: []

data/lib/sfp/executor.rb

@@ -1,207 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-require 'thread'
-
-module Sfp
-	module Executor
-		class ExecutionException < Exception; end
-		class ParallelExecutionException < Exception; end
-		class SequentialExecutionException < Exception; end
-
-		# @param :plan the plan to be executed
-		# @param :owner an object that implement the action
-		# @param :retry number of retries (default: 2) when execution is failed
-		#
-		def execute_plan(params={})
-			if params[:plan].nil? or not params[:plan].is_a?(Hash)
-				raise ExecutionException, 'Plan is not available.'
-			elsif params[:plan]['type'].to_s == 'parallel' or
-			      params[:plan][:type].to_s == 'parallel'
-				return self.execute_parallel_plan(params)
-			elsif params[:plan]['type'].to_s == 'sequential' or
-			      params[:plan][:type].to_s == 'sequential'
-				return self.execute_sequential_plan(params)
-			else
-				raise ExecutionException, 'Unknown type of plan!'
-			end
-			false
-		end
-
-		# @param :plan the plan to be executed
-		# @param :owner an object that implement the action
-		# @param :retry number of retries (default: 2) when execution is failed
-		#
-		def execute_parallel_plan(params={})
-			def assign_action_with_id(id)
-				thread_id = next_thread_id
-				action = @actions[id]
-				action[:executor] = thread_id
-				self.thread_execute_action(thread_id, action)
-			end
-
-			def next_thread_id
-				id = 0
-				@mutex.synchronize { @thread_id = id = @thread_id + 1 }
-				id
-			end
-
-			def action_to_string(action)
-				"#{action['id']}:#{action['name']}#{JSON.generate(action['parameters'])}"
-			end
-
-			def thread_execute_action(tid, action)
-				t = Thread.new {
-					@mutex.synchronize { @threads << tid }
-
-					while not @failed and not action[:executed]
-						# execute the action
-						op_str = action_to_string(action)
-						#Nuri::Util.puts "[ExecutorThread: #{tid}] #{op_str}"
-						success = false
-						num = @retry
-						begin
-							success = @owner.execute_action { action }
-							num -= 1
-						end while not success and num > 0
-
-						# check if execution failed
-						if success
-							next_actions = []
-							@mutex.synchronize {
-								# set executed
-								action[:executed] = true
-								# select next action to be executed from all predecessor actions
-								# if each action has not been assigned to any thread yet
-								if action['successors'].length > 0
-									action['successors'].each { |id|
-										if @actions[id][:executor].nil?
-											predecessors_ok = true
-											@actions[id]['predecessors'].each { |pid|
-												predecessors_ok = (predecessors_ok and @actions[pid][:executed])
-											}
-											next_actions << id if predecessors_ok
-										end
-									}
-								end
-								next_actions.each { |id| @actions[id][:executor] = tid }
-							}
-							if next_actions.length > 0
-								# execute next actions
-								action = @actions[next_actions[0]]
-								if next_actions.length > 1
-									for i in 1..(next_actions.length-1)
-										assign_action_with_id(next_actions[i])
-									end
-								end
-							end
-								
-						else
-							Nuri::Util.error "Failed executing #{op_str}!"
-							@mutex.synchronize {
-								@failed = true # set global flag
-								@actions_failed << action
-							}
-						end
-					end
-
-					@mutex.synchronize { @threads.delete(tid) }
-				}
-			end
-
-			if params[:plan].nil? or not params[:plan].is_a?(Hash)
-				raise ParallelExecutionException, 'Plan is not available.'
-			elsif params[:plan]['type'].to_s == 'parallel' or
-			      params[:plan][:type].to_s == 'parallel'
-			else
-				raise ParallelExecutionException, 'Not a parallel plan.'
-			end
-
-			@owner = params[:owner]
-			@retry = (params[:retry].nil? ? 2 : params[:retry].to_i)
-
-			@actions = params[:plan]['workflow']
-			@actions.sort! { |x,y| x['id'] <=> y['id'] }
-			@actions.each { |op| op[:executed] = false; op[:executor] = nil; }
-
-			@threads = []
-			@actions_failed = []
-			@mutex = Mutex.new
-			@failed = false
-			@thread_id = 0
-
-			params[:plan]['init'].each { |op_id| assign_action_with_id(op_id) }
-
-			begin
-				sleep 1
-			end while @threads.length > 0
-
-			Nuri::Util.log "Using #{@thread_id} threads in execution."
-
-			return (not @failed)
-		end
-
-		# @param :plan the plan to be executed
-		# @param :owner an object that implement the action
-		# @param :retry number of retries (default: 2) when execution is failed
-		#
-		def execute_sequential_plan(params={})
-			if params[:plan].nil? or not params[:plan].is_a?(Hash)
-				raise ParallelExecutionException, 'Plan is not available.'
-			elsif params[:plan]['type'].to_s == 'sequential' or
-			      params[:plan][:type].to_s == 'sequential'
-			else
-				raise ParallelExecutionException, 'Not a parallel plan.'
-			end
-
-			@owner = params[:owner]
-			@retry = (params[:retry].nil? ? 2 : params[:retry].to_i)
-			params[:plan]['workflow'].each { |action|
-				success = false
-				num = @retry
-				begin
-					success, data = @owner.execute_action { action }
-					puts data.to_s if params[:print_output]
-					num -= 1
-				end while not success and num > 0
-				return false if not success
-			}
-			true
-		end
-	end
-
-	class RubyExecutor
-		def execute_plan(params={})
-			exec = Object.new
-			exec.extend(Sfp::Executor)
-			params[:owner] = self
-			exec.execute_plan(params)
-		end
-
-		def execute_action
-			# TODO
-			action = yield
-			puts "Exec: #{action.inspect}"
-			[true, nil]
-		end
-	end
-
-	class BashExecutor < RubyExecutor
-		def execute_action
-			# TODO
-			action = yield
-			module_dir = (ENV.has_key?("SFP_HOME") ? ENV['SFP_HOME'] : ".")
-			script_path = "#{action['name'].sub!(/^\$\./, '')}"
-			script_path = "#{module_dir}/#{script_path.gsub!(/\./, '/')}"
-			cmd = "/bin/bash #{script_path}"
-			action['parameters'].each { |p| cmd += " '#{p}'" }
-			begin
-				data = `#{cmd}`
-			rescue Exception => exp
-				$stderr.puts "#{exp}\n#{exp.backtrace}"
-				[false, nil]
-			end
-			[true, data]
-		end
-	end
-end