pione 0.1.3 → 0.1.4

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

@@ -18,13 +18,17 @@ module Pione
         inputs = Naming::InputLine.values(conditions)
         outputs = Naming::OutputLine.values(conditions)
         params = Parameters.merge(*Naming::ParamLine.values(conditions))
-        features = Feature::AndExpr.new(*Naming::FeatureLine.values(conditions))
-        condition = RuleCondition.new(inputs, outputs, params, features, TicketExpr.empty, TicketExpr.empty)
+        features = Feature.empty if Naming::FeatureLine.values(conditions).empty?
+        features = Feature::AndExpr.new(*Naming::FeatureLine.values(conditions)) unless features
+        constraints = Constraints.new(Naming::ConstraintLine.values(conditions))
+        condition = RuleCondition.new(inputs, outputs, params: params, features: features, constraints: constraints)
         case block
         when ActionBlock
           ActionRule
         when FlowBlock
           FlowRule
+        when EmptyBlock
+          EmptyRule
         end.new(rule_expr, condition, block)
       }
 
@@ -34,15 +38,15 @@ module Pione
         Naming.InputLine(data_expr)
       }
 
-      # Transform +:output_line+ as Naming::OutputLine.
+      # Transform +output_line+ as Naming::OutputLine.
       rule(:output_line => simple(:data_expr)) {
         TypeDataExpr.check(data_expr)
         Naming.OutputLine(data_expr)
       }
 
-      # Transform +:param_line+ as Naming::ParamLine.
+      # Transform +param_line+ as Naming::ParamLine.
       rule(:param_line => simple(:param)) {
-        unless TypeAssignment.match(param) or TypeParameters.match(param)
+        unless TypeAssignment.match(param) or TypeParameters.match(param) or param.kind_of?(Variable)
           raise PioneModelTypeError.new(param, TypeAssignment)
         end
         Naming.ParamLine(param)
@@ -53,6 +57,14 @@ module Pione
         TypeFeature.check(feature)
         Naming.FeatureLine(feature)
       }
+
+      rule(:constraint_line => simple(:constraint)) {
+        Naming.ConstraintLine(constraint)
+      }
+
+      rule(:annotation_line => simple(:expr)) {
+        Naming.AnnotationLine(expr)
+      }
     end
   end
 end

data/lib/pione/tuple-space/data-finder.rb

@@ -61,10 +61,13 @@ module Pione
     # @return [DataFinderResult]
     #   query result
     def find_by_expr(expr)
-      expr = DataExpr.new(expr) if expr.kind_of?(String)
-      query = Tuple[:data].new(name: expr, domain: @domain)
+      name = expr
+      name = expr.first if expr.kind_of?(DataExprSequence)
+      name = DataExpr.new(expr) if expr.kind_of?(String)
+      query = Tuple[:data].new(name: name, domain: @domain)
       return tuple_space_server.read_all(query).map do |tuple|
-        tuple.update_criteria = expr.update_criteria; tuple
+        tuple.update_criteria = expr.update_criteria if expr.kind_of?(DataExprSequence)
+        tuple
       end
     end
 
@@ -99,14 +102,14 @@ module Pione
       # make combination results
       prefix = (type == :input ? "I" : "O")
       if head.all?
-        # case all modifier
+        # case all distribution
         new_vtable =
-          make_auto_variables_by_all(prefix, head, tuples, vtable, index)
+          make_auto_variables_by_all(type, prefix, head, tuples, vtable, index)
         unless tuples.empty?
           return find_rec_sub(type, tail, index, tuples, new_vtable)
         end
       else
-        # case each modifier
+        # case each distribution
         return tuples.map {|tuple|
           args = [prefix, head, tuple, vtable, index]
           new_vtable = make_auto_variables_by_each(*args)
@@ -129,62 +132,22 @@ module Pione
 
     # Make auto-variables by the name modified 'all'.
     # @api private
-    def make_auto_variables_by_all(prefix, expr, tuples, vtable, index)
+    def make_auto_variables_by_all(type, prefix, expr, tuples, vtable, index)
       # create new table
       new_vtable = VariableTable.new(vtable)
-      # variable
-      var = Variable.new(prefix)
-
-      # setup rule-io list
-      list = new_vtable.get(var)
-      list = RuleIOList.new unless list
-      io_list = RuleIOList.new
-      new_vtable.set!(var, list.add(io_list))
-
-      asterisk = []
-
-      # convert each tuples
-      tuples.each do |tuple, i|
-        asterisk << expr.match(tuple.name).to_a[1]
-
-        elt = RuleIOElement.new(PioneString.new(tuple.name))
-        elt.uri = PioneString.new(tuple.location.uri)
-        elt.match = PioneList.new(
-          *expr.match(tuple.name).to_a.map{|m| PioneString.new(m)}
-        )
-        io_list.add!(elt)
-      end
-
-      # set special variable if index equals 1
-      if prefix == 'I' && index == 1
-        new_vtable.set(Variable.new("*"), PioneString.new(asterisk.join(":")))
-      end
+      # set auto variables
+      new_vtable.make_io_auto_variables_by_all(type, prefix, expr, tuples, index)
 
       return new_vtable
     end
 
-    # Make auto-variables by the name modified 'each'.
+    # Make auto-variables by the name with 'each' distribution.
     # @api private
     def make_auto_variables_by_each(prefix, expr, tuple, vtable, index)
       # create new table
       new_vtable = VariableTable.new(vtable)
-      # variable
-      var = Variable.new(prefix)
-      # matched data
-      md = expr.match(tuple.name).to_a
-
-      # setup rule-io list
-      list = new_vtable.get(var)
-      list = RuleIOList.new unless list
-      elt = RuleIOElement.new(PioneString.new(tuple.name))
-      elt.uri = PioneString.new(tuple.location.uri.to_s)
-      elt.match = PioneList.new(*md.map{|d| PioneString.new(d)})
-      new_vtable.set!(var, list.add(elt))
-
-      # set special variable if index equals 1
-      if prefix == 'I' && index == 1
-        new_vtable.set(Variable.new("*"), PioneString.new(md[1]))
-      end
+      # set auto variables
+      new_vtable.make_io_auto_variables_by_each(prefix, expr, tuple, index)
 
       return new_vtable
     end

data/lib/pione/version.rb

@@ -1,4 +1,4 @@
 module Pione
   # version of pione
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/pione.rb

@@ -89,29 +89,19 @@ require 'pione/relay/relay-socket'
 require 'pione/relay/relay-client-db'
 require 'pione/relay/relay-account-db'
 
+# tuple-space
+require 'pione/tuple-space/tuple-space-server-interface'
+require 'pione/tuple-space/presence-notifier'
+require 'pione/tuple-space/tuple-space-server'
+require 'pione/tuple-space/tuple-space-receiver'
+require 'pione/tuple-space/tuple-space-provider'
+require 'pione/tuple-space/data-finder'
+
+# rule-handler
+require 'pione/rule-handler.rb'
+
 # model
-require 'pione/model/basic-model'
-require 'pione/model/undefined-value'
-require 'pione/model/list'
-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/rule'
-require 'pione/model/rule-io'
+require 'pione/model'
 
 # tuple
 require 'pione/tuple/basic-tuple'
@@ -135,15 +125,6 @@ require 'pione/tuple/rule-tuple'
 require 'pione/tuple/task-worker-resource-tuple'
 require 'pione/tuple/ticket-tuple'
 
-# tuple-space
-require 'pione/tuple-space/tuple-space-server-interface'
-require 'pione/tuple-space/presence-notifier'
-require 'pione/tuple-space/tuple-space-server'
-require 'pione/tuple-space/tuple-space-receiver'
-require 'pione/tuple-space/tuple-space-provider'
-require 'pione/tuple-space/data-finder'
-require 'pione/tuple-space/update-criteria'
-
 # parser
 require 'pione/parser/parslet-extension'
 require 'pione/parser/common-parser'
@@ -158,13 +139,6 @@ require 'pione/parser/document-parser'
 # transformer
 require 'pione/transformer'
 
-# rule-handler
-require 'pione/rule-handler/basic-handler'
-require 'pione/rule-handler/flow-handler'
-require 'pione/rule-handler/action-handler'
-require 'pione/rule-handler/root-handler'
-require 'pione/rule-handler/system-handler'
-
 # agent
 require 'pione/agent/basic-agent'
 require 'pione/agent/tuple-space-client'

data/test/agent/spec_task-worker.rb

@@ -70,7 +70,7 @@ describe 'Pione::Agent::TaskWorker' do
         ID.domain_id("main", "Test", [], Parameters.empty),
         []
       )
-      rule = Tuple[:rule].new('&main:Test', :fake_content, :known)
+      rule = Tuple[:rule].new('&main:Test', :fake_content)
       write(rule)
       task2, result = @worker.__send__(:transit_to_rule_loading, task1)
       result.should == :fake_content
@@ -86,7 +86,7 @@ describe 'Pione::Agent::TaskWorker' do
         ID.domain_id("main", "Test", [], Parameters.empty),
         []
       )
-      rule = Tuple[:rule].new('&main:Test', :fake_content, :unknown)
+      rule = Tuple[:rule].new('&main:Test', :fake_content)
       write(rule)
       should.raise(Agent::TaskWorker::UnknownRuleError) do
         @worker.__send__(:transit_to_rule_loading, task)
@@ -109,11 +109,13 @@ describe 'Pione::Agent::TaskWorker' do
           [],
           [DataExpr.new('out.txt')],
           Parameters.empty,
-          Feature.empty
+          Feature.empty,
+          TicketExpr.empty,
+          TicketExpr.empty
         ),
         ActionBlock.new("expr 1 + 2 > out.txt")
       )
-      Pione.quiet_mode do
+      quiet_mode do
         task2, handler, result =
           @worker.__send__(:transit_to_task_executing, task1, rule)
         task2.should == task1
@@ -133,7 +135,7 @@ describe 'Pione::Agent::TaskWorker' do
       write(Tuple[:working].new(task1.domain, "test"))
       rule = FlowRule.new(
         RuleExpr.new(Package.new('main'), 'Test'),
-        RuleCondition.new([], [], Parameters.empty, Feature.empty),
+        RuleCondition.new([], [], Parameters.empty, Feature.empty, TicketExpr.empty, TicketExpr.empty),
         :dummy
       )
       handler1 = RuleHandler::FlowHandler.new(
@@ -159,7 +161,7 @@ describe 'Pione::Agent::TaskWorker' do
       write(Tuple[:working].new(task.domain, "test"))
       rule = FlowRule.new(
         RuleExpr.new(Package.new('main'), 'Test'),
-        RuleCondition.new([], [], Parameters.empty, Feature.empty),
+        RuleCondition.new([], [], Parameters.empty, Feature.empty, TicketExpr.empty, TicketExpr.empty),
         :dummy
       )
       handler = RuleHandler::FlowHandler.new(
@@ -177,7 +179,7 @@ describe 'Pione::Agent::TaskWorker' do
       DRb.start_service
       create_remote_tuple_space_server
 
-      Agent[:logger].start(tuple_space_server, File.open("out.txt", "w+"))
+      Agent[:logger].start(tuple_space_server, Location["out.txt"])
 
       # process info
       write(Tuple[:process_info].new('spec_task-worker', 'testid'))
@@ -188,9 +190,9 @@ describe 'Pione::Agent::TaskWorker' do
       @worker3 = Agent[:task_worker].start(tuple_space_server)
 
       # make a task
-      @uri = "local:/tmp/1.a"
-      Resource[@uri].create "abc"
-      @data = Tuple[:data].new(domain: 'test', name: "1.a", uri: @uri)
+      @location = Location[Temppath.create]
+      @location.create "abc"
+      @data = Tuple[:data].new(domain: 'test', name: "1.a", location: @location)
       @task1 = Tuple[:task].new(
         "&main:test",
         [@data],
@@ -212,8 +214,7 @@ describe 'Pione::Agent::TaskWorker' do
       write(
         Tuple[:rule].new(
           rule_path: "&main:test",
-          content: doc["&main:test"],
-          status: :known
+          content: doc["&main:test"]
         )
       )
 

data/test/model/spec_assignment.rb

@@ -28,9 +28,9 @@ describe 'Model::Assignment' do
     vtable = VariableTable.new
     Assignment.new(
       Variable.new("X"),
-      Message.new("as_string", 1.to_pione)
+      Message.new("as_string", IntegerSequence.new([1.to_pione]))
     ).eval(vtable)
-    Variable.new("X").eval(vtable).should == "1".to_pione
+    Variable.new("X").eval(vtable).should == StringSequence.new(["1".to_pione])
   end
 
   it 'should update variable table' do

data/test/model/spec_binary-operator.rb

@@ -4,26 +4,26 @@ describe 'Model::BinaryOperator' do
   before do
     @a = Model::BinaryOperator.new(
       "%",
-      Model::PioneInteger.new(5),
-      Model::PioneInteger.new(2)
+      Model::IntegerSequence.new([Model::PioneInteger.new(5)]),
+      Model::IntegerSequence.new([Model::PioneInteger.new(2)])
     )
     @b = Model::BinaryOperator.new(
       "+",
-      Model::PioneString.new("abc"),
-      Model::PioneString.new("def")
+      Model::StringSequence.new([Model::PioneString.new("abc")]),
+      Model::StringSequence.new([Model::PioneString.new("def")])
     )
   end
 
   it 'should equal' do
     @a.should == Model::BinaryOperator.new(
       "%",
-      Model::PioneInteger.new(5),
-      Model::PioneInteger.new(2)
+      Model::IntegerSequence.new([Model::PioneInteger.new(5)]),
+      Model::IntegerSequence.new([Model::PioneInteger.new(2)])
     )
     @b.should == Model::BinaryOperator.new(
       "+",
-      Model::PioneString.new("abc"),
-      Model::PioneString.new("def")
+      Model::StringSequence.new([Model::PioneString.new("abc")]),
+      Model::StringSequence.new([Model::PioneString.new("def")])
     )
   end
 
@@ -33,7 +33,7 @@ describe 'Model::BinaryOperator' do
 
   it 'should send message' do
     vtable = VariableTable.new
-    @a.eval(vtable).should == Model::PioneInteger.new(1)
-    @b.eval(vtable).should == Model::PioneString.new("abcdef")
+    @a.eval(vtable).should == Model::IntegerSequence.new([Model::PioneInteger.new(1)])
+    @b.eval(vtable).should == Model::StringSequence.new([Model::PioneString.new("abcdef")])
   end
 end

data/test/model/spec_block.rb

@@ -14,9 +14,9 @@ describe 'Model::ActionBlock' do
   it 'should expand variables' do
     block = ActionBlock.new("{$var1} {$var2} {$var3}")
     vtable = VariableTable.new
-    vtable.set(Variable.new("var1"), "a".to_pione)
-    vtable.set(Variable.new("var2"), "b".to_pione)
-    vtable.set(Variable.new("var3"), "c".to_pione)
+    vtable.set(Variable.new("var1"), PioneString.new("a").to_seq)
+    vtable.set(Variable.new("var2"), PioneString.new("b").to_seq)
+    vtable.set(Variable.new("var3"), PioneString.new("c").to_seq)
     block.eval(vtable).should == ActionBlock.new("a b c")
   end
 end
@@ -60,14 +60,14 @@ describe 'Model::FlowBlock' do
       Assignment.new(Variable.new("Y"), Variable.new("Z")),
       ConditionalBlock.new(
         Variable.new("A"),
-        { PioneBoolean.true =>
-          FlowBlock.new(Assignment.new(Variable.new("Z"), 1.to_pione)),
+        { BooleanSequence.new([PioneBoolean.true]) =>
+          FlowBlock.new(Assignment.new(Variable.new("Z"), IntegerSequence.new([1.to_pione]))),
         }
       ),
-      Assignment.new(Variable.new("A"), PioneBoolean.true),
+      Assignment.new(Variable.new("A"), BooleanSequence.new([PioneBoolean.true])),
       ConditionalBlock.new(
-        Message.new("==", Variable.new("Z"), 1.to_pione),
-        { PioneBoolean.true => FlowBlock.new(z) }
+        Message.new("==", Variable.new("Z"), IntegerSequence.new([1.to_pione])),
+        { BooleanSequence.new([PioneBoolean.true]) => FlowBlock.new(z) }
       ),
       x,
       y

data/test/model/spec_boolean.rb

@@ -40,76 +40,5 @@ describe 'Model::PioneBoolean' do
     PioneBoolean.or(PioneBoolean.false, PioneBoolean.false).should.false
   end
 
-  describe 'pione method ==' do
-    it 'should true' do
-      @true.call_pione_method("==", PioneBoolean.true).should.true
-      @false.call_pione_method("==", PioneBoolean.false).should.true
-    end
-
-    it 'should false' do
-      @true.call_pione_method("==", PioneBoolean.false).should.not.true
-      @false.call_pione_method("==", PioneBoolean.true).should.not.true
-    end
-
-    it 'should raise type error' do
-      should.raise(PioneModelTypeError) do
-        @true.call_pione_method("==", PioneInteger.new(1))
-      end
-    end
-  end
-
-  describe 'pione method !=' do
-    it 'should true' do
-      @true.call_pione_method("!=", PioneBoolean.false).should.true
-      @false.call_pione_method("!=", PioneBoolean.true).should.true
-    end
-
-    it 'should false' do
-      @true.call_pione_method("!=", PioneBoolean.true).should.not.true
-      @false.call_pione_method("!=", PioneBoolean.false).should.not.true
-    end
-
-    it 'should raise type error' do
-      should.raise(PioneModelTypeError) do
-        @true.call_pione_method("!=", PioneInteger.new(1))
-      end
-    end
-  end
-
-  describe 'pione method &&' do
-    it 'should get truth' do
-      @true.call_pione_method("&&", @true).should.true
-      @true.call_pione_method("&&", @false).should.false
-      @false.call_pione_method("&&", @true).should.false
-      @false.call_pione_method("&&", @false).should.false
-    end
-
-    it 'should raise type error' do
-      should.raise(PioneModelTypeError) do
-        @true.call_pione_method("&&", PioneInteger.new(1))
-      end
-    end
-  end
-
-  describe 'pione method ||' do
-    it 'should get truth' do
-      @true.call_pione_method("||", @true).should.true
-      @true.call_pione_method("||", @false).should.true
-      @false.call_pione_method("||", @true).should.true
-      @false.call_pione_method("||", @false).should.false
-    end
-
-    it 'should raise type error' do
-      should.raise(PioneModelTypeError) do
-        @true.call_pione_method("||", PioneInteger.new(1))
-      end
-    end
-  end
-
-  describe 'pione method as_string' do
-    it 'should get string' do
-      @true.call_pione_method("as_string").should == PioneString.new("true")
-      @false.call_pione_method("as_string").should == PioneString.new("false")
-    end
-  end
+  test_pione_method("boolean")
 end

data/test/model/spec_boolean.yml

@@ -0,0 +1,134 @@
+# ==
+- true  : 'true == true'
+- false : 'true == false'
+- false : 'false == true'
+- true  : 'false == false'
+- false : 'true | true == true'
+- false : 'true | true == false'
+- false : 'true | false == true'
+- false : 'true | false == false'
+- false : 'false | true == true'
+- false : 'false | true == false'
+- false : 'false | false == true'
+- false : 'false | false == false'
+- false : 'true == true | true'
+- false : 'true == true | false'
+- false : 'true == false | true'
+- false : 'true == false | false'
+- false : 'false == true | true'
+- false : 'false == true | false'
+- false : 'false == false | true'
+- false : 'false == false | false'
+- true  : 'true | true == true | true'
+- false : 'true | true == true | false'
+- false : 'true | true == false | true'
+- false : 'true | true == false | false'
+- false : 'true | false == true | true'
+- true  : 'true | false == true | false'
+- false : 'true | false == false | true'
+- false : 'true | false == false | false'
+- false : 'false | true == true | true'
+- false : 'false | true == true | false'
+- true  : 'false | true == false | true'
+- false : 'false | true == false | false'
+- false : 'false | false == true | true'
+- false : 'false | false == true | false'
+- false : 'false | false == false | true'
+- true  : 'false | false == false | false'
+
+# as_string, str
+- '"true"' : 'true.as_string'
+- '"false"' : 'false.as_string'
+- '"true"' : 'true.str'
+- '"false"' : 'false.str'
+- '"true" | "true"' : '(true | true).str'
+- '"true" | "false"' : '(true | false).str'
+- '"false" | "true"' : '(false | true).str'
+- '"false" | "false"' : '(false | false).str'
+
+# as_data_expr, d
+# - "'true'" : 'true.as_data_expr'
+# - "'false'" : 'false.as_data_expr'
+# - "'true'" : 'true.d'
+# - "'false'" : 'false.d'
+# - "'true' | 'true'" : '(true | true).d'
+# - "'true' | 'false'" : '(true | false).d'
+# - "'false' | 'true'" : '(false | true).d'
+# - "'false' | 'false'" : '(false | false).d'
+
+# not
+- false : 'true.not'
+- true  : 'false.not'
+- true  : '(true | true).not == false | false'
+- true  : '(true | false).not == false | true'
+- true  : '(false | true).not == true | false'
+- true  : '(false | false).not == true | true'
+
+# and
+- true : 'true and true == true'
+- true : 'true and false == false'
+- true : 'false and true == false'
+- true : 'false and false == false'
+- true : '(true | true) and true == true | true'
+- true : '(true | true) and false == false | false'
+- true : '(true | false) and true == true | false'
+- true : '(true | false) and false == false | false'
+- true : '(false | true) and true == false | true'
+- true : '(false | true) and false == false | false'
+- true : '(false | false) and true == false | false'
+- true : '(false | false) and false == false | false'
+- true : 'true and (true | true) == true | true'
+- true : 'true and (true | false) == true | false'
+- true : 'true and (false | true) == false | true'
+- true : 'true and (false | false) == false | false'
+- true : 'false and (true | true) == false | false'
+- true : 'false and (true | false) == false | false'
+- true : 'false and (false | true) == false | false'
+- true : 'false and (false | false) == false | false'
+
+# or
+- true : 'true or true == true'
+- true : 'true or false == true'
+- true : 'false or true == true'
+- true : 'false or false == false'
+- true : '(true | true) or true == true | true'
+- true : '(true | true) or false == true | true'
+- true : '(true | false) or true == true | true'
+- true : '(true | false) or false == true | false'
+- true : '(false | true) or true == true | true'
+- true : '(false | true) or false == false | true'
+- true : '(false | false) or true == true | true'
+- true : '(false | false) or false == false | false'
+- true : 'true or (true | true) == true | true'
+- true : 'true or (true | false) == true | true'
+- true : 'true or (false | true) == true | true'
+- true : 'true or (false | false) == true | true'
+- true : 'false or (true | true) == true | true'
+- true : 'false or (true | false) == true | false'
+- true : 'false or (false | true) == false | true'
+- true : 'false or (false | false) == false | false'
+
+# every?
+- true : 'true.every?'
+- false : 'false.every?'
+- true : '(true | true).every?'
+- false : '(true | false).every?'
+- false : '(false | true).every?'
+- false : '(false | false).every?'
+
+# any?
+- true : 'true.any?'
+- false : 'false.any?'
+- true : '(true | true).any?'
+- true : '(true | false).any?'
+- true : '(false | true).any?'
+- false : '(false | false).any?'
+
+# one?
+- true : 'true.one?'
+- false : 'false.one?'
+- false : '(true | true).one?'
+- true : '(true | false).one?'
+- true : '(false | true).one?'
+- false : '(false | false).one?'
+