sfp 0.4.4 → 0.4.6

data/src/SfpLang.g

@@ -40,10 +40,26 @@ sfp
 	:	{ self.init }
 		NL*
 		( (object_def | abstract_object | state | constraint_def | class_def | procedure) NL*
-		| include )*
+		| include
+		| placement
+		)*
 		{ self.finalize }
 	;
 
+placement
+	:	'!' path
+		{
+			ref = "$.#{$path.text}"
+			parent, id = ref.pop_ref
+			@now = @root.at?(parent)
+			fail "parent #{parent} is not exist" if not @now.is_a?(Hash)
+		}
+		assignment[id]
+		{
+			@now = @root
+		}
+	;
+
 constraint_def
 	:	goal_constraint
 	|	global_constraint
@@ -112,9 +128,10 @@ attribute
 			@is_final = false
 			@now['_finals'] = [] if !@now.has_key? '_finals'
 		}
-		('final' { @is_final = true })? attribute_stmt
+		('final' { @is_final = true })?
+		ID assignment[$ID.text]
 		{
-			@now['_finals'] << $attribute_stmt.id if @is_final and !$attribute_stmt.id.nil?
+			@now['_finals'] << $ID.text if @is_final
 		}
 	|	{
 			@is_final = false
@@ -123,56 +140,51 @@ attribute
 		('final' { @is_final = true })? object_def NL+
 	;
 
-attribute_stmt returns [id]
-	:	ID equals_op value NL+
+assignment[id]
+	:	equals_op value NL+
 		{
-			if @now.has_key?($ID.text) and @now[$ID.text].is_a?(Hash) and
-					@now[$ID.text].isset and $value.type == 'Set'
-				$value.val.each { |v| @now[$ID.text]['_values'].push(v) }
+			if @now.has_key?($id) and @now[$id].is_a?(Hash) and
+					@now[$id].isset and $value.type == 'Set'
+				$value.val.each { |v| @now[$id]['_values'].push(v) }
 			else
-				@now[$ID.text] = $value.val
+				@now[$id] = $value.val
 			end
-			$id = $ID.text
 		}
-	|	ID reference_type NL+
+	|	reference_type NL+
 		{
-			@now[$ID.text] = $reference_type.val
-			$id = $ID.text
+			@now[$id] = $reference_type.val
 		}
-	|	ID set_type NL+
+	|	set_type NL+
 		{
-			@now[$ID.text] = $set_type.val
-			$id = $ID.text
+			@now[$id] = $set_type.val
 		}
-	|	ID probability_op set_value NL+
+	|	probability_op set_value NL+
 		{ 	
 			@conformant = true
-			@now[$ID.text] = { '_self' => $ID.text,
+			@now[$id] = { '_self' => $id,
 				'_context' => 'either',
 				'_parent' => @now,
 				'_values' => $set_value.val
 			}
-			$id = $ID.text
 		}
-	|	ID ':' path NL+
+	|	':' path NL+
 		{
 			case $path.text
 			when 'String'
-				@now[$ID.text] = { '_context' => 'any_value',
+				@now[$id] = { '_context' => 'any_value',
 					'_isa' => '$.String'
 				}
 			when 'Bool'
-				@now[$ID.text] = { '_context' => 'any_value',
+				@now[$id] = { '_context' => 'any_value',
 					'_isa' => '$.Boolean'
 				}
 			when 'Int'
-				@now[$ID.text] = { '_context' => 'any_value',
+				@now[$id] = { '_context' => 'any_value',
 					'_isa' => '$.Number'
 				}
 			else
 				raise Exception, "Use isa/isref for any non-primitive type (#{$path.text})."
 			end
-			$id = $ID.text
 		}
 	;
 
@@ -874,11 +886,11 @@ mutation returns [key, val]
 	;
 
 set_value returns [val]
-	:	'('
+	:	('('|'[')
 		{	@set = Array.new	}
 		(set_item (',' NL* set_item)*)?
 		{	$val = @set	}
-		')'
+		(')'|']')
 	;
 
 set_item

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr3