pione 0.5.0.alpha.2 → 0.5.0

data/example/WorkflowPatterns/41_ThreadMerge/A.pione

@@ -0,0 +1,24 @@
+Rule A
+  input '0.count'
+  input 'cont'
+  output 'o1'
+Flow
+  rule __A_A1_0__
+  rule A2
+End
+
+Rule __A_A1_0__
+  input '*.count'.all
+  input 'cont'
+  output '{$*.length}.count'
+Flow
+  rule A1
+End
+
+Rule A2
+  input 'cont'
+  input '*.count'.all
+  output 'o1'
+  output 'cont'.remove
+  constraint $*.length > 5
+End

data/example/WorkflowPatterns/41_ThreadMerge/A1.pione

@@ -0,0 +1,14 @@
+Rule A1
+  input 'cont'
+  input '*.count'.all
+  output '{$N}.count'
+Flow
+  rule A1Count
+End
+
+Rule A1Count
+  input 'cont'
+  input '*.count'.all
+  output '{$N}.count'
+  param $N := $*.length
+End

data/example/WorkflowPatterns/41_ThreadMerge/ThreadMerge.pione

@@ -1,43 +1,20 @@
-Rule Main
-  output 'o1'
+Rule ThreadMerge
 Flow
+  rule __ThreadMerge_A_0__
   rule Init
-  rule A
 End
 
-Rule Init
-  output 'i1'.touch
-  output 'cont'.touch
-  output '0.count'.touch
-End
-
-Rule A
+Rule __ThreadMerge_A_0__
   input 'i1'
   input 'cont'
   input '0.count'
   output 'o1'
 Flow
-  rule A1
-  rule A2
-End
-
-Rule A1
-  input '*.count'.all or null
-  input 'cont'
-  output '{$*.length}.count'
-Flow
-  rule A1Count {N: $*.length}
-End
-
-Rule A1Count
-  output '{$N}.count'.touch
-  param $N
+  rule A
 End
 
-Rule A2
-  input '*.count'.all
-  input 'cont'
-  output 'o1'.touch
-  output 'cont'.remove
-  constraint $*.length > 5
+Rule Init
+  output 'i1'
+  output 'cont'
+  output '0.count'
 End

data/example/WorkflowPatterns/41_ThreadMerge/pione-package.json

@@ -0,0 +1,21 @@
+{
+  "PackageName": "WCP41_ThreadMerge",
+  "Parents": [
+
+  ],
+  "Documents": [
+    "A.pione",
+    "A1.pione",
+    "Package.pione",
+    "ThreadMerge.pione"
+  ],
+  "Scenarios": [
+
+  ],
+  "Bins": [
+
+  ],
+  "Etcs": [
+
+  ]
+}

data/example/WorkflowPatterns/42_ThreadSplit/ThreadSplit.pione

@@ -1,16 +1,16 @@
-Rule Main
+Rule ThreadSplit
   output 'o1-*'.all
 Flow
-  rule Init
   rule A
-End
-
-Rule Init
-  output 'p1'.touch
+  rule Init
 End
 
 Rule A
   input 'p1'
-  output 'o1-{$N}'.touch
+  output 'o1-{$N}'
   param $N := 1.upto(5)
 End
+
+Rule Init
+  output 'p1'
+End

data/example/WorkflowPatterns/42_ThreadSplit/pione-package.json

@@ -0,0 +1,19 @@
+{
+  "PackageName": "WCP42_ThreadSplit",
+  "Parents": [
+
+  ],
+  "Documents": [
+    "Package.pione",
+    "ThreadSplit.pione"
+  ],
+  "Scenarios": [
+
+  ],
+  "Bins": [
+
+  ],
+  "Etcs": [
+
+  ]
+}

data/lib/pione/command/pione-package-build.rb

@@ -131,7 +131,7 @@ module Pione
         location.entries.each_with_object(Hash.new) do |entry, actions|
           if entry.basename.end_with?(".action.md")
             begin
-              actions.merge!(LiterateAction::Parser.parse(entry.read))
+              actions.merge!(LiterateAction::MarkdownParser.parse(entry.read))
             rescue
               Log::SystemLog.fatal("Error has occured when parsing the action document %s." % entry.address)
               raise
@@ -156,6 +156,7 @@ module Pione
               option = {
                 :flow_rule_name => flow_name,
                 :literate_actions => actions,
+                :package_pione => location + "Package.pione"
               }
               content = PNML::Compiler.new(net, option).compile
               file = entry.dirname + (flow_name + ".pione")

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

@@ -71,7 +71,7 @@ module Pione
       }
 
       # +enlosed_expr+ matches expressions enclosed by parens.
-      rule(:enclosed_expr) { lparen >> expr >> rparen! }
+      rule(:enclosed_expr) {lparen.as(:header) >> expr >> rparen! }
 
       # +expr_operator+ matches expression operators.
       #

data/lib/pione/lang/expr-transformer.rb

@@ -18,6 +18,8 @@ module Pione
       # Extract the content of +:expr+.
       rule(:expr => simple(:obj)) { obj }
 
+      rule({:header => simple(:header), :expr => simple(:obj)}) { obj }
+
       # Transform receiver and messages as Lang::Message.
       rule({ :receiver => simple(:receiver),
              :messages => sequence(:messages) }) {

data/lib/pione/lang/type.rb

@@ -25,7 +25,7 @@ module Pione
       # @return [Boolean]
       #   true if it matches, or false
       def match(env, target)
-        target_type = target.pione_type(env)
+        target_type = target.kind_of?(Type) ? target : target.pione_type(env)
         while target_type do
           return true if self == target_type
           target_type = target_type.parent_type
@@ -47,7 +47,7 @@ module Pione
           end
 
           # try immediate methods
-          _args = args.map {|arg| arg.eval(env)} # FIXME : should be replaced by type inference
+          _args = args.map {|arg| arg.pione_type(env)} # FIXME : should be replaced by type inference
           if group.has_key?(:immediate)
             return group[:immediate].find {|m| m.validate_inputs(env, rec, _args)}
           else

data/lib/pione/lang/variable.rb

@@ -15,6 +15,14 @@ module Pione
         env.variable_get(self).pione_type(env)
       end
 
+      def index_type(env)
+        env.variable_get(self).index_type(env)
+      end
+
+      def element_type(env)
+        env.variable_get(self).element_type(env)
+      end
+
       # Get the value from variable table in the environment.
       def eval(env)
         env.variable_get(self)

data/lib/pione/pnml/compiler.rb

@@ -15,6 +15,7 @@ module Pione
         @net = net
         @net_name = option[:flow_rule_name] || "Main"
         @env = option[:env] || Lang::Environment.new
+        setup_env(option[:package_pione])
 
         @option = option
         @net_rewriter = NetRewriter.new do |rules|
@@ -32,6 +33,22 @@ module Pione
         @actions = []
       end
 
+      def setup_env(package_pione)
+        @env = @env.setup_new_package(:pnml_compiler)
+
+        if package_pione and package_pione.exist?
+          parsed = Lang::DocumentParser.new.parse(package_pione.read)
+          package_document = Lang::DocumentTransformer.new.apply(parsed, {package_name: true, filename: true})
+          package_document.eval(@env)
+        end
+
+        val = Lang::KeyedSequence.new
+        val = val.put(Lang::IntegerSequence.of(1), Lang::DataExprSequence.of("pnml_compiler"))
+        @env.variable_set!(Lang::Variable.new("I"), val)
+        @env.variable_set!(Lang::Variable.new("*"), Lang::StringSequence.of("pnml_compiler"))
+        @env.variable_set!(Lang::Variable.new("O"), val)
+      end
+
       # Compile a PNML file into PIONE document as a string.
       def compile
         # annotations
@@ -97,7 +114,7 @@ module Pione
         # conditional branch
         @net.transitions.each do |transition|
           inputs = @net.find_all_places_by_target_id(transition.id).select do |place|
-            Perspective.data_place?(place, @env)
+            Perspective.data_place?(@env, place)
           end.map {|input| InputData.new(input)}
 
           if Perspective.if_transition?(@env, transition)
@@ -151,12 +168,12 @@ module Pione
             prev_transition = @net.find_transition_by_target_id(place.id)
             if Perspective.constraint_transition?(@env, prev_transition)
               @net.find_all_places_by_target_id(prev_transition.id).each do |_place|
-                if Perspective.data_place?(_place, @env)
+                if Perspective.data_place?(@env, _place)
                   inputs << InputData.new(_place)
                 end
               end
             else
-              if Perspective.data_place?(place, @env)
+              if Perspective.data_place?(@env, place)
                 inputs << InputData.new(place)
               end
             end
@@ -190,9 +207,9 @@ module Pione
         @net.find_all_places_by_target_id(transition.id).each_with_object([]) do |place, params|
           if Perspective.param_place?(@env, place)
             prev_transitions = @net.find_all_transitions_by_target_id(place.id)
-            keyword_transitions = prev_transitions.select{|t| Perspective.keyword_transition?(t)}
+            keyword_transitions = prev_transitions.select{|t| Perspective.keyword_transition?(@env, t)}
             if keyword_transitions.empty?
-              params << Param.new(place)
+              params << Param.set_of(place)
             end
           end
         end
@@ -213,7 +230,7 @@ module Pione
           when 0
             # ignore
           when 1
-            if Perspective.expr_place?(place)
+            if Perspective.expr_place?(@env, place)
               constraints << Constraint.new(place.name)
             else
               # the place should be constraint expression
@@ -234,8 +251,8 @@ module Pione
       #   tickets
       def find_source_tickets(transition)
         @net.find_all_places_by_target_id(transition.id).each_with_object([]) do |place, tickets|
-          if Perspective.ticket_place?(place, @env)
-            tickets << Ticket.new(place)
+          if Perspective.ticket_place?(@env, place)
+            tickets << Ticket.new(place.name)
           end
         end
       end
@@ -248,7 +265,7 @@ module Pione
       #   tickets
       def find_target_tickets(transition)
         @net.find_all_places_by_source_id(transition.id).each_with_object([]) do |place, tickets|
-          if Perspective.ticket_place?(place, @env)
+          if Perspective.ticket_place?(@env, place)
             tickets << Ticket.new(place.name)
           end
         end
@@ -262,9 +279,9 @@ module Pione
       #   features
       def find_features(transition)
         @net.find_all_places_by_target_id(transition.id).each_with_object([]) do |place, features|
-          if Perspective.feature_place?(place, @env)
+          if Perspective.feature_place?(@env, place)
             keyword_transitions = @net.find_all_transitions_by_target_id(place.id).select do |t|
-              Perspective.keyword_transition?(t)
+              Perspective.keyword_transition?(@env, t)
             end
             if keyword_transitions.empty?
               features << Feature.new(place.name)
@@ -283,8 +300,8 @@ module Pione
         condition = @net.find_place_by_source_id(transition.id)
 
         nodes = @net.find_all_transitions_by_source_id(condition.id)
-        key_then = nodes.find{|node| Perspective.then_transition?(node)}
-        key_else = nodes.find{|node| Perspective.else_transition?(node)}
+        key_then = nodes.find{|node| Perspective.then_transition?(@env, node)}
+        key_else = nodes.find{|node| Perspective.else_transition?(@env, node)}
 
         branch = ConditionalBranch.new(:if, condition.name)
 
@@ -295,11 +312,13 @@ module Pione
           branch.table[:then] << rule
         end
 
-        find_next_rules(key_else).each do |transition|
-          rule = definition[transition.id]
-          rule.inputs += inputs
-          flow_elements.delete(rule)
-          branch.table[:else] << rule
+        if key_else
+          find_next_rules(key_else).each do |transition|
+            rule = definition[transition.id]
+            rule.inputs += inputs
+            flow_elements.delete(rule)
+            branch.table[:else] << rule
+          end
         end
 
         return branch
@@ -315,8 +334,8 @@ module Pione
         expr = @net.find_place_by_source_id(transition.id)
 
         nodes = @net.find_all_transitions_by_source_id(expr.id)
-        keys_when = nodes.select{|node| Perspective.when_transition?(node)}
-        key_else = nodes.find{|node| Perspective.else_transition?(node)}
+        keys_when = nodes.select{|node| Perspective.when_transition?(@env, node)}
+        key_else = nodes.find{|node| Perspective.else_transition?(@env, node)}
 
         branch = ConditionalBranch.new(:case, expr.name)
 
@@ -349,7 +368,7 @@ module Pione
       def find_next_rules(base_rule)
         @net.find_all_places_by_source_id(base_rule.id).each_with_object([]) do |place, res|
           @net.find_all_transitions_by_source_id(place.id).each do |transition|
-            if Perspective.rule_transition?(transition)
+            if Perspective.rule_transition?(@env, transition)
               res << transition
             else
               find_next_rules(transition)
@@ -380,10 +399,10 @@ module Pione
       # @return [RuleDefinition]
       #   a flow rule definition for PNML net
       def build(flow_elements, params, features, variable_bindings)
-        inputs = @net.places.select {|place| Perspective.net_input_data_place?(place, @env)}
+        inputs = @net.places.select {|place| Perspective.net_input_data_place?(@env, place)}
         inputs = inputs.map {|input| InputData.new(input)}
 
-        outputs = @net.places.select {|place| Perspective.net_output_data_place?(place, @env)}
+        outputs = @net.places.select {|place| Perspective.net_output_data_place?(@env, place)}
         outputs = outputs.map {|output| OutputData.new(output)}
 
         option = {

data/lib/pione/pnml/declaration-extractor.rb

@@ -5,7 +5,7 @@ module Pione
       def initialize(env, net, option={})
         @env = env
         @net = net
-        @declarations = ExtractedDeclarations.new
+        @declarations = ExtractedDeclarations.new(@env)
       end
 
       def extract
@@ -54,7 +54,8 @@ module Pione
       attr_reader :variable_bindings
       attr_reader :features
 
-      def initialize
+      def initialize(env)
+        @env = env
         @params = []
         @variable_bindings = []
         @features = []
@@ -65,7 +66,12 @@ module Pione
       # @param param [String]
       #   a string of parameter
       def add_param(param)
-        @params << Perspective.normalize_declaration(param)
+        sentence = LabelExtractor.extract_param_sentence(param)
+        parsed = Lang::DocumentParser.new.parse(sentence)
+        value = Lang::DocumentTransformer.new.apply(parsed, {package_name: true, filename: true})
+        param_decl = value.elements.first
+        param_decl.eval(@env)
+        @params << sentence
       end
 
       # Add the variable binding.
@@ -73,8 +79,12 @@ module Pione
       # @param variable_binding [String]
       #   a string of variable binding
       def add_variable_binding(variable_binding)
-        @variable_bindings <<
-          Perspective.normalize_declaration(variable_binding)
+        sentence = LabelExtractor.extract_variable_binding(variable_binding)
+        parsed = Lang::DocumentParser.new.parse(sentence)
+        value = Lang::DocumentTransformer.new.apply(parsed, {package_name: true, filename: true})
+        variable_binding_decl = value.elements.first
+        variable_binding_decl.eval(@env)
+        @variable_bindings << variable_binding
       end
 
       # Add the feature.
@@ -83,7 +93,7 @@ module Pione
       #   a string of feature
       def add_feature(feature)
         @features <<
-          Perspective.normalize_declaration(feature)
+          LabelExtractor.extract_feature_sentence(feature)
       end
     end
   end