sfp 0.3.4 → 0.3.5

data/README.md

@@ -1,7 +1,7 @@
-SFP Parser and Planner for Ruby
-===============================
+SFP Language Parser
+===================
 - Author: Herry (herry13@gmail.com)
-- Version: 0.3.4
+- Version: 0.3.5
 - License: [BSD License](https://github.com/herry13/sfp-ruby/blob/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.
@@ -10,6 +10,8 @@ Click [here](https://github.com/herry13/nuri/wiki/SFP-language), for more detail
 
 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)**.
+
 
 To install
 ----------
@@ -24,14 +26,12 @@ Requirements
 	- antlr3
 	- json
 
-Tested on: MacOS X 10.8, Ubuntu 12.04, Scientific Linux 6, Debian Wheeze Raspberry
-
 
 To use as a command line
 ------------------------
 - parse a SFP file, and then print the output in JSON
 
-		$ sfp --json <sfp-file>
+		$ sfp <sfp-file>
 
 To solve a planning task, you can use [sfplanner](https://github.com/herry13/sfplanner)/
 
@@ -133,10 +133,10 @@ Example of Planning Task
   and **a** is stopped, and preserves global constraint: **pc** is always
   referring to a running service.
 
-- To generate the workflow, we invoke **sfp** command with argument
-  the path of the task file:
+- To generate the workflow, we invoke **sfplanner** (see [sfplanner](https://github.com/herry13/sfplanner))
+  command with argument the path of the task file:
 
-		$ sfp task.sfp
+		$ sfplanner task.sfp
 
   Which will generate a workflow in JSON
 
@@ -184,23 +184,3 @@ Example of Planning Task
   This workflow is sequential that has 3 procedures. If you executes
   the workflow in given order, it will achieves the goal state as well
   as perserves the global constraints during the execution.
-
-- To generate and execute the plan using Bash framework, we invoke **sfp**
-  command with an option *--solve-execute* and with an argument the path of
-  the task file:
-
-		$ sfp --solve-execute task.sfp
-
-  It will generate and execute the plan by invoking the Bash scripts in
-  the current directory (or as specified in environment variable SFP_HOME)
-  in the following sequence:
-
-		./modules/b/start
-		./modules/pc/redirect "$.b"
-		./modules/a/stop
-
-- If you save the plan in a file e.g. **plan.json**, you could execute it
-  later using option *--execute*
-
-		$ sfp --execute plan.json
-

data/bin/sfp

@@ -4,7 +4,7 @@ libdir = File.expand_path(File.dirname(__FILE__))
 require "#{libdir}/../lib/sfp"
 
 opts = Trollop::options do
-	version "sfp 0.3.4 (c) 2013 Herry"
+	version "sfp 0.3.5 (c) 2013 Herry"
 	banner <<-EOS
 Parse a SFP file and print the result in JSON format.
 

data/lib/sfp/SfpLangLexer.rb

@@ -5,7 +5,7 @@
 # Generated using ANTLR version: 3.2.1-SNAPSHOT Jul 31, 2010 19:34:52
 # Ruby runtime library version: 1.8.11
 # Input grammar file: SfpLang.g
-# Generated at: 2013-07-15 00:24:28
+# Generated at: 2013-07-18 06:07:24
 # 
 
 # ~~~> start load path setup
@@ -1758,7 +1758,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1029:2: ( 'null' | 'nil' )
+      # at line 1005:2: ( 'null' | 'nil' )
       alt_1 = 2
       look_1_0 = @input.peek( 1 )
 
@@ -1777,11 +1777,11 @@ module SfpLang
       end
       case alt_1
       when 1
-        # at line 1029:4: 'null'
+        # at line 1005:4: 'null'
         match( "null" )
 
       when 2
-        # at line 1030:4: 'nil'
+        # at line 1006:4: 'nil'
         match( "nil" )
 
       end
@@ -1806,7 +1806,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1034:2: ( 'true' | 'false' | 'off' | 'on' | 'yes' | 'no' )
+      # at line 1010:2: ( 'true' | 'false' | 'off' | 'on' | 'yes' | 'no' )
       alt_2 = 6
       case look_2 = @input.peek( 1 )
       when 0x74 then alt_2 = 1
@@ -1827,27 +1827,27 @@ module SfpLang
       end
       case alt_2
       when 1
-        # at line 1034:4: 'true'
+        # at line 1010:4: 'true'
         match( "true" )
 
       when 2
-        # at line 1035:4: 'false'
+        # at line 1011:4: 'false'
         match( "false" )
 
       when 3
-        # at line 1036:4: 'off'
+        # at line 1012:4: 'off'
         match( "off" )
 
       when 4
-        # at line 1037:4: 'on'
+        # at line 1013:4: 'on'
         match( "on" )
 
       when 5
-        # at line 1038:4: 'yes'
+        # at line 1014:4: 'yes'
         match( "yes" )
 
       when 6
-        # at line 1039:4: 'no'
+        # at line 1015:4: 'no'
         match( "no" )
 
       end
@@ -1872,7 +1872,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1042:6: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
+      # at line 1018:6: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
       if @input.peek( 1 ).between?( 0x41, 0x5a ) || @input.peek( 1 ).between?( 0x61, 0x7a )
         @input.consume
       else
@@ -1882,7 +1882,7 @@ module SfpLang
       end
 
 
-      # at line 1042:26: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
+      # at line 1018:26: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
       while true # decision 3
         alt_3 = 2
         look_3_0 = @input.peek( 1 )
@@ -1930,8 +1930,8 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1046:4: ( '-' )? ( '0' .. '9' )+
-      # at line 1046:4: ( '-' )?
+      # at line 1022:4: ( '-' )? ( '0' .. '9' )+
+      # at line 1022:4: ( '-' )?
       alt_4 = 2
       look_4_0 = @input.peek( 1 )
 
@@ -1940,11 +1940,11 @@ module SfpLang
       end
       case alt_4
       when 1
-        # at line 1046:4: '-'
+        # at line 1022:4: '-'
         match( 0x2d )
 
       end
-      # at file 1046:8: ( '0' .. '9' )+
+      # at file 1022:8: ( '0' .. '9' )+
       match_count_5 = 0
       while true
         alt_5 = 2
@@ -1956,7 +1956,7 @@ module SfpLang
         end
         case alt_5
         when 1
-          # at line 1046:9: '0' .. '9'
+          # at line 1022:9: '0' .. '9'
           match_range( 0x30, 0x39 )
 
         else
@@ -1991,7 +1991,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1057:2: ( '//' (~ ( '\\n' | '\\r' ) )* | '#' (~ ( '\\n' | '\\r' ) )* | '/*' ( options {greedy=false; } : . )* '*/' )
+      # at line 1033:2: ( '//' (~ ( '\\n' | '\\r' ) )* | '#' (~ ( '\\n' | '\\r' ) )* | '/*' ( options {greedy=false; } : . )* '*/' )
       alt_9 = 3
       look_9_0 = @input.peek( 1 )
 
@@ -2012,9 +2012,9 @@ module SfpLang
       end
       case alt_9
       when 1
-        # at line 1057:4: '//' (~ ( '\\n' | '\\r' ) )*
+        # at line 1033:4: '//' (~ ( '\\n' | '\\r' ) )*
         match( "//" )
-        # at line 1057:9: (~ ( '\\n' | '\\r' ) )*
+        # at line 1033:9: (~ ( '\\n' | '\\r' ) )*
         while true # decision 6
           alt_6 = 2
           look_6_0 = @input.peek( 1 )
@@ -2025,7 +2025,7 @@ module SfpLang
           end
           case alt_6
           when 1
-            # at line 1057:9: ~ ( '\\n' | '\\r' )
+            # at line 1033:9: ~ ( '\\n' | '\\r' )
             if @input.peek( 1 ).between?( 0x0, 0x9 ) || @input.peek( 1 ).between?( 0xb, 0xc ) || @input.peek( 1 ).between?( 0xe, 0xff )
               @input.consume
             else
@@ -2045,9 +2045,9 @@ module SfpLang
         # <-- action
 
       when 2
-        # at line 1058:4: '#' (~ ( '\\n' | '\\r' ) )*
+        # at line 1034:4: '#' (~ ( '\\n' | '\\r' ) )*
         match( 0x23 )
-        # at line 1058:8: (~ ( '\\n' | '\\r' ) )*
+        # at line 1034:8: (~ ( '\\n' | '\\r' ) )*
         while true # decision 7
           alt_7 = 2
           look_7_0 = @input.peek( 1 )
@@ -2058,7 +2058,7 @@ module SfpLang
           end
           case alt_7
           when 1
-            # at line 1058:8: ~ ( '\\n' | '\\r' )
+            # at line 1034:8: ~ ( '\\n' | '\\r' )
             if @input.peek( 1 ).between?( 0x0, 0x9 ) || @input.peek( 1 ).between?( 0xb, 0xc ) || @input.peek( 1 ).between?( 0xe, 0xff )
               @input.consume
             else
@@ -2078,9 +2078,9 @@ module SfpLang
         # <-- action
 
       when 3
-        # at line 1059:4: '/*' ( options {greedy=false; } : . )* '*/'
+        # at line 1035:4: '/*' ( options {greedy=false; } : . )* '*/'
         match( "/*" )
-        # at line 1059:9: ( options {greedy=false; } : . )*
+        # at line 1035:9: ( options {greedy=false; } : . )*
         while true # decision 8
           alt_8 = 2
           look_8_0 = @input.peek( 1 )
@@ -2100,7 +2100,7 @@ module SfpLang
           end
           case alt_8
           when 1
-            # at line 1059:37: .
+            # at line 1035:37: .
             match_any
 
           else
@@ -2134,9 +2134,9 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1063:4: 'r\"' ( options {greedy=false; } : . )* '\"'
+      # at line 1039:4: 'r\"' ( options {greedy=false; } : . )* '\"'
       match( "r\"" )
-      # at line 1063:9: ( options {greedy=false; } : . )*
+      # at line 1039:9: ( options {greedy=false; } : . )*
       while true # decision 10
         alt_10 = 2
         look_10_0 = @input.peek( 1 )
@@ -2149,7 +2149,7 @@ module SfpLang
         end
         case alt_10
         when 1
-          # at line 1063:37: .
+          # at line 1039:37: .
           match_any
 
         else
@@ -2179,8 +2179,8 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1066:6: ( '\\r' )? '\\n'
-      # at line 1066:6: ( '\\r' )?
+      # at line 1042:6: ( '\\r' )? '\\n'
+      # at line 1042:6: ( '\\r' )?
       alt_11 = 2
       look_11_0 = @input.peek( 1 )
 
@@ -2189,7 +2189,7 @@ module SfpLang
       end
       case alt_11
       when 1
-        # at line 1066:6: '\\r'
+        # at line 1042:6: '\\r'
         match( 0xd )
 
       end
@@ -2216,7 +2216,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1069:8: ( ' ' | '\\t' )
+      # at line 1045:8: ( ' ' | '\\t' )
       if @input.peek(1) == 0x9 || @input.peek(1) == 0x20
         @input.consume
       else
@@ -2251,9 +2251,9 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1073:5: '\"' ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )* '\"'
+      # at line 1049:5: '\"' ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )* '\"'
       match( 0x22 )
-      # at line 1073:9: ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )*
+      # at line 1049:9: ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )*
       while true # decision 12
         alt_12 = 3
         look_12_0 = @input.peek( 1 )
@@ -2266,11 +2266,11 @@ module SfpLang
         end
         case alt_12
         when 1
-          # at line 1073:11: ESC_SEQ
+          # at line 1049:11: ESC_SEQ
           esc_seq!
 
         when 2
-          # at line 1073:21: ~ ( '\\\\' | '\"' )
+          # at line 1049:21: ~ ( '\\\\' | '\"' )
           if @input.peek( 1 ).between?( 0x0, 0x21 ) || @input.peek( 1 ).between?( 0x23, 0x5b ) || @input.peek( 1 ).between?( 0x5d, 0xff )
             @input.consume
           else
@@ -2305,7 +2305,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1077:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+      # at line 1053:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
       if @input.peek(1) == 0x45 || @input.peek(1) == 0x65
         @input.consume
       else
@@ -2315,7 +2315,7 @@ module SfpLang
       end
 
 
-      # at line 1077:22: ( '+' | '-' )?
+      # at line 1053:22: ( '+' | '-' )?
       alt_13 = 2
       look_13_0 = @input.peek( 1 )
 
@@ -2336,7 +2336,7 @@ module SfpLang
 
 
       end
-      # at file 1077:33: ( '0' .. '9' )+
+      # at file 1053:33: ( '0' .. '9' )+
       match_count_14 = 0
       while true
         alt_14 = 2
@@ -2348,7 +2348,7 @@ module SfpLang
         end
         case alt_14
         when 1
-          # at line 1077:34: '0' .. '9'
+          # at line 1053:34: '0' .. '9'
           match_range( 0x30, 0x39 )
 
         else
@@ -2376,7 +2376,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1080:13: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+      # at line 1056:13: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
       if @input.peek( 1 ).between?( 0x30, 0x39 ) || @input.peek( 1 ).between?( 0x41, 0x46 ) || @input.peek( 1 ).between?( 0x61, 0x66 )
         @input.consume
       else
@@ -2401,7 +2401,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1084:2: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
+      # at line 1060:2: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
       alt_15 = 3
       look_15_0 = @input.peek( 1 )
 
@@ -2418,7 +2418,7 @@ module SfpLang
       end
       case alt_15
       when 1
-        # at line 1084:6: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+        # at line 1060:6: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
         match( 0x5c )
         if @input.peek(1) == 0x22 || @input.peek(1) == 0x27 || @input.peek(1) == 0x5c || @input.peek(1) == 0x62 || @input.peek(1) == 0x66 || @input.peek(1) == 0x6e || @input.peek(1) == 0x72 || @input.peek(1) == 0x74
           @input.consume
@@ -2431,11 +2431,11 @@ module SfpLang
 
 
       when 2
-        # at line 1085:6: UNICODE_ESC
+        # at line 1061:6: UNICODE_ESC
         unicode_esc!
 
       when 3
-        # at line 1086:6: OCTAL_ESC
+        # at line 1062:6: OCTAL_ESC
         octal_esc!
 
       end
@@ -2453,7 +2453,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1091:2: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+      # at line 1067:2: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
       alt_16 = 3
       look_16_0 = @input.peek( 1 )
 
@@ -2490,38 +2490,38 @@ module SfpLang
       end
       case alt_16
       when 1
-        # at line 1091:6: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+        # at line 1067:6: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
         match( 0x5c )
-        # at line 1091:11: ( '0' .. '3' )
-        # at line 1091:12: '0' .. '3'
+        # at line 1067:11: ( '0' .. '3' )
+        # at line 1067:12: '0' .. '3'
         match_range( 0x30, 0x33 )
 
-        # at line 1091:22: ( '0' .. '7' )
-        # at line 1091:23: '0' .. '7'
+        # at line 1067:22: ( '0' .. '7' )
+        # at line 1067:23: '0' .. '7'
         match_range( 0x30, 0x37 )
 
-        # at line 1091:33: ( '0' .. '7' )
-        # at line 1091:34: '0' .. '7'
+        # at line 1067:33: ( '0' .. '7' )
+        # at line 1067:34: '0' .. '7'
         match_range( 0x30, 0x37 )
 
 
       when 2
-        # at line 1092:6: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+        # at line 1068:6: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
         match( 0x5c )
-        # at line 1092:11: ( '0' .. '7' )
-        # at line 1092:12: '0' .. '7'
+        # at line 1068:11: ( '0' .. '7' )
+        # at line 1068:12: '0' .. '7'
         match_range( 0x30, 0x37 )
 
-        # at line 1092:22: ( '0' .. '7' )
-        # at line 1092:23: '0' .. '7'
+        # at line 1068:22: ( '0' .. '7' )
+        # at line 1068:23: '0' .. '7'
         match_range( 0x30, 0x37 )
 
 
       when 3
-        # at line 1093:6: '\\\\' ( '0' .. '7' )
+        # at line 1069:6: '\\\\' ( '0' .. '7' )
         match( 0x5c )
-        # at line 1093:11: ( '0' .. '7' )
-        # at line 1093:12: '0' .. '7'
+        # at line 1069:11: ( '0' .. '7' )
+        # at line 1069:12: '0' .. '7'
         match_range( 0x30, 0x37 )
 
 
@@ -2540,7 +2540,7 @@ module SfpLang
 
       
       # - - - - main rule block - - - -
-      # at line 1098:6: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+      # at line 1074:6: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
       match( 0x5c )
       match( 0x75 )
       hex_digit!