pione 0.1.3 → 0.1.4

data/lib/pione/model.rb

@@ -0,0 +1,34 @@
+# load all models
+require 'pione/model/type'
+require 'pione/model/pione-method'
+require 'pione/model/basic-model'
+require 'pione/model/sequence'
+require 'pione/model/ordinal-sequence'
+require 'pione/model/keyed-sequence'
+require 'pione/model/boolean'
+require 'pione/model/integer'
+require 'pione/model/float'
+require 'pione/model/string'
+require 'pione/model/feature-expr'
+require 'pione/model/variable'
+require 'pione/model/variable-table'
+require 'pione/model/data-expr'
+require 'pione/model/parameters'
+require 'pione/model/package'
+require 'pione/model/ticket-expr'
+require 'pione/model/rule-expr'
+require 'pione/model/binary-operator'
+require 'pione/model/message'
+require 'pione/model/call-rule'
+require 'pione/model/assignment'
+require 'pione/model/block'
+require 'pione/model/constraints'
+require 'pione/model/rule'
+
+module Pione
+  # Model is a name space for all PIONE models.
+  module Model
+
+  end
+end
+

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

@@ -1,6 +1,6 @@
 module Pione
   module Parser
-    # BlockParser is a set of parser atoms for rule block.
+    # BlockParser is a set of parsers for rule block.
     module BlockParser
       include Parslet
       include SyntaxError
@@ -9,17 +9,23 @@ module Pione
       include ExprParser
       include FlowElementParser
 
-      # @!attribute [r] block
-      #   +block+ matches flow block or action block.
-      #   @return [Parslet::Atoms::Entity] +block+ atom
+      # @!method block
+      #   +block+ parser matches all blocks of PIONE.
+      #
+      #   @return [Parslet::Atoms::Entity]
+      #     +block+ parser
       rule(:block) {
         flow_block |
-        action_block
+        action_block |
+        empty_block |
+        syntax_error("block not found", [:block])
       }
 
-      # @!attribute [r] flow_block
-      #   +flow_block+ matches flow block.
-      #   @return [Parslet::Atoms::Entity] +flow_block+ atom
+      # @!method flow_block
+      #   +flow_block+ parser matches flow block.
+      #
+      #   @return [Parslet::Atoms::Entity]
+      #     +flow_block+ parser
       #   @example
       #     Flow
       #       rule A
@@ -36,9 +42,11 @@ module Pione
          ).as(:flow_block)
       }
 
-      # @!attribute [r] action_block
-      #   +action_block+ matches action block.
-      #   @return [Parslet::Atoms::Entity] +action_block+ atom
+      # @!method action_block
+      #   +action_block+ parser matches action block.
+      #
+      #   @return [Parslet::Atoms::Entity]
+      #     +action_block+ parser
       #   @example
       #     Action
       #       echo "abc" > out.txt
@@ -52,27 +60,43 @@ module Pione
         ).as(:action_block)
       }
 
-      # @!attribute [r] flow_block_begin_line
-      #   +flow_block_begin_line+ matches flow block heading.
-      #   @return [Parslet::Atoms::Entity] +flow_block_begin_line+ atom
+      # @!method empty_block
+      #   +empty_block+ parser matches empty block.
+      #   @return [Parslet::Atoms::Entity]
+      #     +empty_block+ parser
+      #   @example
+      #     End
+      rule(:empty_block) {
+        block_end_line.as(:empty_block)
+      }
+
+      # @!method flow_block_begin_line
+      #   +flow_block_begin_line+ parser matches flow block heading.
+      #
+      #   @return [Parslet::Atoms::Entity]
+      #     +flow_block_begin_line+ parser
       #   @example
       #     Flow
       rule(:flow_block_begin_line) {
         space? >> keyword_Flow >> str('-').repeat >> line_end
       }
 
-      # @!attribute [r] action_block_begin_line
-      #   +flow_block_begin_line+ matches action block heading.
-      #   @return [Parslet::Atoms::Entity] +action_block_begin_line+ atom
+      # @!method action_block_begin_line
+      #   +flow_block_begin_line+ parser matches action block heading.
+      #
+      #   @return [Parslet::Atoms::Entity]
+      #     +action_block_begin_line+ parser
       #   @example
       #     Action
       rule(:action_block_begin_line) {
         space? >> keyword_Action.as(:key) >> str('-').repeat >> line_end
       }
 
-      # @!attribute [r] block_end_line
-      #   +block_end_line+ matches block end keyword.
-      #   @return [Parslet::Atoms::Entity] +block_end_line+ atom
+      # @!method block_end_line
+      #   +block_end_line+ parser matches block end keyword.
+      #
+      #   @return [Parslet::Atoms::Entity]
+      #     +block_end_line+ parser
       #   @example
       #     End
       rule(:block_end_line) {

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

@@ -79,7 +79,8 @@ module Pione
         :keyword_false => 'false',
         :keyword_and => 'and',
         :keyword_or => 'or',
-        :keyword_null => 'null'
+        :keyword_null => 'null',
+        :keyword_constraint => 'constraint'
       }
 
       # make keywords

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

@@ -56,7 +56,8 @@ module Pione
         param_block |
         param_line |
         assignment_line |
-        expr
+        expr_line |
+        annotation_line
       }
 
       #
@@ -130,6 +131,10 @@ module Pione
           line_end
         ).as(:require)
       }
+
+      rule(:expr_line) {
+        space? >> expr >> line_end
+      }
     end
   end
 end

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

@@ -140,7 +140,44 @@ module Pione
       #   @return [Parslet::Atoms::Entity] +expr_operator+ atom
       #   @example
       #     :=, ==, !=, >=, >, <=, <, &&, ||, +, -, *, /, %, or, and
-      rule(:expr_operator) {
+      # rule(:expr_operator) {
+      #   equals >> equals >> greater_than |
+      #   equals >> equals |
+      #   exclamation >> equals |
+      #   less_than >> equals |
+      #   less_than |
+      #   greater_than >> greater_than >> greater_than |
+      #   greater_than >> equals |
+      #   greater_than |
+      #   ampersand >> ampersand |
+      #   vbar >> vbar |
+      #   plus |
+      #   minus |
+      #   asterisk |
+      #   slash |
+      #   percent |
+      #   keyword_or |
+      #   keyword_and |
+      #   atmark |
+      #   vbar
+      # }
+
+      rule(:expr_operator_1) {
+        plus |
+        minus |
+        asterisk |
+        slash |
+        percent |
+        atmark |
+        (vbar >> vbar).absent? >> vbar |
+        keyword_or |
+        keyword_and |
+        (colon >> colon | colon >> equals).absent? >> colon
+      }
+
+      rule(:expr_operator_2) {
+        equals >> equals >> equals |
+        exclamation >> equals >> equals |
         equals >> equals >> greater_than |
         equals >> equals |
         exclamation >> equals |
@@ -150,14 +187,7 @@ module Pione
         greater_than >> equals |
         greater_than |
         ampersand >> ampersand |
-        vbar >> vbar |
-        plus |
-        minus |
-        asterisk |
-        slash |
-        percent |
-        keyword_or |
-        keyword_and
+        vbar >> vbar
       }
 
       # @!attribute [r] expr_operator_application
@@ -166,11 +196,27 @@ module Pione
       #   @example
       #     X + X
       rule(:expr_operator_application) {
+        expr_operator_application_2 |
+        expr_operator_application_1
+      }
+
+      rule(:expr_operator_application_1) {
         ( expr_element.as(:left) >>
           pad? >>
-          expr_operator.as(:operator) >>
+          expr_operator_1.as(:operator) >>
+          pad? >>
+          ((expr_operator_application_1 | expr_element).as(:right) |
+            syntax_error("the right hand of operator application should be expr", [:expr]))
+        ).as(:expr_operator_application)
+      }
+
+      rule(:expr_operator_application_2) {
+        ((expr_operator_application_1 | expr_element).as(:left) >>
+          pad? >>
+          expr_operator_2.as(:operator) >>
           pad? >>
-          expr.as(:right)
+          ( expr.as(:right) |
+            syntax_error("the right hand of operator application should be expr", [:expr]))
         ).as(:expr_operator_application)
       }
 

data/lib/pione/parser/flow-element-parser.rb

@@ -64,7 +64,7 @@ module Pione
         ( if_block_begin >>
           flow_element.repeat.as(:if_true_elements) >>
           else_block.maybe.as(:if_else_block) >>
-          conditional_block_end
+          (conditional_block_end | syntax_error("keyword 'end' not found", [:end]))
         ).as(:if_block)
       }
 
@@ -77,7 +77,7 @@ module Pione
         space? >>
         keyword_if >>
         space? >>
-        expr.as(:condition) >>
+        (expr.as(:condition) | syntax_error("condition not found", [:expr])) >>
         line_end
       }
 

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

@@ -64,7 +64,9 @@ module Pione
         input_line |
         output_line |
         param_line |
-        feature_line
+        feature_line |
+        constraint_line |
+        annotation_line
       }
 
       #
@@ -130,6 +132,26 @@ module Pione
           line_end
         ).as(:feature_line)
       }
+
+      rule(:constraint_line) {
+        ( space? >>
+          keyword_constraint >>
+          space? >>
+          ( expr.as(:expr) |
+            syntax_error("it should be expr", :expr)
+          ) >>
+          line_end
+        ).as(:constraint_line)
+      }
+
+      rule(:annotation_line) {
+        ( space? >>
+          atmark >>
+          space? >>
+          ( expr.as(:expr) | syntax_error("it should be expr", :expr)) >>
+          line_end
+        ).as(:annotation_line)
+      }
     end
   end
 end

data/lib/pione/patch/rinda-patch.rb

@@ -235,11 +235,7 @@ module Rinda
       # @return [void]
       def add(tuple)
         prepare_table(domain(tuple))
-        unless @bin[domain(tuple)][name(tuple)]
-          @bin[domain(tuple)][name(tuple)] = tuple
-        else
-          raise RedundantTupleError.new(tuple.value)
-        end
+        @bin[domain(tuple)][name(tuple)] = tuple
       end
 
       def delete(tuple)

data/lib/pione/rule-handler/action-handler.rb

@@ -60,8 +60,8 @@ module Pione
       def make_working_directory
         # build directory path
         dirname = ID.domain_id(
-          @rule.expr.package.name,
-          @rule.expr.name,
+          @rule.rule_expr.package.name,
+          @rule.rule_expr.name,
           @inputs,
           @original_params
         )
@@ -137,13 +137,13 @@ module Pione
         list = Dir.entries(@working_directory)
         @rule.outputs.each_with_index do |output, i|
           output = output.eval(@variable_table)
-          case output.modifier
+          case output.distribution
           when :all
-            @outputs[i] = list.select{|name| output.match(name)}.map do |name|
+            @outputs[i] = list.select{|name| output.first.match(name)}.map do |name|
               make_output_tuple_with_time(name)
             end
           when :each
-            if name = list.find {|name| output.match(name)}
+            if name = list.find {|name| output.first.match(name)}
               @outputs[i] = make_output_tuple_with_time(name)
             end
           end

data/lib/pione/rule-handler/basic-handler.rb

@@ -76,7 +76,7 @@ module Pione
 
         # build rule process record
         @rule_process_record = Log::RuleProcessRecord.new.tap do |record|
-          record.name = "&%s:%s" % [@rule.expr.package.name, @rule.expr.name]
+          record.name = "&%s:%s" % [@rule.rule_expr.package.name, @rule.rule_expr.name]
           record.rule_type = @rule.rule_type
           record.caller = caller.split("_").first.tap do |dname|
             if dname.include?("-")
@@ -91,7 +91,7 @@ module Pione
         # build task process record
         @task_process_record = Log::TaskProcessRecord.new.tap do |record|
           record.name = handler_digest
-          record.rule_name = "&%s:%s" % [@rule.expr.package.name, @rule.expr.name]
+          record.rule_name = "&%s:%s" % [@rule.rule_expr.package.name, @rule.rule_expr.name]
           record.rule_type = @rule.rule_type
           record.inputs = @inputs.flatten.map{|input| input.name}.join(",")
           record.parameters = @params.textize
@@ -107,7 +107,7 @@ module Pione
       # @return [void]
       def setenv(env)
         env.each do |key, value|
-          @variable_table.set(Variable.new("ENV_" + key), PioneString.new(value))
+          # @variable_table.set(Variable.new("ENV_" + key), PioneString.new(value))
         end
       end
 
@@ -205,8 +205,8 @@ module Pione
       # Return the domain.
       def get_handling_domain(opts)
         opts[:domain] || ID.domain_id(
-          @rule.expr.package.name,
-          @rule.expr.name,
+          @rule.rule_expr.package.name,
+          @rule.rule_expr.name,
           @inputs,
           @original_params
         )
@@ -251,7 +251,8 @@ module Pione
       #   data name
       # @return [Tuple::DataTuple]
       #   data tuple
-      def make_output_tuple(name)
+      def make_output_tuple(expr)
+        name = expr.first.name
         location = make_output_location(name)
         Tuple[:data].new(name: name, domain: @domain, location: location, time: nil)
       end
@@ -263,7 +264,7 @@ module Pione
       def setup_variable_table
         @variable_table.make_input_auto_variables(@rule.inputs, @inputs)
         outputs = @rule.outputs.map {|expr| expr.eval(@variable_table) }
-        output_tuples = outputs.map {|expr| make_output_tuple(expr.name) }
+        output_tuples = outputs.map {|expr| make_output_tuple(expr) }
         @variable_table.make_output_auto_variables(outputs, output_tuples)
       end
 
@@ -285,6 +286,28 @@ module Pione
         ]
       end
 
+      # Find outputs from the domain.
+      #
+      # @return [void]
+      def find_outputs
+        tuples = read_all(Tuple[:data].new(domain: @domain))
+        @rule.outputs.each_with_index do |output, i|
+          output = output.eval(@variable_table)
+          case output.distribution
+          when :all
+            @outputs[i] = tuples.find_all {|data| output.match(data.name)}
+          when :each
+            # FIXME
+            @outputs[i] = tuples.find {|data| output.match(data.name)}
+          end
+          # touch operation
+          if output.touch? and @outputs[i].nil?
+            location = @domain_location + output.name
+            location.create("") unless location.exist?
+            @outputs[i] = Tuple[:data].new(name: output.name, domain: @domain, location: location)
+          end
+        end
+      end
     end
   end
 end

data/lib/pione/rule-handler/empty-handler.rb

@@ -0,0 +1,14 @@
+module Pione
+  module RuleHandler
+    class EmptyHandler < BasicHandler
+      def self.message_name
+        "Empty"
+      end
+
+      def execute
+        find_outputs
+        return @outputs
+      end
+    end
+  end
+end