sfp 0.3.14 → 0.3.15

data/src/SfpLang.g

@@ -116,6 +116,11 @@ attribute
 		{
 			@now['_finals'] << $attribute_stmt.id if @is_final and !$attribute_stmt.id.nil?
 		}
+	|	{
+			@is_final = false
+			@now['_finals'] = [] if !@now.has_key? '_finals'
+		}
+		('final' { @is_final = true })? object_def NL+
 	;
 
 attribute_stmt returns [id]
@@ -169,8 +174,6 @@ attribute_stmt returns [id]
 			end
 			$id = $ID.text
 		}
-	|	object_def NL+
-		{	$id = nil }
 	;
 
 object_schema
@@ -191,8 +194,11 @@ abstract_object
 	;
 
 object_def returns [id]
-	:	{ @use_template = false }
-		ID { $id = $ID.text }
+	:	ID { $id = $ID.text }
+		{
+			@use_template = false
+			@now['_finals'] << $ID.text if @is_final
+		}
 		('extends' path
 		{
 			template = @root.at?($path.text)

metadata

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