pione 0.1.0 → 0.1.1

data/lib/pione/command/pione-client.rb

@@ -73,6 +73,11 @@ module Pione
         @name = name
       end
 
+      # --list-parameters
+      define_option('--list-params', 'show user parameter list in the document') do
+        @list_params = true
+      end
+
       attr_reader :tuple_space_server
       attr_reader :name
 
@@ -91,6 +96,8 @@ module Pione
         @relay = nil
         @filename = "-"
         @without_tuple_space_provider = false
+        @features = "^Interactive"
+        @list_params = false
       end
 
       private
@@ -172,10 +179,24 @@ module Pione
 
       def start
         read_process_document
+
+        if @list_params
+          print_parameter_list
+          exit
+        end
+
         write_tuples
         connect_relay if @relay
         start_agents
-        start_tuple_space_provider unless @without_tuple_space_provider
+
+        # start tuple space provider with thread
+        # the thread is terminated when the client terminated
+        unless @without_tuple_space_provider
+          @start_tuple_space_provider_thread = Thread.new do
+            start_tuple_space_provider
+          end
+        end
+
         start_workers
         @agent = Agent[:process_manager].start(@tuple_space_server, @document, @params, @stream)
         @agent.running_thread.join
@@ -183,6 +204,14 @@ module Pione
       end
 
       def terminate
+        # kill the thread for starting tuple space provider
+        if @start_tuple_space_provider_thread
+          if @start_tuple_space_provider_thread.alive?
+            @start_tuple_space_provider_thread.kill
+          end
+        end
+
+        # terminate tuple space provider
         if @tuple_space_provider
           @tuple_space_provider.terminate
         end
@@ -244,7 +273,7 @@ module Pione
 
       def start_workers
         @task_worker.times do
-          Agent[:task_worker].spawn(Global.front, Util.generate_uuid, @features)
+          Thread.new { Agent[:task_worker].spawn(Global.front, Util.generate_uuid, @features) }
         end
       end
 
@@ -268,6 +297,16 @@ module Pione
       rescue Relay::RelaySocket::AuthError
         abort("You failed authentication to connect the relay server: %s" % @relay_ref.__drburi)
       end
+
+      # Print parameter list of the document.
+      #
+      # @return [void]
+      def print_parameter_list
+        puts "Parameters:"
+        @document.params.data.select{|var, val| var.user_param}.each do |var, val|
+          puts "  %s := %s" % [var.name, val.textize]
+        end
+      end
     end
   end
 end

data/lib/pione/command/pione-syntax-checker.rb

@@ -30,16 +30,27 @@ TXT
         if @readline_mode
           require 'readline'
           restore_history
+          buf = ""
+          mark = ">"
 
           # start loop
-          while buf = Readline.readline(Terminal.red("> "), true)
+          while buf += Readline.readline(Terminal.red("#{mark} "), true)
             if /[^\s]/.match(buf)
               # don't record if previous line is the same
               if Readline::HISTORY.size > 1 && Readline::HISTORY[-2] == buf
                 Readline::HISTORY.pop
               end
-              # print parsing result
-              print_result(buf)
+              if buf[-1] == "\\"
+                buf[-1] = "\n"
+                mark = "+"
+                next
+              else
+                # print parsing result
+                puts buf
+                print_result(buf)
+                buf = ""
+                mark = ">"
+              end
             else
               # don't record if it is an empty line
               Readline::HISTORY.pop

data/lib/pione/command/pione-task-worker.rb

@@ -56,7 +56,10 @@ TXT
         begin
           @parent_front.uuid
         rescue => e
-          abort("pione-task-worker cannot get the parent front server: %s" % e)
+          if Pione.debug_mode?
+            debug_message "pione-task-worker cannot get the parent front server: %s" % e
+          end
+          abort
         end
       end
 

data/lib/pione/command/pione-tuple-space-provider.rb

@@ -61,13 +61,13 @@ TXT
         # start provider activity
         @tuple_space_provider.start
 
-        # set my URI to caller front as its provider
-        unless @no_parent_mode
-          @parent_front.set_tuple_space_provider(Global.front.uri)
-        end
-
-        # wait
         begin
+          # set my URI to caller front as its provider
+          unless @no_parent_mode
+            @parent_front.set_tuple_space_provider(Global.front.uri)
+          end
+
+          # wait
           DRb.thread.join
         rescue DRb::DRbConnError, DRb::ReplyReaderThreadError
           terminate
@@ -76,7 +76,6 @@ TXT
 
       # @api private
       def terminate
-        puts "terminate %s" % program_name
         @tuple_space_provider.terminate
         super
       rescue DRb::DRbConnError, DRb::ReplyReaderThreadError

data/lib/pione/model/assignment.rb

@@ -41,10 +41,16 @@ module Pione::Model
       vtable.set(@variable, @expr)
     end
 
+    # Set truth of toplevel assignment.
     def set_toplevel(b)
       @variable.set_toplevel(b)
     end
 
+    # Set truth of user parameter.
+    def set_user_param(b)
+      @variable.set_user_param(b)
+    end
+
     # Returns true if the assignment is defined in toplevel.
     # @return [Boolean]
     #   true if the assignment is defined in toplevel

data/lib/pione/model/message.rb

@@ -30,12 +30,16 @@ module Pione::Model
       false
     end
 
-    # Returns PIONE model type of the message result according to type
-    # interface.
+    # Return PIONE model type of the message result according to type interface.
+    #
     # @return [Symbol]
     #   PIONE model type
     def pione_model_type
-      @receiver.pione_model_type.method_interface[@name.to_s].output
+      if interface = @receiver.pione_model_type.method_interface[@name.to_s]
+        interface.output
+      else
+        raise MethodNotFound.new(@name.to_s, self)
+      end
     end
 
     # Evaluates the application expression and returns application result.

data/lib/pione/model/variable.rb

@@ -6,11 +6,16 @@ module Pione::Model
 
     attr_reader :name
 
+    # true if the variable is user parameter
+    attr_reader :user_param
+
     # Creates a variable with name.
     # @param [String] name
     #   variable name
     def initialize(name)
       @name = name.to_s
+      @toplevel = nil
+      @user_param = nil
       super()
     end
 
@@ -33,10 +38,16 @@ module Pione::Model
       true
     end
 
+    # Set truth of toplevel variable.
     def set_toplevel(b)
       @toplevel = b
     end
 
+    # Set truth of user parameter.
+    def set_user_param(b)
+      @user_param = b
+    end
+
     # Returns true if the variable is defined in toplevel.
     # @return [Boolean]
     #   true if the variable is defined in toplevel

data/lib/pione/parser/common-parser.rb

@@ -65,6 +65,7 @@ module Pione
         :keyword_input => 'input',
         :keyword_output => 'output',
         :keyword_param => 'param',
+        :keyword_Param => 'Param',
         :keyword_feature => 'feature',
         :keyword_rule => 'rule',
         :keyword_if => 'if',
@@ -102,24 +103,45 @@ module Pione
       #   @return [Parslet::Atoms::Entity] +digit+ atom
       rule(:digit) { match('[0-9]') }
 
-      # @!attribute [r] space
-      #   +space+ matches sequences of space character or tab.
-      #   @return [Parslet::Atoms::Entity] +space+ atom
-      rule(:space) { match("[ \t]").repeat(1) }
+      # @!method space
+      #
+      # Return +space+ parser. +space+ matches sequences of space character,
+      # tab, or comment.
+      #
+      # @return [Parslet::Atoms::Entity] +space+ atom
+      rule(:space) {
+        ( match("[ \t]") |
+          str("#") >> ((str("\n") | any.absent?).absent? >> any).repeat
+        ).repeat(1)
+      }
 
-      # @!attribute [r] space?
-      #   +space?+ matches +space+ atom or empty.
-      #   @return [Parslet::Atoms::Entity] +space?+ atom
+      # @!method space?
+      #
+      # Return +space?+ parser. +space?+ matches +space+ or empty.
+      #
+      # @return [Parslet::Atoms::Entity]
+      #   +space?+ parser
       rule(:space?) { space.maybe }
 
-      # @!attribute [r] pad
-      #   +space?+ matches space character, tab, and newline.
-      #   @return [Parslet::Atoms::Entity] +pad+ atom
-      rule(:pad) { match("[ \t\n]").repeat(1) }
+      # @!method pad
+      #
+      # Return +pad+ parser. +pad+ matches sequences of space character, tab,
+      # newline, or comment.
+      #
+      # @return [Parslet::Atoms::Entity]
+      #   +pad+ parser
+      rule(:pad) {
+        ( match("[ \t\n]") |
+          str("#") >> ((str("\n") | any.absent?).absent? >> any).repeat
+        ).repeat(1)
+      }
 
-      # @!attribute [r] pad?
-      #   +space?+ matches +pad+ atom or empty.
-      #   @return [Parslet::Atoms::Entity] +pad?+ atom
+      # @!method pad?
+      #
+      # Return +pad?+ parser. +pad?+ matches +pad+ or empty.
+      #
+      # @return [Parslet::Atoms::Entity]
+      #   +pad?+ parser
       rule(:pad?) { pad.maybe }
 
       # @!attribute [r] line_end

data/lib/pione/parser/document-parser.rb

@@ -10,15 +10,54 @@ module Pione
       include BlockParser
       include RuleDefinitionParser
 
-      def parse(str)
-        super(str.gsub(/^(?!#!)#.*/, ""))
-      end
-
       #
       # root
       #
 
-      root(:rule_definitions)
+      root(:toplevel_elements)
+
+      # @!method toplevel_elements
+      #
+      # Return +toplevel_elements+ parser. This is root parser for reading a
+      # document.
+      #
+      # @return [Parslet::Atoms::Entity]
+      #   +toplevel_elements+ parser
+      rule(:toplevel_elements) {
+        (empty_lines? >> space? >> toplevel_element >> empty_lines?).repeat
+      }
+
+      # @!method toplevel_element
+      #
+      # Return +toplevel_element+ parser.
+      #
+      # @return [Parslet::Atoms::Entity]
+      #   +toplevel_element+ parser
+      #
+      # @example
+      #   # document toplevel assignment
+      #   DocumentParser.toplevel_element.parse("$X := 1")
+      # @example
+      #   # define rule
+      #   DocumentParser.new.toplevel_element.parse <<TXT
+      #     Rule Main
+      #       input '*.txt'
+      #       ...
+      #     Flow
+      #       rule SubRule
+      #       ...
+      #     End
+      #   TXT
+      # @example
+      #   # you can write any expressions in toplevel but it is ignored
+      #   DocumentParser.new.toplevel_element.parse("1 + 1")
+      rule(:toplevel_element) {
+        rule_definition |
+        param_block |
+        param_line |
+        assignment_line |
+        expr
+      }
 
       #
       # document statement
@@ -34,6 +73,44 @@ module Pione
         require_line
       }
 
+      # @!method assignment_line
+      #
+      # Return +assignment_line+ parser.
+      #
+      # @return [Parslet::Atoms::Entity]
+      #   +assignment_line+ parser
+      #
+      # @example
+      #   DocumentParser.new.assignment_line("$X := 1")
+      rule(:assignment_line) {
+        space? >> assignment >> line_end
+      }
+
+      # @!method param_block
+      #
+      # Return +param_block+ parser.
+      #
+      # @return [Parslet::Atoms::Entity]
+      #   +param block+ parser
+      #
+      # @example
+      #   DocumentParser.new.param_block <<TXT
+      #     Param
+      #       $X := 1
+      #       $Y := 2
+      #       $Z := 3
+      #     End
+      #   TXT
+      rule(:param_block) {
+        ( space? >>
+          keyword_Param >>
+          line_end >>
+          (assignment_line | pad).repeat >>
+          (keyword_End | syntax_error("it should be block end", :keyword_End)) >>
+          line_end
+        ).as(:param_block)
+      }
+
       # package_line
       rule(:package_line) {
         ( space? >>

data/lib/pione/parser/rule-definition-parser.rb

@@ -10,35 +10,6 @@ module Pione
       include FlowElementParser
       include BlockParser
 
-      # @!attribute [r] rule_definitions
-      #   @return [Parslet::Atoms::Entity] toplevel element list
-      rule(:rule_definitions) {
-        (empty_lines? >> space? >> toplevel_element >> empty_lines?).repeat
-      }
-
-      # @!attribute [r] toplevel_element
-      #   @return [Parslet::Atoms::Entity] toplevel element
-      #   @example
-      #     # document toplevel assignment
-      #     $X := 1
-      #   @example
-      #     # define rule
-      #     Rule Main
-      #       input '*.txt'
-      #       ...
-      #     Flow
-      #       rule SubRule
-      #       ...
-      #     End
-      #   @example
-      #     # you can write any expressions in toplevel but it is ignored
-      #     1 + 1
-      rule(:toplevel_element) {
-        rule_definition |
-        assignment |
-        expr
-      }
-
       # @!attribute [r] rule_definition
       #   @return [Parslet::Atoms::Entity] rule definition
       #   @example
@@ -50,7 +21,8 @@ module Pione
       #       ...
       #     End
       rule(:rule_definition) {
-        ( rule_header >>
+        ( space? >>
+          rule_header >>
           rule_conditions >>
           block.as(:block)
         ).as(:rule_definition)