sfp 0.1.0 → 0.1.1

data/sfp.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfp'
-	s.version		= '0.1.0'
+	s.version		= '0.1.1'
 	s.date			= '2013-04-20'
 	s.summary		= 'SFP Parser and Planner'
-	s.description	= 'A Ruby gem that provides a Ruby interface to parse SFP language. ' +
-			  'It also provides a Ruby interface for a solver to generate a workflow ' +
-			  'for a planning task written in SFP language.'
+	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.authors		= ['Herry']
 	s.email			= 'herry13@gmail.com'
 

data/src/SfpLang.g

@@ -8,8 +8,7 @@ options {
 @headers {
 =begin
 Depends:
-- sfplibs.rb
-- ext.rb
+- Sfplib.rb
 
 Features:
 - reference
@@ -41,7 +40,25 @@ sfp
 	:	{	self.init	}
 		NL* include* header*
 		{	self.expand_classes	}
-		(state | composite | constraint | goal_constraint)*
+		(mmutation | object_def NL* | state | constraint | goal_constraint | composite)*
+	;
+
+
+mmutation
+	:	reference equals_op value NL+
+		{
+			path, var = $reference.val.extract
+			parent = @now.at?(path)
+			raise Exception, "#{path} is not a Hash" if not parent.is_a?(Hash)
+			parent[var] = $value.val
+		}
+	|	reference equals_op NULL
+		{
+			path, var = $reference.val.extract
+			parent = @now.at?(path)
+			raise Exception, "#{path} is not a Hash" if not parent.is_a?(Hash)
+			parent[var] = self.null_value
+		}
 	;
 
 include
@@ -59,7 +76,7 @@ header
 	;
 
 state
-	:	ID ('state')?
+	:	ID 'state'
 		{
 			@now[$ID.text] = { '_self' => $ID.text,
 				'_context' => 'state',
@@ -91,7 +108,7 @@ class_definition
 		{
 			@now[$ID.text] = { '_self' => $ID.text,
 				'_context' => 'class',
-				'_parent' => @now
+				'_parent' => @now,
 			}
 			@now = @now[$ID.text]
 		}
@@ -101,7 +118,13 @@ class_definition
 		}
 		)?
 		('{' NL* ( attribute | procedure )* '}')? NL*
-		{	self.goto_parent()	}
+		{
+			if not @now.has_key?('_extends')
+				@now['_extends'] = '$.Object'
+				@now['_super'] = ['$.Object']
+			end
+			self.goto_parent()
+		}
 	;
 	
 extends_class returns [val]
@@ -163,11 +186,10 @@ object_def
 				total = $NUMBER.to_s.to_i
 				@arrays[obj.ref] = total
 				for i in 0..(total-1)
-					id = obj['_self'] + "[#{i}]"
+					id = obj['_self'] + '[' + i.to_s + ']'
 					@now[id] = deep_clone(obj)
 					@now[id]['_self'] = id
 					@now[id]['_classes'] = obj['_classes']
-					#puts 'is_array: ' + $ID.text + '[' + i.to_s + ']'
 				end
 				@now.delete(obj['_self'])
 			else
@@ -212,7 +234,7 @@ operator
 				'_parent' => @now,
 				'_cost' => 1,
 				'_condition' => { '_context' => 'constraint' },
-				'_effect' => { '_context' => 'mutation' }
+				'_effect' => { '_context' => 'effect' }
 			}
 			@now = @now[$ID.text]
 		}
@@ -231,7 +253,7 @@ op_param
 	;
 
 op_conditions
-	:	'conditions' '{' NL*
+	:	('conditions' | 'condition') '{' NL*
 		{
 			@now['_condition']['_parent'] = @now
 			@now = @now['_condition']
@@ -265,7 +287,7 @@ procedure
 				'_parent' => @now,
 				'_cost' => 1,
 				'_condition' => { '_context' => 'constraint', '_type' => 'and' },
-				'_effect' => { '_context' => 'mutation', '_type' => 'and' }
+				'_effect' => { '_context' => 'effect', '_type' => 'and' }
 			}
 			@now = @now[$ID.text]
 		}
@@ -302,7 +324,7 @@ parameter
 	;
 
 conditions
-	:	'conditions'
+	:	('conditions' | 'condition')
 		{
 			@now['_condition']['_parent'] = @now
 			@now = @now['_condition']
@@ -313,15 +335,19 @@ conditions
 	;
 
 effects
-	:	'effects'
+	:	('effects' | 'effect')
 		{
 			@now['_effect']['_parent'] = @now
 			@now = @now['_effect']
+			@in_effects = true
 		}
 		'{' NL* 
-		mutation_body 
+		effect_body 
 		'}' NL+
-		{	self.goto_parent()	}
+		{
+			self.goto_parent()
+			@in_effects = false
+		}
 	;
 
 goal_constraint
@@ -711,10 +737,10 @@ conditional_constraint_then_part
 		{	self.goto_parent()	}
 	;
 
-mutation_body
+effect_body
 	:	(
-			(	mutation_statement
-				{	@now[$mutation_statement.key] = $mutation_statement.val	}
+			(	mutation
+				{	@now[$mutation.key] = $mutation.val	}
 			|	mutation_iterator
 			)
 		NL+)* 
@@ -731,14 +757,14 @@ mutation_iterator
 			}
 			@now = @now[id]
 		}
-		(mutation_statement
-		{	@now[$mutation_statement.key] = $mutation_statement.val	}
+		(mutation
+		{	@now[$mutation.key] = $mutation.val	}
 		NL+)*
 		'}'
 		{	self.goto_parent()	}
 	;
 
-mutation_statement returns [key, val]
+mutation returns [key, val]
 	:	reference equals_op value
 		{
 			$key = $reference.val

data/src/build.sh

@@ -3,5 +3,5 @@
 antlr4ruby SfpLang.g
 
 rm -f SfpLang.tokens
-mv -f SfpLangLexer.rb ../lib
-mv -f SfpLangParser.rb ../lib
+mv -f SfpLangLexer.rb ../lib/sfp
+mv -f SfpLangParser.rb ../lib/sfp

data/test/s.sfp

@@ -0,0 +1,14 @@
+
+
+b
+
+a {
+	x is true
+	refer is b
+}
+
+a.x is false
+
+a.refer is null
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &6400440 !ruby/object:Gem::Requirement
+  requirement: &8708440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *6400440
+  version_requirements: *8708440
 - !ruby/object:Gem::Dependency
   name: antlr3
-  requirement: &6399940 !ruby/object:Gem::Requirement
+  requirement: &8707420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,9 @@ dependencies:
         version: 1.8.12
   type: :runtime
   prerelease: false
-  version_requirements: *6399940
-description: A Ruby gem that provides a Ruby interface to parse SFP language. It also
-  provides a Ruby interface for a solver to generate a workflow for a planning task
-  written in SFP language.
+  version_requirements: *8707420
+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.
 email: herry13@gmail.com
 executables:
 - sfp
@@ -67,6 +66,7 @@ files:
 - test/cloud1.sfp
 - test/cloud2.sfp
 - test/cloud3.sfp
+- test/s.sfp
 - test/service-classes.sfp
 - test/service1.sfp
 - test/service3.sfp
@@ -107,6 +107,7 @@ test_files:
 - test/cloud1.sfp
 - test/cloud2.sfp
 - test/cloud3.sfp
+- test/s.sfp
 - test/service-classes.sfp
 - test/service1.sfp
 - test/service3.sfp