pione 0.1.3 → 0.1.4

data/test/transformer/spec_rule-definition-transformer.rb

@@ -3,22 +3,31 @@ require_relative '../test-util'
 describe 'Pione::Transformer::RuleDefinitionTransformer' do
   transformer_spec("input_line", :input_line) do
     tc("input '*.txt'") do
-      Naming.InputLine(DataExpr.new("*.txt"))
+      Naming.InputLine(DataExpr.new("*.txt").to_seq)
     end
   end
 
   transformer_spec("output_line", :output_line) do
     tc("output '*.txt'") do
-      Naming.OutputLine(DataExpr.new("*.txt"))
+      Naming.OutputLine(DataExpr.new("*.txt").to_seq)
     end
   end
 
   transformer_spec("param_line", :param_line) do
     tc("param {var: 1}") do
-      Naming.ParamLine({"var" => 1}.to_params)
+      Naming.ParamLine(
+        Parameters.new(
+          {Variable.new("var") => IntegerSequence.new([PioneInteger.new(1)])}
+        )
+      )
     end
     tc("param {var1: 1, var2: 2}") do
-      Naming.ParamLine({"var1" => 1, "var2" => 2}.to_params)
+      Naming.ParamLine(
+        Parameters.new(
+          { Variable.new("var1") => IntegerSequence.new([PioneInteger.new(1)]),
+            Variable.new("var2") => IntegerSequence.new([PioneInteger.new(2)]) }
+        )
+      )
     end
   end
 
@@ -40,10 +49,8 @@ describe 'Pione::Transformer::RuleDefinitionTransformer' do
       ActionRule.new(
         RuleExpr.new(Package.new("main"), "Test"),
         RuleCondition.new(
-          [ DataExpr.new('*.a') ],
-          [ DataExpr.new('{$INPUT[1].MATCH[1]}.b') ],
-          Parameters.empty,
-          Feature.empty
+          [ DataExpr.new('*.a').to_seq ],
+          [ DataExpr.new('{$INPUT[1].MATCH[1]}.b').to_seq ]
         ),
         ActionBlock.new("        echo \"test\" > {$OUTPUT[1].NAME}\n")
       )
@@ -62,9 +69,7 @@ describe 'Pione::Transformer::RuleDefinitionTransformer' do
         RuleExpr.new(Package.new("main"), "Test"),
         RuleCondition.new(
           [ DataExpr.new('*.a') ],
-          [ DataExpr.new('{$INPUT[1].MATCH[1]}.b') ],
-          Parameters.empty,
-          Feature.empty
+          [ DataExpr.new('{$INPUT[1].MATCH[1]}.b') ]
         ),
         FlowBlock.new(
           CallRule.new(RuleExpr.new(Package.new("main"), "TestA")),
@@ -94,17 +99,20 @@ describe 'Pione::Transformer::RuleDefinitionTransformer' do
               DataExpr.new("*.txt"),
               DataExpr.new("summary.txt"))],
           [DataExpr.new("summary.txt")],
-          Parameters.new({Variable.new("ConvertCharSet") => PioneBoolean.true}),
-          Feature.empty
+          params: Parameters.new(
+            Variable.new("ConvertCharSet") =>
+            BooleanSequence.new([PioneBoolean.true])
+          )
         ),
         FlowBlock.new(
           ConditionalBlock.new(
             Variable.new("ConvertCharset"),
-            { PioneBoolean.true => FlowBlock.new(
+            { BooleanSequence.new([PioneBoolean.true]) =>
+              FlowBlock.new(
                 CallRule.new(Message.new(
                     "params",
                     RuleExpr.new(Package.new("main"), "NKF"),
-                    PioneString.new("-w")
+                    StringSequence.new([PioneString.new("-w")])
                 ))
             )}
           ),
@@ -117,6 +125,20 @@ describe 'Pione::Transformer::RuleDefinitionTransformer' do
         )
       )
     end
+
+    tc(<<-STRING) do
+      Rule EmptyRule
+        input '*.a'
+        output '*.a'.touch
+      End
+    STRING
+      rule_expr = RuleExpr.new(Package.new("main"), "EmptyRule")
+      condition = RuleCondition.new(
+        [DataExpr.new("*.a")], [Message.new("touch", DataExpr.new("*.a"))]
+      )
+      EmptyRule.new(rule_expr, condition, EmptyBlock.instance)
+    end
+
   end
 
   transformer_spec("rule_definitions", :toplevel_elements) do
@@ -140,9 +162,7 @@ describe 'Pione::Transformer::RuleDefinitionTransformer' do
           RuleExpr.new(Package.new("main"), "TestA"),
           RuleCondition.new(
             [ DataExpr.new("*.a") ],
-            [ DataExpr.new('{$INPUT[1].MATCH[1]}.b') ],
-            Parameters.empty,
-            Feature.empty
+            [ DataExpr.new('{$INPUT[1].MATCH[1]}.b') ]
           ),
           ActionBlock.new("      cat {$INPUT[1].NAME} > {$OUTPUT[1].NAME}\n")
         ),
@@ -150,9 +170,7 @@ describe 'Pione::Transformer::RuleDefinitionTransformer' do
           RuleExpr.new(Package.new("main"), "TestB"),
           RuleCondition.new(
             [ DataExpr.new("*.b") ],
-            [ DataExpr.new('{$INPUT[1].MATCH[1]}.c') ],
-            Parameters.empty,
-            Feature.empty
+            [ DataExpr.new('{$INPUT[1].MATCH[1]}.c') ]
           ),
           ActionBlock.new("      cat {$INPUT[1].NAME} > {$OUTPUT[1].NAME}\n")
         )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pione
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -328,6 +328,7 @@ files:
 - demo/public/demo.js
 - demo/public/index.html
 - demo/public/jquery-1.8.3.min.js
+- example/AbstractRule/AbstractRule.pione
 - example/CountChar/CountChar.pione
 - example/CountChar/misc/CountChar.rb
 - example/CountChar/text/aidokushono_insho.txt
@@ -351,6 +352,18 @@ files:
 - example/MakePair/data/3.i
 - example/MakePair/data/4.i
 - example/MakePair/data/5.i
+- example/OddSelector/OddSelector.pione
+- example/OddSelector/data/1.i
+- example/OddSelector/data/10.i
+- example/OddSelector/data/2.i
+- example/OddSelector/data/3.i
+- example/OddSelector/data/4.i
+- example/OddSelector/data/5.i
+- example/OddSelector/data/6.i
+- example/OddSelector/data/7.i
+- example/OddSelector/data/8.i
+- example/OddSelector/data/9.i
+- example/SequentialParameter/SequentialParameter.pione
 - example/SequentialProcess/SequentialProcess.pione
 - example/SieveOfEratosthenes/SieveOfEratosthenes.pione
 - example/SingleParticlesWithRef/Makefile
@@ -443,6 +456,7 @@ files:
 - example/SyntaxError/output_line_error.pione
 - example/SyntaxError/param_line_error.pione
 - example/SyntaxError/variable-binding-error.pione
+- example/Touch/Touch.pione
 - lib/pione.rb
 - lib/pione/agent/basic-agent.rb
 - lib/pione/agent/broker.rb
@@ -491,26 +505,32 @@ files:
 - lib/pione/log/process-log.rb
 - lib/pione/log/process-record.rb
 - lib/pione/log/xes-log.rb
+- lib/pione/model.rb
 - lib/pione/model/assignment.rb
 - lib/pione/model/basic-model.rb
 - lib/pione/model/binary-operator.rb
 - lib/pione/model/block.rb
 - lib/pione/model/boolean.rb
 - lib/pione/model/call-rule.rb
+- lib/pione/model/constraints.rb
 - lib/pione/model/data-expr.rb
 - lib/pione/model/feature-expr.rb
 - lib/pione/model/float.rb
 - lib/pione/model/integer.rb
+- lib/pione/model/keyed-sequence.rb
 - lib/pione/model/list.rb
 - lib/pione/model/message.rb
+- lib/pione/model/ordinal-sequence.rb
 - lib/pione/model/package.rb
 - lib/pione/model/parameters.rb
+- lib/pione/model/pione-method.rb
 - lib/pione/model/rule-expr.rb
 - lib/pione/model/rule-io.rb
 - lib/pione/model/rule.rb
+- lib/pione/model/sequence.rb
 - lib/pione/model/string.rb
 - lib/pione/model/ticket-expr.rb
-- lib/pione/model/undefined-value.rb
+- lib/pione/model/type.rb
 - lib/pione/model/variable-table.rb
 - lib/pione/model/variable.rb
 - lib/pione/option.rb
@@ -544,11 +564,14 @@ files:
 - lib/pione/relay/relay-socket.rb
 - lib/pione/relay/trampoline.rb
 - lib/pione/relay/transmitter-socket.rb
+- lib/pione/rule-handler.rb
 - lib/pione/rule-handler/action-handler.rb
 - lib/pione/rule-handler/basic-handler.rb
+- lib/pione/rule-handler/empty-handler.rb
 - lib/pione/rule-handler/flow-handler.rb
 - lib/pione/rule-handler/root-handler.rb
 - lib/pione/rule-handler/system-handler.rb
+- lib/pione/rule-handler/update-criteria.rb
 - lib/pione/system/common.rb
 - lib/pione/system/config.rb
 - lib/pione/system/document.rb
@@ -573,7 +596,6 @@ files:
 - lib/pione/tuple-space/tuple-space-receiver.rb
 - lib/pione/tuple-space/tuple-space-server-interface.rb
 - lib/pione/tuple-space/tuple-space-server.rb
-- lib/pione/tuple-space/update-criteria.rb
 - lib/pione/tuple/agent-tuple.rb
 - lib/pione/tuple/attribute-tuple.rb
 - lib/pione/tuple/base-location-tuple.rb
@@ -629,22 +651,32 @@ files:
 - test/model/spec_binary-operator.rb
 - test/model/spec_block.rb
 - test/model/spec_boolean.rb
+- test/model/spec_boolean.yml
 - test/model/spec_call-rule.rb
 - test/model/spec_data-expr.rb
 - test/model/spec_data-expr.yml
+- test/model/spec_data-expr_match.yml
 - test/model/spec_feature-expr.rb
 - test/model/spec_feature-expr.yml
+- test/model/spec_feature-expr_decide.yml
 - test/model/spec_float.rb
+- test/model/spec_float.yml
 - test/model/spec_integer.rb
-- test/model/spec_list.rb
+- test/model/spec_integer.yml
+- test/model/spec_keyed-sequence.rb
+- test/model/spec_keyed-sequence.yml
 - test/model/spec_message.rb
 - test/model/spec_package.rb
 - test/model/spec_parameters.rb
+- test/model/spec_pione-method.rb
 - test/model/spec_rule-expr.rb
-- test/model/spec_rule-io.rb
 - test/model/spec_rule.rb
+- test/model/spec_sequence.rb
+- test/model/spec_sequence.yml
 - test/model/spec_string.rb
+- test/model/spec_string.yml
 - test/model/spec_ticket-expr.rb
+- test/model/spec_ticket-expr.yml
 - test/model/spec_variable-table.rb
 - test/model/spec_variable.rb
 - test/parser/spec_block-parser.rb
@@ -666,13 +698,15 @@ files:
 - test/patch/spec_uri-patch.rb
 - test/rule-handler/spec_action-handler.rb
 - test/rule-handler/spec_flow-handler.rb
+- test/rule-handler/spec_update-criteria.pione
+- test/rule-handler/spec_update-criteria.rb
+- test/rule-handler/spec_update-criteria.yml
 - test/spec_common.rb
 - test/spec_data-finder.rb
 - test/spec_data-finder.yml
 - test/spec_identifier.rb
 - test/spec_log.rb
 - test/spec_object.rb
-- test/spec_update-criteria.rb
 - test/system/spec_document.rb
 - test/system/spec_file-cache.rb
 - test/test-util.rb
@@ -714,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1952349958224144310
+      hash: -3244176729533041699
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -739,22 +773,32 @@ test_files:
 - test/model/spec_binary-operator.rb
 - test/model/spec_block.rb
 - test/model/spec_boolean.rb
+- test/model/spec_boolean.yml
 - test/model/spec_call-rule.rb
 - test/model/spec_data-expr.rb
 - test/model/spec_data-expr.yml
+- test/model/spec_data-expr_match.yml
 - test/model/spec_feature-expr.rb
 - test/model/spec_feature-expr.yml
+- test/model/spec_feature-expr_decide.yml
 - test/model/spec_float.rb
+- test/model/spec_float.yml
 - test/model/spec_integer.rb
-- test/model/spec_list.rb
+- test/model/spec_integer.yml
+- test/model/spec_keyed-sequence.rb
+- test/model/spec_keyed-sequence.yml
 - test/model/spec_message.rb
 - test/model/spec_package.rb
 - test/model/spec_parameters.rb
+- test/model/spec_pione-method.rb
 - test/model/spec_rule-expr.rb
-- test/model/spec_rule-io.rb
 - test/model/spec_rule.rb
+- test/model/spec_sequence.rb
+- test/model/spec_sequence.yml
 - test/model/spec_string.rb
+- test/model/spec_string.yml
 - test/model/spec_ticket-expr.rb
+- test/model/spec_ticket-expr.yml
 - test/model/spec_variable-table.rb
 - test/model/spec_variable.rb
 - test/parser/spec_block-parser.rb
@@ -776,13 +820,15 @@ test_files:
 - test/patch/spec_uri-patch.rb
 - test/rule-handler/spec_action-handler.rb
 - test/rule-handler/spec_flow-handler.rb
+- test/rule-handler/spec_update-criteria.pione
+- test/rule-handler/spec_update-criteria.rb
+- test/rule-handler/spec_update-criteria.yml
 - test/spec_common.rb
 - test/spec_data-finder.rb
 - test/spec_data-finder.yml
 - test/spec_identifier.rb
 - test/spec_log.rb
 - test/spec_object.rb
-- test/spec_update-criteria.rb
 - test/system/spec_document.rb
 - test/system/spec_file-cache.rb
 - test/test-util.rb

data/lib/pione/model/undefined-value.rb

@@ -1,24 +0,0 @@
-module Pione
-  module Model
-    class UndefinedValue < BasicModel
-      set_pione_model_type TypeUndefinedValue
-
-      def ==(other)
-        return other.kind_of?(UndefinedValue)
-      end
-
-      alias :eql? :"=="
-
-      def hash
-        0
-      end
-
-      #
-      # pione model method
-      #
-      define_pione_method("as_string", [], TypeString) do |rec|
-        PioneString.new("undefined")
-      end
-    end
-  end
-end

data/lib/pione/tuple-space/update-criteria.rb

@@ -1,97 +0,0 @@
-# UpdateCriteria repesents rule application criteria.
-module Pione::UpdateCriteria
-  class << self
-    # Return true if we need to update because of no output rule.
-    # @param [Rule] rule
-    #   rule
-    # @param [Tuple::Data] inputs
-    #   input tuples
-    # @param [Tuple::Data] outputs
-    #   output tuples
-    # @param [VariableTable] vtable
-    #   variable table
-    # @return [Boolean]
-    #   true if outputs are empty
-    def no_output_rules?(rule, inputs, outputs, vtable)
-      rule.outputs.empty?
-    end
-
-    # Return true if we need to update because of lacking some ouputs.
-    # @param [Rule] rule
-    #   rule
-    # @param [Tuple::Data] inputs
-    #   input tuples
-    # @param [Tuple::Data] outputs
-    #   output tuples
-    # @param [VariableTable] vtable
-    #   variable table
-    # @return [Boolean]
-    #   true if some outputs lack
-    def not_exist_output?(rule, inputs, outputs, vtable)
-      return true if outputs.empty?
-      result = false
-      rule.outputs.each_with_index do |data_expr, i|
-        data_expr = data_expr.eval(vtable)
-        case data_expr.modifier
-        when :all
-          if outputs[i].select{|data| data_expr.match(data.name)}.empty?
-            result = true
-          end
-        when :each
-          unless data_expr.match(outputs[i].name)
-            result = true
-          end
-        end
-        break if result
-      end
-      return result
-    end
-
-    # Return true if we need to update because of newer inputs.
-    # @param [Rule] rule
-    #   rule
-    # @param [Tuple::Data] inputs
-    #   input tuples
-    # @param [Tuple::Data] outputs
-    #   output tuples
-    # @param [VariableTable] vtable
-    #   variable table
-    # @return [Boolean]
-    #   true if inputs are newer than outputs
-    def exist_newer_input?(rule, inputs, outputs, vtable)
-      # get output oldest time
-      output_oldest_time = outputs.flatten.select{|output| output.update_criteria == :care}.map{|output| output.time}.sort.last
-
-      # get input last time
-      input_last_time = inputs.flatten.map{|input| input.time}.sort.last
-
-      # criteria
-      return false unless output_oldest_time
-      return false unless input_last_time
-      return output_oldest_time < input_last_time
-    end
-
-    # Return true if we need to update.
-    #
-    # @param [Rule] rule
-    #   rule
-    # @param [Tuple::DataTuple] inputs
-    #   input tuples
-    # @param [Tuple::DataTuple] outputs
-    #   output tuples
-    # @param [VariableTable] vtable
-    #   variable table
-    # @return [Boolean]
-    #   true if inputs are newer than outputs
-    def satisfy?(rule, inputs, outputs, vtable)
-      CRITERIA.any?{|name| self.send(name, rule, inputs, outputs, vtable)}
-    end
-
-    # PIONE data update criteria
-    CRITERIA = [
-      :no_output_rules?,
-      :not_exist_output?,
-      :exist_newer_input?
-    ]
-  end
-end

data/test/model/spec_list.rb

@@ -1,26 +0,0 @@
-require_relative '../test-util'
-
-describe 'Model::List' do
-  it 'should be equal' do
-    x1 = PioneList.new
-    x2 = PioneList.new
-    x1.should.be.equal x2
-  end
-
-  it 'should be equal with elements' do
-    x1 = PioneList.new(PioneString.new("abc"), PioneString.new("def"))
-    x2 = PioneList.new(PioneString.new("abc"), PioneString.new("def"))
-    x1.should.be.equal x2
-  end
-
-  it 'should not be equal' do
-    x1 = PioneList.new(PioneString.new("abc"))
-    x2 = PioneList.new(PioneString.new("abc"), PioneString.new("def"))
-    x1.should.not.be.equal x2
-  end
-
-  it 'should have type [string]' do
-    list = PioneList.new(PioneString.new("abc"))
-    list.pione_model_type.should == TypeList.new(TypeString)
-  end
-end

data/test/model/spec_rule-io.rb

@@ -1,32 +0,0 @@
-require_relative '../test-util'
-
-describe 'Model::RuleIOElement' do
-  it 'should have name as a pione string' do
-    RuleIOElement.new("a.txt").name.should.kind_of?(PioneString)
-  end
-
-  it 'should have uri as a pione string' do
-    elt = RuleIOElement.new("a.txt")
-    elt.uri = "local:./test/a.txt"
-    elt.uri.should.kind_of?(PioneString)
-  end
-end
-
-describe 'Model::RuleIOList' do
-  it 'should add elements' do
-    list = RuleIOList.new
-    list.add(RuleIOElement.new("a.txt"))
-      .add(RuleIOElement.new("b.txt"))
-      .add(RuleIOElement.new("c.txt"))
-      .elements.size.should == 3
-    list.elements.size.should == 0
-  end
-
-  it 'should add elements destructively' do
-    list = RuleIOList.new
-    list.add! RuleIOElement.new("a.txt")
-    list.add! RuleIOElement.new("b.txt")
-    list.add! RuleIOElement.new("c.txt")
-    list.elements.size.should == 3
-  end
-end

data/test/spec_update-criteria.rb

@@ -1,83 +0,0 @@
-require_relative 'test-util'
-
-data = DataExpr.new('*')
-
-document = Document.parse(<<DOCUMENT)
-Rule NoOutputsRule
-  input '*'
-Action---
-
---End
-
-Rule OutputsRule
-  input '*.a'
-  output '*.b'
-Action
-cat {$INPUT[1]} > {$OUTPUT[1]}
-End
-DOCUMENT
-$no_outputs_rule = document["&main:NoOutputsRule"]
-$outputs_rule = document["&main:OutputsRule"]
-
-
-time1 = Time.now
-time2 = Time.now
-time3 = Time.now
-tuple1 = Tuple[:data].new('test', '1.a', nil, time1)
-tuple2 = Tuple[:data].new('test', '2.a', nil, time2)
-tuple3 = Tuple[:data].new('test', '3.b', nil, time2)
-
-UC = UpdateCriteria
-
-describe 'UpdateCriteria' do
-
-  # no output rules
-  describe 'criteria: no output rules' do
-    it 'should be updatable' do
-      inputs = [tuple1, tuple2]
-      outputs = [tuple3]
-
-      UC.no_output_rules?(
-        $no_outputs_rule,
-        inputs,
-        outputs,
-        VariableTable.new
-      ).should.true
-    end
-
-    it 'should not be updatable' do
-      inputs = [tuple1, tuple2]
-      outputs = [tuple3]
-      UC.no_output_rules?(
-        $outputs_rule,
-        inputs,
-        outputs,
-        VariableTable.new
-      ).should.false
-    end
-  end
-
-  describe 'criteria: not_exist_output' do
-    it 'should be updatable' do
-      inputs = [tuple1, tuple2]
-      outputs = []
-      UC.not_exist_output?(
-        $outputs_rule,
-        inputs,
-        outputs,
-        VariableTable.new
-      ).should.true
-    end
-
-    it 'should be not updatable' do
-      inputs = [tuple1]
-      outputs = [tuple3]
-      UC.not_exist_output?(
-        $outputs_rule,
-        inputs,
-        outputs,
-        VariableTable.new
-      ).should.false
-    end
-  end
-end