gisele 0.2.0 → 0.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gisele
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70117322338900 !ruby/object:Gem::Requirement
+  requirement: &70110318039380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70117322338900
+  version_requirements: *70110318039380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70117322337820 !ruby/object:Gem::Requirement
+  requirement: &70110318038460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70117322337820
+  version_requirements: *70110318038460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70117322336600 !ruby/object:Gem::Requirement
+  requirement: &70110318036100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70117322336600
+  version_requirements: *70110318036100
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &70117322335740 !ruby/object:Gem::Requirement
+  requirement: &70110318051380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *70117322335740
+  version_requirements: *70110318051380
 - !ruby/object:Gem::Dependency
   name: citrus
-  requirement: &70117322334980 !ruby/object:Gem::Requirement
+  requirement: &70110318050820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70117322334980
+  version_requirements: *70110318050820
 - !ruby/object:Gem::Dependency
   name: epath
-  requirement: &70117322334140 !ruby/object:Gem::Requirement
+  requirement: &70110318050260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70117322334140
+  version_requirements: *70110318050260
 - !ruby/object:Gem::Dependency
   name: quickl
-  requirement: &70117322333000 !ruby/object:Gem::Requirement
+  requirement: &70110318049560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70117322333000
+  version_requirements: *70110318049560
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70117322332300 !ruby/object:Gem::Requirement
+  requirement: &70110318048900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117322332300
+  version_requirements: *70110318048900
 - !ruby/object:Gem::Dependency
   name: yargi
-  requirement: &70117322331460 !ruby/object:Gem::Requirement
+  requirement: &70110318048220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70117322331460
+  version_requirements: *70110318048220
 description: ! 'This is a fresh-new implementation of the process analysis techniques
 
   developed in the Gisele and PIPAS research projects at UCLouvain'
@@ -130,23 +130,32 @@ files:
 - Gemfile.lock
 - bin/gisele
 - examples/meeting-scheduler/MeetingScheduling.gis
+- examples/rectal-cancer-pathway/RectalCancerPathway.gis
 - lib/gisele/command.rb
 - lib/gisele/errors.rb
 - lib/gisele/language/ast/bool_and.rb
 - lib/gisele/language/ast/bool_expr.rb
 - lib/gisele/language/ast/bool_not.rb
 - lib/gisele/language/ast/bool_or.rb
+- lib/gisele/language/ast/case_st.rb
+- lib/gisele/language/ast/else_clause.rb
 - lib/gisele/language/ast/elsif_clause.rb
 - lib/gisele/language/ast/helpers.rb
 - lib/gisele/language/ast/if_st.rb
 - lib/gisele/language/ast/node.rb
 - lib/gisele/language/ast/task_call_st.rb
-- lib/gisele/language/ast/unit.rb
+- lib/gisele/language/ast/unit_def.rb
 - lib/gisele/language/ast/var_ref.rb
 - lib/gisele/language/ast/when_clause.rb
 - lib/gisele/language/ast/while_st.rb
 - lib/gisele/language/ast.rb
 - lib/gisele/language/dot.yml
+- lib/gisele/language/elsif_flattener.rb
+- lib/gisele/language/if_to_case.rb
+- lib/gisele/language/rewriter/helper.rb
+- lib/gisele/language/rewriter/scoping.rb
+- lib/gisele/language/rewriter/work_on_nodes.rb
+- lib/gisele/language/rewriter.rb
 - lib/gisele/language/sugar_removal.rb
 - lib/gisele/language/syntax/bool_and.rb
 - lib/gisele/language/syntax/bool_expr.rb
@@ -154,6 +163,7 @@ files:
 - lib/gisele/language/syntax/bool_not.rb
 - lib/gisele/language/syntax/bool_or.rb
 - lib/gisele/language/syntax/bool_paren.rb
+- lib/gisele/language/syntax/case_st.rb
 - lib/gisele/language/syntax/else_clause.rb
 - lib/gisele/language/syntax/elsif_clause.rb
 - lib/gisele/language/syntax/event_set.rb
@@ -167,15 +177,13 @@ files:
 - lib/gisele/language/syntax/st_list.rb
 - lib/gisele/language/syntax/task_call_st.rb
 - lib/gisele/language/syntax/task_def.rb
-- lib/gisele/language/syntax/task_refinement.rb
-- lib/gisele/language/syntax/task_signature.rb
 - lib/gisele/language/syntax/trackvar_def.rb
-- lib/gisele/language/syntax/unit.rb
+- lib/gisele/language/syntax/unit_def.rb
 - lib/gisele/language/syntax/var_ref.rb
+- lib/gisele/language/syntax/when_clause.rb
 - lib/gisele/language/syntax/while_st.rb
 - lib/gisele/language/syntax.rb
 - lib/gisele/language/to_graph.rb
-- lib/gisele/language/transformer.rb
 - lib/gisele/language.rb
 - lib/gisele/loader.rb
 - lib/gisele/version.rb
@@ -201,13 +209,52 @@ files:
 - spec/spec_helper.rb
 - spec/test_examples.rb
 - spec/unit/language/ast/test_node.rb
-- spec/unit/language/sugar_removal/test_if_to_guarded_commands.rb
-- spec/unit/language/syntax/test_grammar.rb
-- spec/unit/language/syntax/test_to_ast.rb
+- spec/unit/language/rewriter/test_helper.rb
+- spec/unit/language/rewriter/test_scoping.rb
+- spec/unit/language/rewriter/test_work_on_nodes.rb
+- spec/unit/language/syntax/grammar/test_bool_expr.rb
+- spec/unit/language/syntax/grammar/test_boolean_literal.rb
+- spec/unit/language/syntax/grammar/test_case_st.rb
+- spec/unit/language/syntax/grammar/test_event.rb
+- spec/unit/language/syntax/grammar/test_event_name.rb
+- spec/unit/language/syntax/grammar/test_event_set.rb
+- spec/unit/language/syntax/grammar/test_fluent_def.rb
+- spec/unit/language/syntax/grammar/test_if_st.rb
+- spec/unit/language/syntax/grammar/test_par_st.rb
+- spec/unit/language/syntax/grammar/test_process_statement.rb
+- spec/unit/language/syntax/grammar/test_seq_st.rb
+- spec/unit/language/syntax/grammar/test_spaces.rb
+- spec/unit/language/syntax/grammar/test_spacing.rb
+- spec/unit/language/syntax/grammar/test_task_def.rb
+- spec/unit/language/syntax/grammar/test_task_name.rb
+- spec/unit/language/syntax/grammar/test_task_start_or_end.rb
+- spec/unit/language/syntax/grammar/test_trackvar_def.rb
+- spec/unit/language/syntax/grammar/test_unit_def.rb
+- spec/unit/language/syntax/grammar/test_variable_name.rb
+- spec/unit/language/syntax/grammar/test_when_clause.rb
+- spec/unit/language/syntax/grammar/test_while_st.rb
+- spec/unit/language/syntax/to_ast/test_bool_expr.rb
+- spec/unit/language/syntax/to_ast/test_case_st.rb
+- spec/unit/language/syntax/to_ast/test_else_clause.rb
+- spec/unit/language/syntax/to_ast/test_elsif_clause.rb
+- spec/unit/language/syntax/to_ast/test_event_set.rb
+- spec/unit/language/syntax/to_ast/test_fluent_def.rb
+- spec/unit/language/syntax/to_ast/test_if_st.rb
+- spec/unit/language/syntax/to_ast/test_par_st.rb
+- spec/unit/language/syntax/to_ast/test_seq_st.rb
+- spec/unit/language/syntax/to_ast/test_task_call_st.rb
+- spec/unit/language/syntax/to_ast/test_task_def.rb
+- spec/unit/language/syntax/to_ast/test_trackvar_def.rb
+- spec/unit/language/syntax/to_ast/test_unit_def.rb
+- spec/unit/language/syntax/to_ast/test_var_ref.rb
+- spec/unit/language/syntax/to_ast/test_when_clause.rb
+- spec/unit/language/syntax/to_ast/test_while_st.rb
 - spec/unit/language/test_ast.rb
+- spec/unit/language/test_elsif_flattener.rb
+- spec/unit/language/test_if_to_case.rb
+- spec/unit/language/test_rewriter.rb
 - spec/unit/language/test_syntax.rb
 - spec/unit/language/test_to_graph.rb
-- spec/unit/language/test_transformer.rb
 - spec/unit/test_gisele.rb
 - spec/unit/test_language.rb
 - tasks/debug_mail.rake
@@ -230,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -521904661763835024
+      hash: -1270039991720770825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,12 +308,51 @@ test_files:
 - spec/spec_helper.rb
 - spec/test_examples.rb
 - spec/unit/language/ast/test_node.rb
-- spec/unit/language/sugar_removal/test_if_to_guarded_commands.rb
-- spec/unit/language/syntax/test_grammar.rb
-- spec/unit/language/syntax/test_to_ast.rb
+- spec/unit/language/rewriter/test_helper.rb
+- spec/unit/language/rewriter/test_scoping.rb
+- spec/unit/language/rewriter/test_work_on_nodes.rb
+- spec/unit/language/syntax/grammar/test_bool_expr.rb
+- spec/unit/language/syntax/grammar/test_boolean_literal.rb
+- spec/unit/language/syntax/grammar/test_case_st.rb
+- spec/unit/language/syntax/grammar/test_event.rb
+- spec/unit/language/syntax/grammar/test_event_name.rb
+- spec/unit/language/syntax/grammar/test_event_set.rb
+- spec/unit/language/syntax/grammar/test_fluent_def.rb
+- spec/unit/language/syntax/grammar/test_if_st.rb
+- spec/unit/language/syntax/grammar/test_par_st.rb
+- spec/unit/language/syntax/grammar/test_process_statement.rb
+- spec/unit/language/syntax/grammar/test_seq_st.rb
+- spec/unit/language/syntax/grammar/test_spaces.rb
+- spec/unit/language/syntax/grammar/test_spacing.rb
+- spec/unit/language/syntax/grammar/test_task_def.rb
+- spec/unit/language/syntax/grammar/test_task_name.rb
+- spec/unit/language/syntax/grammar/test_task_start_or_end.rb
+- spec/unit/language/syntax/grammar/test_trackvar_def.rb
+- spec/unit/language/syntax/grammar/test_unit_def.rb
+- spec/unit/language/syntax/grammar/test_variable_name.rb
+- spec/unit/language/syntax/grammar/test_when_clause.rb
+- spec/unit/language/syntax/grammar/test_while_st.rb
+- spec/unit/language/syntax/to_ast/test_bool_expr.rb
+- spec/unit/language/syntax/to_ast/test_case_st.rb
+- spec/unit/language/syntax/to_ast/test_else_clause.rb
+- spec/unit/language/syntax/to_ast/test_elsif_clause.rb
+- spec/unit/language/syntax/to_ast/test_event_set.rb
+- spec/unit/language/syntax/to_ast/test_fluent_def.rb
+- spec/unit/language/syntax/to_ast/test_if_st.rb
+- spec/unit/language/syntax/to_ast/test_par_st.rb
+- spec/unit/language/syntax/to_ast/test_seq_st.rb
+- spec/unit/language/syntax/to_ast/test_task_call_st.rb
+- spec/unit/language/syntax/to_ast/test_task_def.rb
+- spec/unit/language/syntax/to_ast/test_trackvar_def.rb
+- spec/unit/language/syntax/to_ast/test_unit_def.rb
+- spec/unit/language/syntax/to_ast/test_var_ref.rb
+- spec/unit/language/syntax/to_ast/test_when_clause.rb
+- spec/unit/language/syntax/to_ast/test_while_st.rb
 - spec/unit/language/test_ast.rb
+- spec/unit/language/test_elsif_flattener.rb
+- spec/unit/language/test_if_to_case.rb
+- spec/unit/language/test_rewriter.rb
 - spec/unit/language/test_syntax.rb
 - spec/unit/language/test_to_graph.rb
-- spec/unit/language/test_transformer.rb
 - spec/unit/test_gisele.rb
 - spec/unit/test_language.rb

data/lib/gisele/language/syntax/task_refinement.rb

@@ -1,15 +0,0 @@
-module Gisele
-  module Language
-    module Syntax
-      module TaskRefinement
-        include Node
-
-        def _to_ast
-          main = captures[:process_statement].first.to_ast
-          [:task_refinement, main]
-        end
-
-      end # module TaskRefinement
-    end # module Syntax
-  end # module Language
-end # module Gisele

data/lib/gisele/language/syntax/task_signature.rb

@@ -1,15 +0,0 @@
-module Gisele
-  module Language
-    module Syntax
-      module TaskSignature
-        include Node
-
-        def _to_ast
-          list = captures[:task_signature_element].map{|x| x.to_ast}
-          [:task_signature] + list
-        end
-
-      end # module TaskSignature
-    end # module Syntax
-  end # module Language
-end # module Gisele

data/lib/gisele/language/transformer.rb

@@ -1,38 +0,0 @@
-module Gisele
-  module Language
-    class Transformer
-      include AST::Helpers
-
-      def call(node)
-        node = pre_call(node)
-        meth = :"on_#{node.rule_name}"
-        meth = :"on_missing" unless respond_to?(meth)
-        post_call send(meth, node)
-      end
-
-      def on_missing(node)
-        raise UnexpectedNodeError, "Unexpected node: #{node.rule_name}"
-      end
-
-      protected
-
-      def pre_call(node)
-        unless looks_a_node?(node)
-          raise ArgumentError, "AST node expected, got #{node.inspect}", caller
-        end
-        node(node)
-      end
-
-      def post_call(transformed)
-        looks_a_node?(transformed) ? node(transformed) : transformed
-      end
-
-      def copy_and_applyall(node)
-        node.copy do |memo,child|
-          memo << (child.is_a?(AST::Node) ? call(child) : child)
-        end
-      end
-
-    end # class Transformer
-  end # module Language
-end # module Gisele

data/spec/unit/language/sugar_removal/test_if_to_guarded_commands.rb

@@ -1,110 +0,0 @@
-require 'spec_helper'
-module Gisele::Language
-  describe SugarRemoval do
-    describe "if_st to case_st" do
-      include AST::Helpers
-
-      def ast(source)
-        Syntax.ast(source.strip, :root => :if_st)
-      end
-
-      def rewrite(ast)
-        SugarRemoval.new.call(ast)
-      end
-
-      it 'rewrites single if correctly' do
-        source   = ast("if goodCond Task1 end")
-        expected = \
-          [:case_st,
-            [:when_clause,
-              [:bool_expr, [:var_ref, "goodCond"]],
-              [:task_call_st, "Task1"] ]]
-        rewrite(source).should eq(expected)
-      end
-
-      it 'negates the else clause' do
-        source   = ast("if goodCond Task1 else Task2 end")
-        expected = \
-          [:case_st,
-            [:when_clause,
-              [:bool_expr, [:var_ref, "goodCond"]],
-              [:task_call_st, "Task1"] ],
-            [:when_clause,
-              [:bool_expr, [:bool_not, [:var_ref, "goodCond"]]],
-              [:task_call_st, "Task2"] ]
-          ]
-        rewrite(source).should eq(expected)
-      end
-
-      it 'handles elsif clauses correctly' do
-        source = ast(<<-IF)
-          if    c1 Task1
-          elsif c2 Task2
-          elsif c3 Task3
-          else  Task4
-          end
-        IF
-        expected = \
-          [:case_st,
-            [:when_clause,
-              [:bool_expr, [:var_ref, "c1"]],
-              [:task_call_st, "Task1"] ],
-            [:when_clause,
-              [:bool_expr, [:bool_and,
-                [:var_ref, "c2"],
-                [:bool_not, [:var_ref, "c1"]] ]],
-              [:task_call_st, "Task2"] ],
-            [:when_clause,
-              [:bool_expr, [:bool_and,
-                [:var_ref, "c3"],
-                [:bool_and,
-                  [:bool_not, [:var_ref, "c2"]],
-                  [:bool_not, [:var_ref, "c1"]] ]]],
-              [:task_call_st, "Task3"] ],
-            [:when_clause,
-              [:bool_expr, [:bool_and,
-                [:bool_not, [:var_ref, "c3"]],
-                [:bool_and,
-                  [:bool_not, [:var_ref, "c2"]],
-                  [:bool_not, [:var_ref, "c1"]]]]],
-              [:task_call_st, "Task4"] ],
-          ]
-        rewrite(source).should eq(expected)
-      end
-
-      it 'avoids double negations' do
-        source   = ast("if not(goodCond) Task1 else Task2 end")
-        expected = \
-          [:case_st,
-            [:when_clause,
-              [:bool_expr, [:bool_not, [:var_ref, "goodCond"]]],
-              [:task_call_st, "Task1"] ],
-            [:when_clause,
-              [:bool_expr, [:var_ref, "goodCond"]],
-              [:task_call_st, "Task2"] ] ]
-        rewrite(source).should eq(expected)
-      end
-
-      it 'recurse on other nodes' do
-        if_st = ast("if goodCond Task1 end")
-        rw_st = rewrite(if_st)
-        rewrite([:unit, if_st]).should eq([:unit, rw_st])
-      end
-
-      it 'keeps traceability markers on a single if' do
-        if_st = ast("if goodCond Task1 end")
-        rw_st = rewrite(if_st)
-        rw_st.markers.should eq(if_st.markers)
-        rw_st.last.markers.should eq(if_st.markers)
-      end
-
-      it 'keeps traceability markers when a else if present' do
-        if_st = ast("if goodCond Task1 else Task2 end")
-        rw_st = rewrite(if_st)
-        rw_st.markers.should eq(if_st.markers)
-        rw_st.last.markers.should eq(if_st.last.markers)
-      end
-
-    end
-  end
-end