sfp 0.3.11 → 0.3.12

data/README.md

@@ -1,16 +1,18 @@
 SFP Language Parser
 ===================
 - Author: Herry (herry13@gmail.com)
-- [Version](https://github.com/herry13/sfp-ruby/blob/master/VERSION)
-- License: [BSD License](https://github.com/herry13/sfp-ruby/blob/master/LICENSE)
+- [Version](../master/VERSION)
+- License: [BSD License](../master/LICENSE)
 
-A Ruby gem that provides a Ruby interface to parse [SFP language](https://github.com/herry13/nuri/wiki/SFP-language), a declarative language to specify a planning task.
+[![Gem Version](https://badge.fury.io/rb/sfp.png)](http://badge.fury.io/rb/sfp)
+
+A Ruby script and library for parsing [SFP language](https://github.com/herry13/nuri/wiki/SFP-language), a declarative language to specify a planning task.
 
 Click [here](https://github.com/herry13/nuri/wiki/SFP-language), for more details about SFP language.
 
 This is a spin-out project from [Nuri](https://github.com/herry13/nuri).
 
-**The planner has been moved to another project [sfplanner](https://github.com/herry13/sfplanner)**.
+**Note: Since version 0.3.0, the planner has been moved to another project: [sfplanner](https://github.com/herry13/sfplanner)**.
 
 
 To install
@@ -22,8 +24,8 @@ To install
 Requirements
 ------------
 - Ruby (>= 1.8.7)
-- Rubygems
-	- antlr3 (<= 1.8.12)
+- Ruby Gems
+	- antlr3 (>= 1.9.0)
 	- json
 
 
@@ -40,57 +42,62 @@ To use as Ruby library
 ----------------------
 - include file **main.sfp** in your codes:
 
-		require 'sfp'
-
+	```ruby
+	require 'sfp'
+	```
+		
 - to parse an SFP file: create a Sfp::Parser object, and then pass the content of the file:
 
-		# Determine the home directory of your SFP file.
-		home_dir = File.expand_path(File.dirname("my_file.sfp"))
-
-		# Create Sfp::Parser object
-		parser = Sfp::Parser.new({:home_dir => "./"})
+	```ruby
+	# Determine the home directory of your SFP file.
+	home_dir = File.expand_path(File.dirname("my_file.sfp"))
 
-		# Parse the file.
-		parser.parse(File.read("my_file.sfp"))
+	# Create Sfp::Parser object
+	parser = Sfp::Parser.new({:home_dir => "./"})
 
-		# Get the result in Hash data structure
-		result = parser.root
+	# Parse the file.
+	parser.parse(File.read("my_file.sfp"))
 
+	# Get the result in Hash data structure
+	result = parser.root
+	```
 
 
 Example of Planning Task
 ------------------------
 - Create file **types.sfp** to hold required schemas:
 
-		schema Service {
-			running is false
-			procedure start {
-				conditions {
-					this.running is false
-				}
-				effects {
-					this.running is true
-				}
+	```javascript
+	schema Service {
+		running is false
+		procedure start {
+			conditions {
+				this.running is false
 			}
-			procedure stop {
-				conditions {
-					this.running is true
-				}
-				effects {
-					this.running is false
-				}
+			effects {
+				this.running is true
 			}
 		}
-		schema Client {
-			refer isref Service
-			procedure redirect(s isref Service) {
-				conditions { }
-				effects {
-					this.refer is s
-				}
+		procedure stop {
+			conditions {
+				this.running is true
+			}
+			effects {
+				this.running is false
 			}
 		}
-
+	}
+	schema Client {
+		refer isref Service
+		procedure redirect(s isref Service) {
+			conditions { }
+			effects {
+				this.refer is s
+			}
+		}
+	}
+	```
+	
   In this file, we have two schemas that model our domain. First, schema
   **Service** with an attribute **running**, procedure **start** that
   changes **running**'s value from **false** to **true**, and procedure
@@ -103,29 +110,31 @@ Example of Planning Task
 
 - Create file **task.sfp** to hold the task:
 
-		include "types.sfp"
+	```javascript
+	include "types.sfp"
 		
-		initial state {
-			a isa Service {
-				running is true
-			}
-
-			b isa Service // with "running" is false
-
-			pc isa Client {
-				refer is a
-			}
+	initial state {
+		a isa Service {
+			running is true
 		}
 
-		goal constraint {
-			pc.refer is b
-			a.running is false
-		}
+		b isa Service // with "running" is false
 
-		global constraint {
-			pc.refer.running is true
+		pc isa Client {
+			refer is a
 		}
-
+	}
+
+	goal constraint {
+		pc.refer is b
+		a.running is false
+	}
+
+	global constraint {
+		pc.refer.running is true
+	}
+	```
+	
   In this file, we specify a task where in the initial state of our domain,
   we have two services **a** and **b**, and a client **pc**. **a** is
   running, **b** is stopped, and **pc** is referring to **a**. We want to
@@ -140,46 +149,48 @@ Example of Planning Task
 
   Which will generate a workflow in JSON
 
-		{
-		  "type": "sequential",
-		  "workflow": [
-		    {
-		      "name": "$.b.start",
-		      "parameters": {
-		      },
-		      "condition": {
-		        "$.b.running": false
-		      },
-		      "effect": {
-		        "$.b.running": true
-		      }
-		    },
-		    {
-		      "name": "$.pc.redirect",
-		      "parameters": {
-		        "$.s": "$.b"
-		      },
-		      "condition": {
-		      },
-		      "effect": {
-		        "$.pc.refer": "$.b"
-		      }
-		    },
-		    {
-		      "name": "$.a.stop",
-		      "parameters": {
-		      },
-		      "condition": {
-		        "$.a.running": true
-		      },
-		      "effect": {
-		        "$.a.running": false
-		      }
-		    }
-		  ],
-		  "version": "1",
-		  "total": 3
-		}
+	```javascript
+	{
+	  "type": "sequential",
+	  "workflow": [
+	    {
+	      "name": "$.b.start",
+	      "parameters": {
+	      },
+	      "condition": {
+	        "$.b.running": false
+	      },
+	      "effect": {
+	        "$.b.running": true
+	      }
+	    },
+	    {
+	      "name": "$.pc.redirect",
+	      "parameters": {
+	        "$.s": "$.b"
+	      },
+	      "condition": {
+	      },
+	      "effect": {
+	        "$.pc.refer": "$.b"
+	      }
+	    },
+	    {
+	      "name": "$.a.stop",
+	      "parameters": {
+	      },
+	      "condition": {
+	        "$.a.running": true
+	      },
+	      "effect": {
+	        "$.a.running": false
+	      }
+	    }
+	  ],
+	  "version": "1",
+	  "total": 3
+	}
+	```
 
   This workflow is sequential that has 3 procedures. If you executes
   the workflow in given order, it will achieves the goal state as well

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/lib/sfp/sas_translator.rb

@@ -175,8 +175,20 @@ module Sfp
 				end
 			end
 
-				# add Sfp::Unknown and Sfp::Undefined value to all non-final variables
-				self.add_unknown_undefined_value_to_variables
+			@variables.each_value do |var|
+				if !var.index(var.init)
+					var << var.init
+					@types[var.type] << var.init
+				end
+				if !var.goal.nil? and !var.index(var.goal)
+					var << var.goal
+					@types[var.type] << var.goal
+				end
+			end
+			@types.each_value { |type| type.uniq! }
+
+			# add Sfp::Unknown and Sfp::Undefined value to all non-final variables
+			self.add_unknown_undefined_value_to_variables
 
 			@benchmarks['processing procedures'] = Benchmark.measure do
 				### process all procedures

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
   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: &20563100 !ruby/object:Gem::Requirement
+  requirement: &9424740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *20563100
+  version_requirements: *9424740
 - !ruby/object:Gem::Dependency
   name: antlr3
-  requirement: &20562560 !ruby/object:Gem::Requirement
+  requirement: &9424160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *20562560
+  version_requirements: *9424160
 description: A Ruby API and script for SFP language parser
 email: herry13@gmail.com
 executables: