pione 0.4.2 → 0.5.0.alpha.1

data/test/lang/data/context-parser.yml

@@ -127,7 +127,18 @@ structural_context:
       # comment
       rule Test2
 
-rule_condition_context:
+flow_rule_condition_context:
+  valid:
+    - | # parameters without default values
+      param $X
+      basic param $Y
+      advanced param $Z
+    - | # parameters with default values
+      param $X := 1
+      basic param $Y := 2
+      advanced param $Z := 3
+
+action_rule_condition_context:
   valid:
     - | # parameters without default values
       param $X

data/test/lang/spec_pione-method.rb

@@ -35,12 +35,13 @@ describe "Pione::Lang::PioneMethod" do
   end
 
   it "should validate inputs" do
-    @method_1.validate_inputs(@int_1, []).should.be.false
-    @method_2.validate_inputs(@int_1, []).should.be.false
-    @method_2.validate_inputs(@int_1, [@str_1]).should.be.false
-    @method_2.validate_inputs(@int_1, [@int_2]).should.be.false
-    @method_2.validate_inputs(@int_1, [@int_2, @int_3, @str_1]).should.be.false
-    @method_3.validate_inputs(@int_1, [@int_2]).should.be.false
+    env = Lang::Environment.new
+    @method_1.validate_inputs(env, @int_1, []).should.be.false
+    @method_2.validate_inputs(env, @int_1, []).should.be.false
+    @method_2.validate_inputs(env, @int_1, [@str_1]).should.be.false
+    @method_2.validate_inputs(env, @int_1, [@int_2]).should.be.false
+    @method_2.validate_inputs(env, @int_1, [@int_2, @int_3, @str_1]).should.be.false
+    @method_3.validate_inputs(env, @int_1, [@int_2]).should.be.false
   end
 
   it "should call" do

data/test/literate-action/spec_handler.rb

@@ -5,24 +5,30 @@ TestHelper.scope do |this|
   this::D1 = this::DIR + "D1.md"
 
   describe Pione::LiterateAction::Handler do
-    it "should get a text" do
-      doc = LiterateAction::Document.load(this::D1)
-      doc.find("Name1").tap do |handler|
-        handler.textize(nil).chomp.should == "echo A"
+    def get_action(md, name, expected)
+      doc = LiterateAction::Document.load(md)
+      doc.find(name).tap do |handler|
+        handler.textize(nil).chomp.should == expected
       end
-      doc.find("Name2").tap do |handler|
-        handler.textize(nil).chomp.should == "puts \"A\"\nputs \"B\""
+    end
+
+    def execute_action(md, name, expected)
+      doc = LiterateAction::Document.load(md)
+      doc.find(name).tap do |handler|
+        out = Location[Temppath.create]
+        handler.execute(:out => out)
+        out.read.chomp.should == expected
       end
     end
 
+    it "should get a text" do
+      get_action(this::D1, "Name1", "echo A")
+      get_action(this::D1, "Name2", "puts \"A\"\nputs \"B\"")
+    end
+
     it "should execute" do
-      doc = LiterateAction::Document.load(this::D1)
-      doc.find("Name1").tap do |handler|
-        handler.execute(nil).chomp.should == "A"
-      end
-      doc.find("Name2").tap do |handler|
-        handler.execute(nil).chomp.should == "A\nB"
-      end
+      execute_action(this::D1, "Name1", "A")
+      execute_action(this::D1, "Name2", "A\nB")
     end
   end
 end

data/test/literate-action/{spec_parser.rb → spec_markdown-parser.rb}

@@ -1,8 +1,8 @@
 require 'pione/test-helper'
 
-describe Pione::LiterateAction::Parser do
+describe Pione::LiterateAction::MarkdownParser do
   it "should parse" do
-    parsed = LiterateAction::Parser.parse(Util::Indentation.cut(<<-ACTION))
+    parsed = LiterateAction::MarkdownParser.parse(Util::Indentation.cut(<<-ACTION))
       # Titile
 
       desc
@@ -37,7 +37,7 @@ describe Pione::LiterateAction::Parser do
   end
 
   it "should get a rule name without needless spaces" do
-    parsed = LiterateAction::Parser.parse(Util::Indentation.cut(<<-ACTION))
+    parsed = LiterateAction::MarkdownParser.parse(Util::Indentation.cut(<<-ACTION))
       # Title
 
       ##    Test    

data/test/log/spec_message-log-receiver.rb

@@ -7,7 +7,7 @@ describe Pione::Log::CUIMessageLogReceiver do
   end
 
   it "should receive a message" do
-    @receiver.receive("test message", 0, "TEST", :red)
+    @receiver.receive("test message", 0, "TEST", :red, nil)
     @io.string.chomp.should == "%s test message" % " TEST".color(:red)
   end
 end

data/test/package/spec_package-info.rb

@@ -6,7 +6,7 @@ describe Pione::Package::PackageInfo do
       name: "P1",
       editor: "yamaguchi",
       tag: "test",
-      parents: [Package::PackageInfo.new(name: "P2"), Package::PackageInfo.new(name: "P3")],
+      parents: [Package::ParentPackageInfo.new(name: "P2"), Package::ParentPackageInfo.new(name: "P3")],
       documents: ["D1.pione", "D2.pione", "D3.pione"],
       scenarios: ["s1", "s2", "s3"]
     )

data/test/pnml/spec_input-merge-complement.rb

@@ -7,6 +7,7 @@ TestHelper.scope do |this|
 
   describe Pione::PNML::InputMergeComplement do
     it "should name by `input merge` in simple case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::SIMPLE)
 
       # transition
@@ -14,13 +15,14 @@ TestHelper.scope do |this|
       place = net.find_all_places_by_target_id(transition_A.id).first
 
       # apply "input merge complement" rule
-      PNML::NetRewriter.new{|rules| rules << PNML::InputMergeComplement}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputMergeComplement}.rewrite(net, env)
 
       # test
       place.name.should == "<'i1' or 'i2' or 'i3'"
     end
 
     it "should name by `input merge` in complex case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::COMPLEX)
 
       # transition
@@ -30,7 +32,7 @@ TestHelper.scope do |this|
       place_LB = net.find_all_places_by_target_id(transition_B.id).first
 
       # apply "input merge complement" rule
-      PNML::NetRewriter.new{|rules| rules << PNML::InputMergeComplement}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputMergeComplement}.rewrite(net, env)
 
       # test
       place_LA.name.should == "<'i1' or 'i2' or 'i3'"

data/test/pnml/spec_input-parallelization-complement.rb

@@ -7,6 +7,7 @@ TestHelper.scope do |this|
 
   describe Pione::PNML::InputParallelizationComplement do
     it "should name by `input parallelization` in simple case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::SIMPLE)
 
       # elements
@@ -18,7 +19,7 @@ TestHelper.scope do |this|
       place_LC = net.find_all_places_by_target_id(transition_C.id).first
 
       # apply "input parallelization complement" rule
-      PNML::NetRewriter.new{|rules| rules << PNML::InputParallelizationComplement}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputParallelizationComplement}.rewrite(net, env)
 
       # test
       place_LA.name.should == "'i1'"
@@ -27,6 +28,7 @@ TestHelper.scope do |this|
     end
 
     it "should name by `input parallelization` in complex case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::COMPLEX)
 
       # elements
@@ -38,7 +40,7 @@ TestHelper.scope do |this|
       places_LC = net.find_all_places_by_target_id(transition_C.id)
 
       # apply "input parallelization complement" rule
-      PNML::NetRewriter.new{|rules| rules << PNML::InputParallelizationComplement}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputParallelizationComplement}.rewrite(net, env)
 
       # test
       places_LA.map{|place| place.name}.sort.should == ["'i1'", "'i2'"]

data/test/pnml/spec_input-reduction.rb

@@ -8,6 +8,7 @@ TestHelper.scope do |this|
 
   describe Pione::PNML::InputReduction do
     it "should reduce nodes by `input reduction` in simple case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::SIMPLE)
 
       # save net elements
@@ -17,7 +18,7 @@ TestHelper.scope do |this|
       arc_A_o1 = net.find_arc(transition_A.id, place_o1.id)
 
       # apply input reduction
-      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net, env)
 
       # test transitions
       net.transitions.size.should == 1
@@ -35,6 +36,7 @@ TestHelper.scope do |this|
     end
 
     it "should reduce nodes by `input reduction` in complex case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::COMPLEX)
 
       # save net elements
@@ -45,7 +47,7 @@ TestHelper.scope do |this|
       place_o1 = net.find_place_by_name(">'o1'")
 
       # apply output reduction
-      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net, env)
 
       # test transitions
       net.transitions.size.should == 1
@@ -67,6 +69,7 @@ TestHelper.scope do |this|
     end
 
     it "should reduce nodes by `input reduction` in long case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::LONG)
 
       # save net elements
@@ -76,7 +79,7 @@ TestHelper.scope do |this|
       arc_A_o1 = net.find_arc(transition_A.id, place_o1.id)
 
       # apply input reduction
-      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net, env)
 
       # test transitions
       net.transitions.size.should == 1
@@ -94,6 +97,7 @@ TestHelper.scope do |this|
     end
 
     it "should not reduce any nodes if there aren't output reducible nodes" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::DIR + "OutputReductionSimple.pnml")
 
       # save net elements
@@ -102,7 +106,7 @@ TestHelper.scope do |this|
       arcs = net.arcs.clone
 
       # apply input reduction
-      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::InputReduction}.rewrite(net, env)
 
       # test
       net.places.should == places

data/test/pnml/spec_invalid-arc-elimination.rb

@@ -2,6 +2,7 @@ require 'pione/test-helper'
 
 describe Pione::PNML::InvalidArcElimination do
   it "should eliminate invalid arcs" do
+    env = Lang::Environment.new
     net = PNML::Net.new
 
     # place and transition
@@ -24,7 +25,7 @@ describe Pione::PNML::InvalidArcElimination do
     net.arcs << PNML::Arc.new(net, net.generate_id, transition.id, transition.id)
 
     # apply "invalid arc elimination" rule
-    PNML::NetRewriter.new{|rules| rules << PNML::InvalidArcElimination}.rewrite(net)
+    PNML::NetRewriter.new{|rules| rules << PNML::InvalidArcElimination}.rewrite(net, env)
 
     # test
     net.arcs.size.should == 1

data/test/pnml/spec_io-expansion.rb

@@ -7,6 +7,7 @@ TestHelper.scope do |this|
 
   describe Pione::PNML::IOExpansion do
     it "should expand in simple case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::SIMPLE)
 
       # save elements
@@ -19,7 +20,7 @@ TestHelper.scope do |this|
       arc_p1_B = net.find_arc(place_p1.id, transition_B.id)
 
       # apply "input/output expansion"
-      PNML::NetRewriter.new{|rules| rules << PNML::IOExpansion}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::IOExpansion}.rewrite(net, env)
 
       # new elements
       places_p1= net.find_all_places_by_name("'p1'")
@@ -46,6 +47,7 @@ TestHelper.scope do |this|
     end
 
     it "should expand in complex case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::COMPLEX)
 
       # save elements
@@ -68,7 +70,7 @@ TestHelper.scope do |this|
       arc_p2_E = net.find_arc(place_p2.id, transition_E.id)
 
       # apply "input/output expansion"
-      PNML::NetRewriter.new{|rules| rules << PNML::IOExpansion}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::IOExpansion}.rewrite(net, env)
 
       # test the net
       net.should.valid

data/test/pnml/spec_isolated-element-elimination.rb

@@ -5,10 +5,11 @@ TestHelper.scope do |this|
 
   describe Pione::PNML::IsolatedElementElimination do
     it "should elminate floating elements" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::DOC)
 
       # apply floating element elimination
-      PNML::NetRewriter.new{|rules| rules << PNML::IsolatedElementElimination}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::IsolatedElementElimination}.rewrite(net, env)
 
       # test
       net.find_transition_by_name("A").should.not.nil

data/test/pnml/spec_label-extractor.rb

@@ -0,0 +1,100 @@
+require 'pione/test-helper'
+
+describe Pione::PNML::LabelExtractor do
+  def extract(name, label, expected)
+    PNML::LabelExtractor.send(name, label).should == expected
+  end
+
+  it "should extract rule expressions" do
+    extract(:extract_rule_expr, "A", "A")
+    extract(:extract_rule_expr, "A # abc", "A")
+    extract(:extract_rule_expr, "A # a # b # c", "A")
+    extract(:extract_rule_expr, "A {X: 1}", "A {X: 1}")
+    extract(:extract_rule_expr, "extern A", "A")
+    extract(:extract_rule_expr, "extern A {X: 1}", "A {X: 1}")
+  end
+
+  it "sohuld extract data expressions" do
+    extract(:extract_data_expr, "'*.a'", "'*.a'")
+    extract(:extract_data_expr, "'*.a' # abc", "'*.a'")
+    extract(:extract_data_expr, "'#.a' # abc", "'#.a'")
+    extract(:extract_data_expr, "'*.a' # a # b # c", "'*.a'")
+    extract(:extract_data_expr, "< '*.a'", "'*.a'")
+    extract(:extract_data_expr, "< '*.a' # abc", "'*.a'")
+    extract(:extract_data_expr, "> '*.a'", "'*.a'")
+    extract(:extract_data_expr, "> '*.a' # abc", "'*.a'")
+  end
+
+  it "should extract param set expressions" do
+    { "{X: 1}" => "{X: 1}",
+      "{X: 1} # abc" => "{X: 1}",
+      "{X: 1, Y: 2, Z: 3}" => "{X: 1, Y: 2, Z: 3}",
+      "{X: 1, Y: 2, Z: 3} # abc" => "{X: 1, Y: 2, Z: 3}"
+    }.each do |label, expr|
+      PNML::LabelExtractor.extract_param_set(label).should == expr
+    end
+  end
+
+  it "should extract ticket expressions" do
+    { "<T>" => "<T>",
+      "<T> # abc" => "<T>"
+    }.each do |label, expr|
+      PNML::LabelExtractor.extract_ticket(label).should == expr
+    end
+  end
+
+  it "should extract feature expressions" do
+    { "+X" => "+X",
+      "-X" => "-X",
+      "!X" => "!X",
+      "?X" => "?X",
+      "+X # abc" => "+X",
+      "-X # abc" => "-X",
+      "!X # abc" => "!X",
+      "?X # abc" => "?X",
+    }.each do |label, expr|
+      PNML::LabelExtractor.extract_feature(label).should == expr
+    end
+  end
+
+  it "should extract parameter sentences" do
+    { "param $X" => "param $X",
+      "param $X := 1" => "param $X := 1",
+      "basic param $X" => "basic param $X",
+      "advanced param $X" => "advanced param $X",
+      "param $X # abc" => "param $X",
+      "param $X := 1 # abc" => "param $X := 1",
+    }.each do |label, expr|
+      PNML::LabelExtractor.extract_param_sentence(label).should == expr
+    end
+  end
+
+  it "should extract feature sentences" do
+    extract(:extract_feature_sentence, "feature +X", "feature +X")
+    extract(:extract_feature_sentence, "feature -X", "feature -X")
+    extract(:extract_feature_sentence, "feature !X", "feature !X")
+    extract(:extract_feature_sentence, "feature ?X", "feature ?X")
+    extract(:extract_feature_sentence, "feature +X # abc", "feature +X")
+    extract(:extract_feature_sentence, "feature -X # abc", "feature -X")
+    extract(:extract_feature_sentence, "feature !X # abc", "feature !X")
+    extract(:extract_feature_sentence, "feature ?X # abc", "feature ?X")
+  end
+
+  it "should extract variable binding sentences" do
+    extract(:extract_variable_binding, "$X := 1", "$X := 1")
+    extract(:extract_variable_binding, "$X := 1 # abc", "$X := 1")
+    extract(:extract_variable_binding, '$X := "# abc" # abc', '$X := "# abc"')
+  end
+
+  it "should extract priority" do
+    { "'*.a' #1" => 1,
+      "'*.a' #2" => 2,
+      "'*.a' #3" => 3,
+      "'*.a' #1 # abc" => 1,
+      "'#1' #1000" => 1000,
+      "'*.a'" => nil,
+    }.each do |label, priority|
+      PNML::LabelExtractor.extract_priority(label).should == priority
+    end
+  end
+end

data/test/pnml/spec_output-decomposition-complement.rb

@@ -7,6 +7,7 @@ TestHelper.scope do |this|
 
   describe Pione::PNML::OutputDecompositionComplement do
     it "should complement the name of source place in simple case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::SIMPLE)
 
       # elements
@@ -14,13 +15,14 @@ TestHelper.scope do |this|
       place_RA = net.find_all_places_by_source_id(transition_A.id).first
 
       # apply "output decomposition complement" rule
-      PNML::NetRewriter.new{|rules| rules << PNML::OutputDecompositionComplement}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::OutputDecompositionComplement}.rewrite(net, env)
 
       # test
       place_RA.name.should == ">'o1' or 'o2' or 'o3'"
     end
 
     it "should complement the name of source place in complex case" do
+      env = Lang::Environment.new
       net = PNML::Reader.read(this::COMPLEX)
 
       # elements
@@ -30,7 +32,7 @@ TestHelper.scope do |this|
       place_RB = net.find_all_places_by_source_id(transition_B.id).first
 
       # apply "output decomposition complement" rule
-      PNML::NetRewriter.new{|rules| rules << PNML::OutputDecompositionComplement}.rewrite(net)
+      PNML::NetRewriter.new{|rules| rules << PNML::OutputDecompositionComplement}.rewrite(net, env)
 
       # test
       place_RA.name.should == ">'o1' or 'o2' or 'o3'"