pione 0.5.0.alpha.2 → 0.5.0

data/lib/pione/pnml/pione-model.rb

@@ -50,7 +50,7 @@ module Pione
         # @return [Boolean]
         #   true if the node is an exression place
         def expr_place?(env, node)
-          match_place_parser?(node, :expr_place)
+          match_place_parser?(env, node, :expr_place)
         end
 
         # Return true if the node is a data place.
@@ -91,7 +91,7 @@ module Pione
         #   true if the node is a net output data place
         def net_output_data_place?(env, node)
           if data_place?(env, node)
-            return net_output_data_symbol?(data_modifier(node))
+            return net_output_data_symbol?(data_modifier(env, node))
           else
             return false
           end
@@ -475,7 +475,7 @@ module Pione
         # @return [Boolean]
         #   true if the node is the place parser
         def eval_transition(env, node, parser_name, target_name)
-          parsed = parse_transition(node)
+          parsed = parse_transition(env, node, parser_name)
           if parsed and parsed[target_name]
             return Lang::DocumentTransformer.new.apply(parsed[target_name], TRANSFORMER_OPT)
           else
@@ -812,13 +812,25 @@ module Pione
           conditions << output.as_declaration
         end
         @params.each do |param|
-          conditions += param.as_declarations
+          if param.kind_of?(Param)
+            conditions += param.as_declarations
+          else
+            conditions << param
+          end
         end
         @constraints.each do |constraint|
-          conditions << constraint.as_declaration
+          if constraint.kind_of?(Constraint)
+            conditions << constraint.as_declaration
+          else
+            conditions << constraint
+          end
         end
         @features.each do |feature|
-          conditions << feature.as_declaration
+          if feature.kind_of?(Feature)
+            conditions << feature.as_declaration
+          else
+            conditions << feature
+          end
         end
         conditions
       end

data/lib/pione/pnml/ticket-instantiation.rb

@@ -32,8 +32,8 @@ module Pione
       # - Change the place name
       def self.rewrite(net, subjects, env)
         transition_from, transition_to, place = subjects
-        name_from = Perspective.normalize_rule_name(transition_from.name)
-        name_to = Perspective.normalize_rule_name(transition_to.name)
+        name_from = LabelExtractor.extract_rule_expr(transition_from.name)
+        name_to = LabelExtractor.extract_rule_expr(transition_to.name)
 
         place.name = "<%s>" % (TICKET_NAME % [name_from, name_to])
       end

data/lib/pione/version.rb

@@ -1,4 +1,4 @@
 module Pione
   # version of pione
-  VERSION = "0.5.0.alpha.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pione
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Keita Yamaguchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -512,7 +512,7 @@ files:
 - example/DeferredChoice/pione-package.json
 - example/DeferredChoiceWithPage/DeferredChoiceWithPage.action.md
 - example/DeferredChoiceWithPage/DeferredChoiceWithPage.pione
-- example/DeferredChoiceWithPage/DefferredChoiceWithPage.pnml
+- example/DeferredChoiceWithPage/DeferredChoiceWithPage.pnml
 - example/DeferredChoiceWithPage/Package.pione
 - example/DeferredChoiceWithPage/etc/index.html
 - example/DeferredChoiceWithPage/pione-package.json
@@ -524,6 +524,7 @@ files:
 - example/Fib/Fib.action.md
 - example/Fib/Fib.pione
 - example/Fib/Fib.pnml
+- example/Fib/FibN.pione
 - example/Fib/FibN.pnml
 - example/Fib/Package.pione
 - example/HelloWorld/HelloWorld.action.md
@@ -770,11 +771,13 @@ files:
 - example/SerialProcessing/pione-package.json
 - example/SerialProcessing/scenario/Scenario.pione
 - example/SerialProcessing/scenario/pione-scenario.json
+- example/SieveOfEratosthenes/CreateUndeterminedNumbers.pione
 - example/SieveOfEratosthenes/CreateUndeterminedNumbers.pnml
 - example/SieveOfEratosthenes/Package.pione
 - example/SieveOfEratosthenes/Sieve.pnml
 - example/SieveOfEratosthenes/SieveOfEratosthenes.pione
 - example/SieveOfEratosthenes/SieveOfEratosthenes.pnml
+- example/SingleParticlesWithRef/Create3dinfo.pione
 - example/SingleParticlesWithRef/Create3dinfo.pnml
 - example/SingleParticlesWithRef/Package.pione
 - example/SingleParticlesWithRef/SingleParticlesWithRef.action.md
@@ -856,9 +859,10 @@ files:
 - example/SingleParticlesWithRef/data/all.ref2d
 - example/SingleParticlesWithRef/data/all.ref3d
 - example/SingleParticlesWithRef/misc/Makefile
-- example/SingleParticlesWithRef/misc/SingleParticlesWithRef.Display2.pione
+- example/SingleParticlesWithRef/misc/SingleParticlesWithRef.Display2.pione.bak
 - example/SingleParticlesWithRef/misc/SingleParticlesWithRef.Makefile
-- example/SingleParticlesWithRef/misc/SingleParticlesWithRefFull.pione
+- example/SingleParticlesWithRef/misc/SingleParticlesWithRefFull.pione.bak
+- example/SingleParticlesWithRef/pione-package.json
 - example/Sum/CalcEachLine.pione
 - example/Sum/CalcEachLine.pnml
 - example/Sum/Package.pione
@@ -901,6 +905,7 @@ files:
 - example/WorkflowPatterns/07_StructuredSynchronizingMerge/Package.pione
 - example/WorkflowPatterns/07_StructuredSynchronizingMerge/StructuredSynchronizingMerge.pione
 - example/WorkflowPatterns/07_StructuredSynchronizingMerge/StructuredSynchronizingMerge.pnml
+- example/WorkflowPatterns/07_StructuredSynchronizingMerge/pione-package.json
 - example/WorkflowPatterns/08_MultiMerge/MultiMerge.pione
 - example/WorkflowPatterns/08_MultiMerge/MultiMerge.pnml
 - example/WorkflowPatterns/08_MultiMerge/Package.pione
@@ -934,14 +939,18 @@ files:
 - example/WorkflowPatterns/38_GeneralSynchronizingMerge/GeneralSynchronizingMerge.pione
 - example/WorkflowPatterns/38_GeneralSynchronizingMerge/GeneralSynchronizingMerge.pnml
 - example/WorkflowPatterns/38_GeneralSynchronizingMerge/Package.pione
+- example/WorkflowPatterns/41_ThreadMerge/A.pione
 - example/WorkflowPatterns/41_ThreadMerge/A.pnml
+- example/WorkflowPatterns/41_ThreadMerge/A1.pione
 - example/WorkflowPatterns/41_ThreadMerge/A1.pnml
 - example/WorkflowPatterns/41_ThreadMerge/Package.pione
 - example/WorkflowPatterns/41_ThreadMerge/ThreadMerge.pione
 - example/WorkflowPatterns/41_ThreadMerge/ThreadMerge.pnml
+- example/WorkflowPatterns/41_ThreadMerge/pione-package.json
 - example/WorkflowPatterns/42_ThreadSplit/Package.pione
 - example/WorkflowPatterns/42_ThreadSplit/ThreadSplit.pione
 - example/WorkflowPatterns/42_ThreadSplit/ThreadSplit.pnml
+- example/WorkflowPatterns/42_ThreadSplit/pione-package.json
 - lib/pione.rb
 - lib/pione/agent.rb
 - lib/pione/agent/agent-exception.rb
@@ -1602,9 +1611,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5