MINT-scxml 1.0.0 → 1.1.0

data/Gemfile

@@ -1,5 +1,5 @@
 source :rubygems
-gem "MINT-statemachine", "1.2.3" 
-gem "rspec", "1.3.1"
+gem "MINT-statemachine","1.3.0"
+gem "rspec","2.8.0"
 gem "rake","0.9.2"
 gem "hoe", "2.9.6"

data/Gemfile.lock

@@ -1,18 +1,26 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    MINT-statemachine (1.2.3)
+    MINT-statemachine (1.3.0)
+    diff-lcs (1.1.3)
     hoe (2.9.6)
       rake (~> 0.8)
     rake (0.9.2)
-    rspec (1.3.1)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
-  MINT-statemachine (= 1.2.3)
+  MINT-statemachine (= 1.3.0)
   hoe (= 2.9.6)
   rake (= 0.9.2)
-  rspec (= 1.3.1)
+  rspec (= 2.8.0)

data/History.txt

@@ -1,3 +1,17 @@
+=== 1.1.0 / 2012-11-20
+
+* (Sebastian) fixed bug: root statemachine was wrongly set for states that are nested inside parallel
+* (Sebastian) added test for spontaneous transitions inside parallel states
+* (Sebastian) removed old MINT test state machines
+* (Jessica) transitions now stored as an array
+* (Jessica) fixed parallel superstate bug
+* (Jessica) All tests working. Added on_entry, on_exit and transitions for parallel states
+* (Jessica) added spontaneous transition
+* (Jessica) WIP: script
+* (Jessica) added  treatment for ifs
+* (Jessica) fixed history states support and history state tests
+* (Jessica) Removed unnecessary transitions.
+
 === 1.0.0 / 2011-11-01
 
 * First version

data/MINT-scxml.gemspec

@@ -1,35 +1,41 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{MINT-scxml}
-  s.version = "1.0.0"
+  s.name = "MINT-scxml"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Jessica H. Colnago, Sebastian Feuerstack}]
-  s.date = %q{2011-11-01}
-  s.description = %q{}
-  s.email = %q{Sebastian@Feuerstack.org}
-  s.extra_rdoc_files = [%q{History.txt}, %q{Manifest.txt}, %q{README.txt}]
-  s.files = [%q{.autotest}, %q{.idea/workspace.xml}, %q{Gemfile}, %q{Gemfile.lock}, %q{History.txt}, %q{MINT-scxml.gemspec}, %q{Manifest.txt}, %q{README.rdoc}, %q{README.txt}, %q{Rakefile}, %q{lib/MINT-scxml.rb}, %q{lib/MINT-scxml/scxml-parser.rb}, %q{spec/atm_spec.rb}, %q{spec/parser_spec.rb}, %q{spec/spec.opts}, %q{spec/spec_helper.rb}, %q{spec/test_handgestures_spec.rb}, %q{spec/testmachines/atm_enhanced.rb}, %q{spec/testmachines/handgestures-scxmlgui.png}, %q{spec/testmachines/handgestures-scxmlgui.scxml}, %q{spec/testmachines/multiplestates.rb}, %q{spec/testmachines/traffic_light_enhanced.rb}, %q{spec/testmachines/vending_machine1.rb}, %q{spec/testmachines/vending_machine2.rb}, %q{spec/testmachines/vending_machine3.rb}, %q{spec/testmachines/vending_machine4.rb}, %q{spec_helper.rb}, %q{statemachines/AICommand_scxml_spec.rb}, %q{statemachines/AIO_scxml_spec.rb}, %q{statemachines/aui-scxml/AIC.scxml}, %q{statemachines/aui-scxml/AICommand.scxml}, %q{statemachines/aui-scxml/AICommand2.scxml}, %q{statemachines/aui-scxml/AIO.scxml}, %q{statemachines/aui/AIC.rb}, %q{statemachines/aui/AIChoiceElement.rb}, %q{statemachines/aui/AICommand.rb}, %q{statemachines/aui/AIIN.rb}, %q{statemachines/aui/AIINContinous.rb}, %q{statemachines/aui/AIMultiChoice.rb}, %q{statemachines/aui/AIMultiChoiceElement.rb}, %q{statemachines/aui/AIOUTContinous.rb}, %q{statemachines/aui/AISingleChoice.rb}, %q{statemachines/aui/AISingleChoiceElement.rb}, %q{statemachines/aui/aio.rb}, %q{statemachines/specs/AICommand_spec.rb}, %q{statemachines/specs/AIINContinous_spec.rb}, %q{statemachines/specs/AIMultiChoiceElement_spec.rb}, %q{statemachines/specs/AIMultiChoice_spec.rb}, %q{statemachines/specs/AIOUTContinous_spec.rb}, %q{statemachines/specs/AIO_spec.rb}, %q{statemachines/specs/AISingleChoiceElement_spec.rb}, %q{statemachines/specs/AISingleChoice_spec.rb}, %q{.gemtest}]
-  s.homepage = %q{http://www.multi-access.de}
-  s.rdoc_options = [%q{--main}, %q{README.rdoc}]
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{MINT-scxml}
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{}
+  s.authors = ["Jessica H. Colnago, Sebastian Feuerstack"]
+  s.date = "2012-11-20"
+  s.description = "This gem implements a state chart XML (SCXML) parser that generates a ruby statemachine."
+  s.email = "Sebastian@Feuerstack.org"
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
+  s.files = ["Gemfile", "Gemfile.lock", "History.txt", "MINT-scxml.gemspec", "Manifest.txt", "README.rdoc", "Rakefile", "lib/MINT-scxml.rb", "lib/MINT-scxml/scxml-parser.rb", "spec/atm_spec.rb", "spec/if_spec.rb", "spec/parser_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/test_handgestures_spec.rb", "spec/testmachines/atm_enhanced.rb", "spec/testmachines/button.scxml", "spec/testmachines/handgestures-scxmlgui.png", "spec/testmachines/handgestures-scxmlgui.scxml", "spec/testmachines/multiplestates.rb", "spec/testmachines/traffic_light_enhanced.rb", "spec/testmachines/vending_machine1.rb", "spec/testmachines/vending_machine2.rb", "spec/testmachines/vending_machine3.rb", "spec/testmachines/vending_machine4.rb", "spec_helper.rb", "statemachines/AICommand_scxml_spec.rb", "statemachines/AIO_scxml_spec.rb", "statemachines/specs/AICommand_spec.rb", "statemachines/specs/AIINContinous_spec.rb", "statemachines/specs/AIMultiChoiceElement_spec.rb", "statemachines/specs/AIMultiChoice_spec.rb", "statemachines/specs/AIOUTContinous_spec.rb", "statemachines/specs/AIO_spec.rb", "statemachines/specs/AISingleChoiceElement_spec.rb", "statemachines/specs/AISingleChoice_spec.rb", ".gemtest"]
+  s.homepage = "http://www.multi-access.de"
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "MINT-scxml"
+  s.rubygems_version = "1.8.15"
+  s.summary = "This gem implements a state chart XML (SCXML) parser that generates a ruby statemachine."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<MINT-statemachine>, ["~> 1.2.3"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.9"])
+      s.add_runtime_dependency(%q<MINT-statemachine>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<newgem>, [">= 1.5.3"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.1"])
     else
-      s.add_dependency(%q<MINT-statemachine>, ["~> 1.2.3"])
-      s.add_dependency(%q<hoe>, ["~> 2.9"])
+      s.add_dependency(%q<MINT-statemachine>, ["~> 1.3.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<newgem>, [">= 1.5.3"])
+      s.add_dependency(%q<hoe>, ["~> 3.1"])
     end
   else
-    s.add_dependency(%q<MINT-statemachine>, ["~> 1.2.3"])
-    s.add_dependency(%q<hoe>, ["~> 2.9"])
+    s.add_dependency(%q<MINT-statemachine>, ["~> 1.3.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<newgem>, [">= 1.5.3"])
+    s.add_dependency(%q<hoe>, ["~> 3.1"])
   end
 end

data/Manifest.txt

@@ -8,11 +8,13 @@ Rakefile
 lib/MINT-scxml.rb
 lib/MINT-scxml/scxml-parser.rb
 spec/atm_spec.rb
+spec/if_spec.rb
 spec/parser_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 spec/test_handgestures_spec.rb
 spec/testmachines/atm_enhanced.rb
+spec/testmachines/button.scxml
 spec/testmachines/handgestures-scxmlgui.png
 spec/testmachines/handgestures-scxmlgui.scxml
 spec/testmachines/multiplestates.rb
@@ -24,21 +26,6 @@ spec/testmachines/vending_machine4.rb
 spec_helper.rb
 statemachines/AICommand_scxml_spec.rb
 statemachines/AIO_scxml_spec.rb
-statemachines/aui-scxml/AIC.scxml
-statemachines/aui-scxml/AICommand.scxml
-statemachines/aui-scxml/AICommand2.scxml
-statemachines/aui-scxml/AIO.scxml
-statemachines/aui/AIC.rb
-statemachines/aui/AIChoiceElement.rb
-statemachines/aui/AICommand.rb
-statemachines/aui/AIIN.rb
-statemachines/aui/AIINContinous.rb
-statemachines/aui/AIMultiChoice.rb
-statemachines/aui/AIMultiChoiceElement.rb
-statemachines/aui/AIOUTContinous.rb
-statemachines/aui/AISingleChoice.rb
-statemachines/aui/AISingleChoiceElement.rb
-statemachines/aui/aio.rb
 statemachines/specs/AICommand_spec.rb
 statemachines/specs/AIINContinous_spec.rb
 statemachines/specs/AIMultiChoiceElement_spec.rb

data/README.rdoc

@@ -33,7 +33,7 @@ and generate the RDoc.
 
 == LICENSE:
 
-Copyright (C) 2010,2011 Sebastian Feuerstack, Jessica H. Colnago
+Copyright (C) 2010-2012 Sebastian Feuerstack, Jessica H. Colnago
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

data/Rakefile

@@ -16,16 +16,10 @@ Hoe.plugin :newgem
 Hoe.spec 'MINT-scxml' do
   self.developer 'Jessica H. Colnago, Sebastian Feuerstack', 'Sebastian@Feuerstack.org'
   self.rubyforge_name       = self.name # TODO this is default value
-  self.extra_deps         = [['MINT-statemachine','~> 1.2.3']]
+  self.extra_deps         = [['MINT-statemachine','~> 1.3.0']]
   self.email = "Sebastian@Feuerstack.org"
 
-  # HEY! If you fill these out in ~/.hoe_template/Rakefile.erb then
-  # you'll never have to touch them again!
-  # (delete this comment too, of course)
 
-  # developer('FIX', 'FIX@example.com')
-
-  # self.rubyforge_name = 'scxml-gemx' # if different than 'scxml-gem'
 end
 
 # vim: syntax=ruby

data/lib/MINT-scxml.rb

@@ -1,5 +1,5 @@
 class SCXML_MINT
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end
 
 require "MINT-scxml/scxml-parser"

data/lib/MINT-scxml/scxml-parser.rb

@@ -1,4 +1,3 @@
-# -*- coding: raw-text -*-
 require 'rubygems'
 require "bundler/setup"
 require 'statemachine'
@@ -20,98 +19,164 @@ class StatemachineParser < Statemachine::StatemachineBuilder
 
   def initialize(context = nil, logger = nil, queue = nil)
     super()
-    @actions = Array.new
     @current_transition = nil
     @current_state = nil
     @current_element = nil
     @parallel = nil
-    @state = Array.new
+    @history_state = nil
     @statemachine.messenger = logger
     @statemachine.message_queue = queue
     @statemachine.context= context
+    @actions = Array.new
+    @actions_aux = Array.new
+    @state = Array.new
     @substate = Array.new
     @transitions = Array.new
     @history_states = Array.new
     @history_target = Array.new
-    @history_state = nil
+    @parallel_state = Array.new
+    @if_actions = Array.new
+    @if_actions_aux = Array.new
+    @if = Array.new
+    @tag = Array.new
+    @cond = Array.new
     @history = false
     @is_parallel = false
     @scxml_state = false
-    @parallel_state = Array.new
   end
 
+  # This function parses scxml from a file
   def build_from_scxml(filename)
     source = File.new filename
     Document.parse_stream(source, self)
-    @statemachine.reset
-	return @statemachine
+    #@statemachine.reset
+    @statemachine
   end
 
-  # parses scxml directly from string parameter stringbuffer
+  # This function parses scxml directly from the string parameter "stringbuffer"
   def build_from_scxml_string(stringbuffer)
     Document.parse_stream(stringbuffer, self)
-    @statemachine.reset
-    return @statemachine
+    #@statemachine.reset
+    @statemachine
   end
 
+
+  # This function deals with the different scenarios for the creation of actions with if
+  def creating_ifs
+    if @if.size == 1
+      @if_actions.push(@if_actions_aux.last) if @if_actions_aux.size != 0
+      if @actions_aux.size != 0
+        @actions_aux.each do |j|
+          @if_actions.push(j)
+        end
+        @actions_aux = []
+      end
+      @actions.push([@tag.last, @cond.last, @if_actions])
+    else
+      if @if_actions.size != 0
+        @if_actions_aux.push(@if_actions)
+      end
+      @actions_aux.push([@tag.last, @cond.last, @if_actions_aux.last])
+    end
+    @if_actions = []
+    @cond.pop
+    @tag.pop
+    @if_actions_aux.pop if @if_actions_aux.size != 0
+  end
+
+  # This function defines the actions to be taken for each different tag when the tag is opened
   def tag_start(name, attributes)
     case name
       when 'scxml'
+        # If the initial tag <scxml> has a n  ame attribute, define it as the most outer super state
         if attributes['name']
           @scxml_state = true
-          state = nil
           @current_state = State.new
-          @current_state.id = attributes['name']
+          @current_state.id = attributes['id']
           @current_state.initial = attributes['initial']
           state = Statemachine::SuperstateBuilder.new(attributes['name'].to_sym, @subject, @statemachine)
-          if (@current_state.initial != nil)
+          # If the current state has an initial state defined, add it to the state created.
+          if @current_state.initial != nil
             state.startstate(@current_state.initial.to_sym)
           end
+          # Adds it to a list of "open" states
           @state.push(state)
         end
       when 'parallel'
-        @parallel = Statemachine::ParallelStateBuilder.new(attributes['id'].to_sym, @subject, @statemachine)
         @is_parallel = true
         # If there is a state that encapsulates the parallel state, change it to a superstate
-        if (not @state.empty? and @state.last.is_a? Statemachine::StateBuilder)
-              state = Statemachine::SuperstateBuilder.new(@state.last.subject.id, @state.last.subject.superstate, @state.last.subject.statemachine)
-              @state.pop            # pops the old one
-              @state.push(state)    # pushes the new one
+        if not @state.empty? and @state.last.is_a? Statemachine::StateBuilder
+          state = Statemachine::SuperstateBuilder.new(@state.last.subject.id, @state.last.subject.superstate, @state.last.subject.statemachine)
+          @state.pop            # pops the old one
+          @state.push(state)    # pushes the new one
+        end
+        if @state.empty?
+          @parallel = Statemachine::ParallelStateBuilder.new(attributes['id'].to_sym, @subject, @statemachine)
+        else
+          @parallel = Statemachine::ParallelStateBuilder.new(attributes['id'].to_sym, @state.last.subject, @statemachine)
         end
+
       when 'state'
         @current_state = State.new
         @current_state.id = attributes['id']
         @current_state.initial = attributes['initial']
-        if (@state.empty?)  # It is not a substate
-           if (@current_state.initial != nil) # AND it is a superstate
-             state = Statemachine::SuperstateBuilder.new(attributes['id'].to_sym, @subject, @statemachine)
-             state.startstate(@current_state.initial.to_sym)
-           else  # AND it is a state
-             state = Statemachine::StateBuilder.new(attributes['id'].to_sym, @subject, @statemachine)
-           end
-        else # It is a substate
-          if (@current_state.initial != nil) # AND it is a superstate
-            state = Statemachine::SuperstateBuilder.new(attributes['id'].to_sym, @state.last.subject, @statemachine)
+        if @state.empty?
+          # It is not a substate
+          if @current_state.initial != nil
+            # and it is a superstate
+            state = Statemachine::SuperstateBuilder.new(attributes['id'].to_sym, @subject, @statemachine)
             state.startstate(@current_state.initial.to_sym)
-          else # AND it is a subsubstate
-            if (@state.last.is_a? Statemachine::StateBuilder) # but it's parent is not a superstate yet
+          else
+            # and it is a state
+            state = Statemachine::StateBuilder.new(attributes['id'].to_sym, @subject, @statemachine)
+          end
+        else
+          #It is a substate
+          if @state.last.is_a? Statemachine::StateBuilder
+            # Its parent is not a superstate yet
+            if @is_parallel and @parallel_state.empty?
+              state = Statemachine::SuperstateBuilder.new(@state.last.subject.id, @parallel.subject, @state.last.subject.statemachine)
+            else
               state = Statemachine::SuperstateBuilder.new(@state.last.subject.id, @state.last.subject.superstate, @state.last.subject.statemachine)
-              @state.pop            # pops the old one
-              @state.push(state)    # pushes the new one
-              if @is_parallel
-                 @parallel_state.pop
-                 @parallel_state.push(state)
-              end
             end
-            state = Statemachine::StateBuilder.new(attributes['id'].to_sym, @state.last.subject, @statemachine)
+            @state.pop            # pops the old one
+            @state.push(state)    # pushes the new one
+            if @is_parallel
+              @parallel_state.pop
+              @parallel_state.push(state)
+            end
+          end
+          if @current_state.initial != nil
+            # and it is a superstate
+            if @is_parallel and @parallel_state.empty?
+              state = Statemachine::SuperstateBuilder.new(attributes['id'].to_sym, @parallel.subject, @statemachine)
+            else
+              state = Statemachine::SuperstateBuilder.new(attributes['id'].to_sym, @state.last.subject, @statemachine)
+            end
+            state.startstate(@current_state.initial.to_sym)
+          else
+            # and it is a state
+            if @is_parallel and @parallel_state.empty?
+              state = Statemachine::StateBuilder.new(attributes['id'].to_sym, @parallel.subject, @statemachine)
+            else
+              state = Statemachine::StateBuilder.new(attributes['id'].to_sym, @state.last.subject, @statemachine)
+            end
           end
         end
         @state.push(state)
         @parallel_state.push(state) if @is_parallel
       when 'transition'
         @current_transition = Transition.new
-        @current_transition.event = attributes['event']
-        @current_transition.target = attributes['target']
+        if attributes['target'] == @history_state.to_s and @history_state
+          @current_transition.target = attributes['target']+"_H"
+        else
+          @current_transition.target = attributes['target']
+        end
+        if attributes['event']
+          @current_transition.event = attributes['event']
+        else
+          @current_transition.event = nil
+        end
         if attributes['cond']
           @current_transition.cond = attributes['cond']
         else
@@ -121,74 +186,108 @@ class StatemachineParser < Statemachine::StatemachineBuilder
       when 'onentry'
       when 'onexit'
       when 'history'
-        @history=true
+        @history = true
         @history_states.push(@state.last.subject.id)
         @history_state = @state.last.subject.id
+      when 'if'
+        @if.push(true)
+        if @if.size >= 1
+          @if_actions_aux.push(@if_actions) if @if_actions.size != 0
+          @if_actions = []
+        end
+        @cond.push(attributes['cond'])
+        @tag.push("if")
+      when 'elseif'
+        creating_ifs
+        @cond.push(attributes['cond'])
+        @tag.push("elseif")
+      when 'else'
+        creating_ifs
+        @cond.push(true)
+        @tag.push("else")
       when 'log'
-        @actions.push(["log", attributes['expr']])
+        if @if.last
+          @if_actions.push(["log", attributes['expr']])
+        else
+          @actions.push(["log", attributes['expr']])
+        end
       when 'send'
-        @actions.push(["send", attributes['target'], attributes['event']])
+        if @if.last
+          @if_actions.push(["send", attributes['target'], attributes['event']])
+        else
+          @actions.push(["send", attributes['target'], attributes['event']])
+        end
       when 'invoke'
-        @actions.push(["invoke", attributes['src'].to_sym])
+        if @if.last
+          @if_actions.push(["invoke", attributes['src'].to_sym])
+        else
+          @actions.push(["invoke", attributes['src'].to_sym])
+        end
+      when 'script'
+        @script = true
+        @script_code = ""
       else
         @current_element = name
-      end
+    end
   end
 
+  # This function defines the actions to be taken for each different tag when the tag is closed
   def tag_end(name)
     case name
       when 'parallel'
         @statemachine.add_state(@parallel.subject)
         @is_parallel = false
       when 'state'
-        if (@state.last.is_a? Statemachine::SuperstateBuilder)
+        if @state.last.is_a? Statemachine::SuperstateBuilder
           s = statemachine.get_state(@state.last.subject.id)
 
-          # Changing the state's id
           if (s.id == @history_state)
-            s.id = (s.id.to_s + "_H").to_sym
-            s.default_history=@history_target.last.to_sym
-            @history_target.pop
+            if @history_target.last
+              s.default_history = @history_target.last.to_sym
+              @history_target.pop
+            end
           end
 
-          # Adds the superstate's transitions to all its substates
-          @substate.each{|j|
-            if (s)
+          # Every state belonging to this superstate should respond to the superstate's transitions
+          @substate.each do |j|
+            if s
               s1 = statemachine.get_state(j.subject.id)
-              s.transitions.each {|v,k|
-                if (s1)
-                  s1.add(k)
-                end
-              }
+              s.transitions.each do |k|
+                s1.add(k) if s1
+              end
             end
-          }
+          end
         end
+
         # In case of parallel statemachines the outmost states will become parallel statemachines
         # only considering parallel on a root level
-
         if @parallel_state.size == 1 and @parallel.is_a? Statemachine::ParallelStateBuilder
-          statemachine_aux = Statemachine::Statemachine.new(@parallel_state.last.subject)
+          statemachine_aux = Statemachine::Statemachine.new(@parallel.subject)
+          statemachine_aux.add_state(@parallel_state.last.subject)
+          @statemachine.remove_state(@parallel_state.last.subject)
           @substate.each do |j|
+            j.subject.modify_statemachine(statemachine_aux)
             statemachine_aux.add_state(j.subject)
             @statemachine.remove_state(j.subject)
           end
-          statemachine_aux.reset
+          #statemachine_aux.reset
           @parallel.subject.add_statemachine(statemachine_aux)
         end
+
         @substate.push(@state.last)
 
         if (@state.size == 1 and not @scxml_state) or (@state.size == 2 and @scxml_state) or (@parallel_state.size == 1)
           @substate = []
           # TODO make this better. Too inefficient
-          while (!(@history_states.size == 0))
+          while @history_states.size != 0
             # change every transitions where @history_states.last was the target state to history_states.last+"_H"
             # for every history state
             @statemachine.states.each_value do |s|
-               s.transitions.each_value do |t|
-                 if (t.destination_id == @history_states.last)
-                   t.destination_id = (t.destination_id.to_s + "_H").to_s
-                 end
-               end
+              s.transitions.each do |t|
+                if t.destination_id == @history_states.last
+                  t.destination_id = (t.destination_id.to_s + "_H").to_s
+                end
+              end
             end
             @history_states.pop
           end
@@ -196,30 +295,69 @@ class StatemachineParser < Statemachine::StatemachineBuilder
         @state.pop
         @parallel_state.pop if @is_parallel
       when 'transition'
-        if (@transitions.last.event == nil)
+        if @transitions.last.event == nil
           if @history
             @history_target.push(@transitions.last.target)
             @history = false
           else
-            # TODO spontaneous transitions
+            if @is_parallel and @parallel_state.empty?
+              @parallel.event(nil, @transitions.last.target.to_sym, @actions, @transitions.last.cond)
+            else
+              @state.last.event(nil, @transitions.last.target.to_sym, @actions, @transitions.last.cond)
+            end
           end
         else
-          if (@transitions.last.target != nil)     # if it has a target state
-            @state.last.event(@transitions.last.event.to_sym, @transitions.last.target.to_sym, @actions, @transitions.last.cond)
-          else                                     # it is its own target state
-            @state.last.event(@transitions.last.event.to_sym, @state.last.subject.id.to_sym, @actions, @transitions.last.cond)
+          if @transitions.last.target != nil
+            if @is_parallel and @parallel_state.empty?
+              @parallel.event(@transitions.last.event.to_sym, @transitions.last.target.to_sym, @actions, @transitions.last.cond)
+            else
+              @state.last.event(@transitions.last.event.to_sym, @transitions.last.target.to_sym, @actions, @transitions.last.cond)
+            end
+          else
+            # if it doesn't have a target state, it is its own target state
+            if @is_parallel and @parallel_state.empty?
+              @parallel.event(@transitions.last.event.to_sym, @state.last.subject.id.to_sym, @actions, @transitions.last.cond)
+            else
+              @state.last.event(@transitions.last.event.to_sym, @state.last.subject.id.to_sym, @actions, @transitions.last.cond)
+            end
           end
         end
         @actions=[]
         @transitions.pop
       when 'onentry'
-        @state.last.on_entry(@actions)
+        if @is_parallel and @parallel_state.empty?
+          @parallel.on_entry(@actions)
+        else
+          @state.last.on_entry(@actions)
+        end
         @actions=[]
       when 'onexit'
-        @state.last.on_exit(@actions)
+        if @is_parallel and @parallel_state.empty?
+          @parallel.on_exit(@actions)
+        else
+          @state.last.on_exit(@actions)
+        end
         @actions=[]
       when 'history'
         @history = false
+      when 'if'
+        creating_ifs
+        @if.pop
+      when 'script'
+        @script = false
+        if @if.last
+          @if_actions.push(["script", @script_code])
+        else
+          @actions.push(["script", @script_code])
+        end
+      else
+
+    end
+  end
+
+  def text(text)
+    if @script
+      @script_code += text
     end
   end