sfp 0.3.10 → 0.3.11

data/lib/sfp/Sfplib.rb

@@ -13,6 +13,13 @@ module Sfp
 			@conformant = false
 		end
 
+		def finalize
+			@root.keys.each { |k|
+				next if k[0,1] == '_' or !@root[k].is_a?(Hash)
+				@root.delete(k) if @root[k]['_context'] == 'abstract'
+			}
+		end
+
 		def next_id
 			nid = "c#{@constraint_next_id}"
 			@constraint_next_id += 1

data/src/SfpLang.g

@@ -37,37 +37,19 @@ TODO:
 }
 
 sfp 
-	:	{	self.init	}
+	:	{ self.init }
 		NL*
-		//{	self.expand_classes	}
-		( (object_def | state | constraints) NL* | include | class_def | procedure )*
-		// | goal_constraint | composite)*
+		( (object_def | abstract_object | state | constraint_def | class_def | procedure) NL*
+		| include )*
+		{ self.finalize }
 	;
 
-constraints
+constraint_def
 	:	goal_constraint
 	|	global_constraint
 	|	sometime_constraint
 	;
 
-/*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
 	:	'include' include_file NL+
 	;
@@ -77,11 +59,6 @@ include_file
 		{ self.process_file($STRING.text[1,$STRING.text.length-2]) }
 	;
 	
-header
-	:	class_def
-	|	procedure
-	;
-
 state
 	:	ID 'state' NL*
 		{
@@ -97,19 +74,6 @@ state
 		{	self.goto_parent(true)	}
 	;
 
-composite
-	:	'composite' ID
-		{
-			@now[$ID.text] = { '_self' => $ID.text,
-				'_context' => 'composite',
-				'_parent' => @now
-			}
-			@now = @now[$ID.text]
-		}
-		'{' NL* ( attribute | constraint )* '}' NL*
-		{	self.goto_parent(true)	}
-	;
-
 class_def
 	:	('class'|'schema') ID
 		{
@@ -124,7 +88,7 @@ class_def
 			@now['_extends'] = $extends_class.val
 		}
 		)?
-		('{' NL* ( attribute | procedure )* '}')? NL*
+		('{' NL* ( attribute | procedure NL* )* '}')?
 		{
 			if not @now.has_key?('_extends')
 				@now['_extends'] = '$.Object'
@@ -221,9 +185,14 @@ object_schemata
 	:	',' object_schema
 	;
 
-object_def
+abstract_object
+	:	'abstract' object_def
+		{  @root[$object_def.id]['_context'] = 'abstract'  }
+	;
+
+object_def returns [id]
 	:	{ @use_template = false }
-		ID
+		ID { $id = $ID.text }
 		('extends' path
 		{
 			template = @root.at?($path.text)
@@ -349,7 +318,7 @@ procedure
 			{	@now['_cost'] = $NUMBER.text.to_i	}
 			NL+
 		)?
-		conditions? effects '}' NL+
+		conditions? effects '}'
 		{	self.goto_parent()	}
 	;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21346840 !ruby/object:Gem::Requirement
+  requirement: &20563100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *21346840
+  version_requirements: *20563100
 - !ruby/object:Gem::Dependency
   name: antlr3
-  requirement: &21345480 !ruby/object:Gem::Requirement
+  requirement: &20562560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *21345480
+  version_requirements: *20562560
 description: A Ruby API and script for SFP language parser
 email: herry13@gmail.com
 executables: