From 44d8aa74c171b53a7590787aae0bea74031c998f Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Tue, 12 Apr 2016 14:09:29 +0200
Subject: Give more descriptive names to test cases

Change-Id: I0f1929bf592206ad3a6164a50d9d933a6096741d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
---
 tests/auto/qscxmlc/data/badInitial.scxml           |  93 +++++
 tests/auto/qscxmlc/data/elseWithoutIf.scxml        | 164 +++++++++
 tests/auto/qscxmlc/data/elseWithoutIf10.scxml      | 374 +++++++++++++++++++++
 tests/auto/qscxmlc/data/elseWithoutIf2.scxml       | 164 +++++++++
 tests/auto/qscxmlc/data/elseWithoutIf3.scxml       | 163 +++++++++
 tests/auto/qscxmlc/data/elseWithoutIf4.scxml       | 165 +++++++++
 tests/auto/qscxmlc/data/elseWithoutIf5.scxml       | 374 +++++++++++++++++++++
 tests/auto/qscxmlc/data/elseWithoutIf6.scxml       | 374 +++++++++++++++++++++
 tests/auto/qscxmlc/data/elseWithoutIf7.scxml       | 374 +++++++++++++++++++++
 tests/auto/qscxmlc/data/elseWithoutIf8.scxml       | 374 +++++++++++++++++++++
 tests/auto/qscxmlc/data/elseWithoutIf9.scxml       | 374 +++++++++++++++++++++
 .../data/id000000sig11src000000opflip1pos24.scxml  | 164 ---------
 .../id000001sig11src000000opflip1pos7243.scxml     | 164 ---------
 .../id000002sig11src000000opflip1pos7244.scxml     | 164 ---------
 .../id000003sig11src000000opflip1pos7442.scxml     | 164 ---------
 .../id000004sig06src000000opflip4pos7335.scxml     | 164 ---------
 .../id000005sig11src000000opint8pos1val+0.scxml    | Bin 7821 -> 0 bytes
 .../data/id000006sig11src000000opext_AOpos1.scxml  | 164 ---------
 .../data/id000007sig11src000000ophavocrep8.scxml   | 164 ---------
 .../data/id000008sig11src000000ophavocrep4.scxml   | 164 ---------
 .../data/id000009sig11src000000ophavocrep2.scxml   | 163 ---------
 .../data/id000010sig11src000000ophavocrep1.scxml   | 165 ---------
 .../id000011sig11src000001opflip1pos2533.scxml     |  80 -----
 .../id000012sig06src000001opflip1pos2538.scxml     |  80 -----
 .../id000013sig11src000001opflip1pos2914.scxml     |  79 -----
 .../id000014sig11src000001opflip1pos2914.scxml     |  79 -----
 .../id000015sig11src000001opflip1pos2926.scxml     | Bin 3411 -> 0 bytes
 .../id000016sig06src000001opflip1pos2961.scxml     |  80 -----
 .../id000017sig11src000001opext_AOpos2931.scxml    |  79 -----
 .../id000018sig06src000001opext_AOpos2939.scxml    |  79 -----
 .../id000019sig11src000001opext_AOpos2940.scxml    |  80 -----
 .../data/id000020sig11src000001ophavocrep8.scxml   |  79 -----
 .../data/id000021sig11src000001ophavocrep8.scxml   |  79 -----
 .../data/id000022sig11src000001ophavocrep4.scxml   | Bin 3396 -> 0 bytes
 .../data/id000023sig06src000001ophavocrep4.scxml   |  78 -----
 .../data/id000024sig11src000001ophavocrep16.scxml  |  80 -----
 .../data/id000025sig06src000001ophavocrep8.scxml   | Bin 3411 -> 0 bytes
 .../id000026sig06src000003opext_AOpos2880.scxml    |  93 -----
 .../id000027sig11src000004opflip1pos2521.scxml     | 374 ---------------------
 .../id000028sig11src000004opflip1pos10502.scxml    | 374 ---------------------
 .../id000029sig11src000004opflip1pos10635.scxml    | 374 ---------------------
 .../id000030sig11src000004opflip1pos11452.scxml    | 374 ---------------------
 .../id000031sig11src000004opflip1pos12612.scxml    | 374 ---------------------
 .../id000032sig11src000004opflip1pos12831.scxml    | 374 ---------------------
 .../id000033sig06src000004opflip4pos10704.scxml    | 374 ---------------------
 tests/auto/qscxmlc/data/invalidAssign.scxml        | 164 +++++++++
 tests/auto/qscxmlc/data/invalidAssign2.scxml       | 164 +++++++++
 tests/auto/qscxmlc/data/invalidContent.scxml       |  79 +++++
 tests/auto/qscxmlc/data/invalidIf.scxml            | 164 +++++++++
 tests/auto/qscxmlc/data/invalidIf2.scxml           | 164 +++++++++
 tests/auto/qscxmlc/data/invalidInvoke.scxml        |  79 +++++
 tests/auto/qscxmlc/data/invalidInvoke2.scxml       |  79 +++++
 tests/auto/qscxmlc/data/invalidInvoke3.scxml       | Bin 0 -> 3411 bytes
 tests/auto/qscxmlc/data/invalidInvoke4.scxml       |  79 +++++
 tests/auto/qscxmlc/data/invalidRoot.scxml          | 164 +++++++++
 tests/auto/qscxmlc/data/invalidRoot2.scxml         |  78 +++++
 tests/auto/qscxmlc/data/invalidRoot3.scxml         | Bin 0 -> 3411 bytes
 tests/auto/qscxmlc/data/invalidRoot4.scxml         | 374 +++++++++++++++++++++
 tests/auto/qscxmlc/data/invalidScxml.scxml         |  80 +++++
 tests/auto/qscxmlc/data/invalidXmlHeader.scxml     | Bin 0 -> 7821 bytes
 tests/auto/qscxmlc/data/invalidXmlHeader2.scxml    | 164 +++++++++
 tests/auto/qscxmlc/data/noContentInInvoke.scxml    |  79 +++++
 tests/auto/qscxmlc/data/noContentInInvoke2.scxml   |  79 +++++
 tests/auto/qscxmlc/data/noContentInInvoke3.scxml   | Bin 0 -> 3396 bytes
 tests/auto/qscxmlc/data/noContentInInvoke4.scxml   |  80 +++++
 .../auto/qscxmlc/data/prematureEndOfDocument.scxml |  80 +++++
 .../qscxmlc/data/prematureEndOfDocument2.scxml     |  80 +++++
 tests/auto/qscxmlc/data/wrongRoot.scxml            |  80 +++++
 tests/auto/qscxmlc/tst_qscxmlc.qrc                 |  68 ++--
 69 files changed, 5337 insertions(+), 5337 deletions(-)
 create mode 100644 tests/auto/qscxmlc/data/badInitial.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf10.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf2.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf3.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf4.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf5.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf6.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf7.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf8.scxml
 create mode 100644 tests/auto/qscxmlc/data/elseWithoutIf9.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000000sig11src000000opflip1pos24.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000001sig11src000000opflip1pos7243.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000002sig11src000000opflip1pos7244.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000003sig11src000000opflip1pos7442.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000004sig06src000000opflip4pos7335.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000005sig11src000000opint8pos1val+0.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000006sig11src000000opext_AOpos1.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000007sig11src000000ophavocrep8.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000008sig11src000000ophavocrep4.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000009sig11src000000ophavocrep2.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000010sig11src000000ophavocrep1.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000011sig11src000001opflip1pos2533.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000012sig06src000001opflip1pos2538.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000013sig11src000001opflip1pos2914.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000014sig11src000001opflip1pos2914.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000015sig11src000001opflip1pos2926.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000016sig06src000001opflip1pos2961.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000017sig11src000001opext_AOpos2931.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000018sig06src000001opext_AOpos2939.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000019sig11src000001opext_AOpos2940.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000020sig11src000001ophavocrep8.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000021sig11src000001ophavocrep8.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000022sig11src000001ophavocrep4.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000023sig06src000001ophavocrep4.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000024sig11src000001ophavocrep16.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000025sig06src000001ophavocrep8.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000026sig06src000003opext_AOpos2880.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000027sig11src000004opflip1pos2521.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000028sig11src000004opflip1pos10502.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000029sig11src000004opflip1pos10635.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000030sig11src000004opflip1pos11452.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000031sig11src000004opflip1pos12612.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000032sig11src000004opflip1pos12831.scxml
 delete mode 100644 tests/auto/qscxmlc/data/id000033sig06src000004opflip4pos10704.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidAssign.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidAssign2.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidContent.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidIf.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidIf2.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidInvoke.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidInvoke2.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidInvoke3.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidInvoke4.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidRoot.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidRoot2.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidRoot3.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidRoot4.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidScxml.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidXmlHeader.scxml
 create mode 100644 tests/auto/qscxmlc/data/invalidXmlHeader2.scxml
 create mode 100644 tests/auto/qscxmlc/data/noContentInInvoke.scxml
 create mode 100644 tests/auto/qscxmlc/data/noContentInInvoke2.scxml
 create mode 100644 tests/auto/qscxmlc/data/noContentInInvoke3.scxml
 create mode 100644 tests/auto/qscxmlc/data/noContentInInvoke4.scxml
 create mode 100644 tests/auto/qscxmlc/data/prematureEndOfDocument.scxml
 create mode 100644 tests/auto/qscxmlc/data/prematureEndOfDocument2.scxml
 create mode 100644 tests/auto/qscxmlc/data/wrongRoot.scxml

(limited to 'tests')

diff --git a/tests/auto/qscxmlc/data/badInitial.scxml b/tests/auto/qscxmlc/data/badInitial.scxml
new file mode 100644
index 0000000..52dffce
--- /dev/null
+++ b/tests/auto/qscxmlc/data/badInitial.scxml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="MediaPlayerStateMachine"
+    initial="stopped"
+    datamodel="ecmascript"
+>
+    <datamodel>
+        <data id="media"/>
+    </datamodel>
+
+    <script>
+        function isValidMedia() {
+            var m = _event.data.media
+            return (m + "").length > 0
+        }
+    <initial>
+
+    <state id="stopped">
+        <transition event="tap" cond="isValidMedia()" target="playing"/>
+    </state>
+
+    <state id="playing">
+        <onentry>
+            <assign location="media" expr="_event.data.media"/>
+            <send type="qt:signal" event="playbackStarted">
+                <param name="media" expr="media"/>
+            </send>
+        </onentry>
+
+        <onexit>
+            <send type="qt:signal" event="playbackStopped">
+                <param name="media" expr="media"/>
+            </send>
+        </onexit>
+
+        <transition event="tap" cond="!isValidMedia() || media === _event.data.media" target="stopped"/>
+        <transition event="tap" cond="isValidMedia() &amp;&amp; media !== _event.data.media" target="playing"/>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf.scxml b/tests/auto/qscxmlc/data/elseWithoutIf.scxml
new file mode 100644
index 0000000..0674542
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf.scxml
@@ -0,0 +1,164 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transitifn event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+ location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            nameate>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_e:ent.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="shornt.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'." />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+  nsi                   <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assigZ location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf10.scxml b/tests/auto/qscxmlc/data/elseWithoutIf10.scxml
new file mode 100644
index 0000000..920fd84
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf10.scxml
@@ -0,0 +1,374 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: no -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       name="Pinball" datamodel="ecmascript">
+    <datamodel>
+        <data id="highScore" expr="0"/>
+        <data id="score" expr="0"/>
+    </datamodel>
+    <parallel id="global">
+        <parallel id="guiControl">
+            <state id="cLight">
+                <state id="cLightOn">
+                    <transition event="turnOffC" target="cLightOff"/>
+                </state>
+                <state id="cLightOff">
+                    <transition event="turnOnC" target="cLightOn"/>
+                </state>
+            </state>
+            <state id="rLight">
+                <state id="rLightOn">
+                    <transition event="turnOffR" target="rLightOff"/>
+                </state>
+                <state id="rLightOff">
+                    <transition event="turnOnR" target="rLightOn"/>
+                </state>
+            </state>
+            <state id="aLight">
+                <state id="aLightOn">
+                    <transition event="turnOffA" target="aLightOff"/>
+                </state>
+                <state id="aLightOff">
+                    <transition event="turnOnA" target="aLightOn"/>
+                </state>
+            </state>
+            <state id="zLight">
+                <state id="zLightOn">
+                    <transition event="turnOffZ" target="zLightOff"/>
+                </state>
+                <state id="zLightOff">
+                    <transition event="turnOnZ" target="zLightOn"/>
+                </state>
+            </state>
+            <state id="yLight">
+                <state id="yLightOn">
+                    <transition event="turnOffY" target="yLightOff"/>
+                </state>
+                <state id="yLightOff">
+                    <transition event="turnOnY" target="yLightOn"/>
+                </state>
+            </state>
+            <state id="hurryLight">
+                <state id="hurryLightOn">
+                    <transition event="turnOffHurry" target="hurryLightOff"/>
+                </state>
+                <state id="hurryLightOff">
+                    <transition event="turnOnHurry" target="hurryLightOn"/>
+                </state>
+            </state>
+            <state id="jackpotLight">
+                <state id="jackpotLightOn">
+                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
+                </state>
+                <state id="jackpotLightOff">
+                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
+                </state>
+            </state>
+            <state id="gameOverLight">
+                <state id="gameOverLightOn">
+                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
+                </state>
+                <state id="gameOverLightOff">
+                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
+                </state>
+            </state>
+        </parallel>
+
+        <parallel id="internalState">
+            <parallel id="logicalState">
+                <state id="letterState">
+                    <parallel id="lettersState">
+                        <state id="letter.C">
+                            <state id="cLetterOff">
+                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
+                            </state>
+                            <final id="cLetterOn"/>
+                        </state>
+                        <state id="letter.R">
+                            <state id="rLetterOff">
+                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
+                            </state>
+                            <final id="rLetterOn"/>
+                        </state>
+                        <state id="letter.A">
+                            <state id="aLetterOff">
+                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
+                            </state>
+                            <final id="aLetterOn"/>
+                        </state>
+                        <state id="letter.Z">
+                            <state id="zLetterOff">
+                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
+                            </state>
+                            <final id="zLetterOn"/>
+                        </state>
+                        <state id="letter.Y">
+                            <state id="yLetterOff">
+                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
+                            </state>
+                            <final id="yLetterOn"/>
+                        </state>
+                        <transition event="resetLetters" target="lettersState"/>
+                    </parallel>
+                </state>
+                <state id="modeState">
+                    <state id="offState">
+                        <onentry>
+                            <if cond="highScore &lt; score">
+                                <assign location="highScore" expr="score"/>
+                            </if>
+                            <raise event="resetLetters"/>
+                            <raise event="update"/>
+                        </onentry>
+                        <transition event="startTriggered" target="onState"/>
+                    </state>
+                    <parallel id="onState">
+                        <onentry>
+                            <assign location="score" expr="0"/>
+                        </onentry>
+                        <state id="hurryState">
+                            <state id="hurryStateOff">
+                                <onentry>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOn" target="hurryStateOn"/>
+                            </state>
+                            <state id="hurryStateOn">
+                                <onentry>
+                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOff" target="hurryStateOff"/>
+                                <onexit>
+                                    <cancel sendid="hurryId"/>
+                                </onexit>
+                            </state>
+                        </state>
+                        <state id="jackpotState">
+                            <state id="jackpotStateOff">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goForJackpot" target="jackpotStateOn"/>
+                            </state>
+                            <state id="jackpotStateOn">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                            </state>
+                        </state>
+                        <transition event="ballOutTriggered" target="offState"/>
+                    </parallel>
+                </state>
+            </parallel>
+
+            <state id="workflow">
+                <state id="lightImpulseGenerator">
+                    <state id="lightImpulseOn"/>
+                    <state id="lightImpulseOff"/>
+
+                    <onentry>
+                        <raise event="update"/>
+                    </onentry>
+
+                    <transition event="scheduleNewImpulse">
+                        <cancel sendid="lightId"/>
+                        <if cond="In('offState')">
+                            <send event="lightImpulse" id="lightId" delay="1s"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <send>event="lightImpulse" id="lightId" delay="500ms"/>
+                        <else/>
+                            <send event="lightImpulse" id="lightId" delay="200ms"/>
+                        </if>
+                    </transition>
+
+                    <transition event="update">
+                        <raise event="scheduleNewImpulse"/>
+                        <raise event="updateLights"/>
+                    </transition>
+
+                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
+                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
+                </state>
+
+                <transition event="done.state.letter.*">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 1000"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 10000"/>
+                    </if>
+                    <raise event="updateLights"/>
+                </transition>
+
+                <transition event="done.state.lettersState">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 100000"/>
+                        <raise event="goToHurryOn"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 1000000"/>
+                        <raise event="goToHurryOff"/>
+                        <raise event="goForJackpot"/>
+                    </if>
+                </transition>
+
+                <transition event="updateLights">
+                    <send type="qt:signal" event="updateScore">
+                        <param name="highScore" expr="highScore"/>
+                        <param name="score" expr="score"/>
+                    </send>
+                    <if cond="In('jackpotStateOn')">
+                        <raise event="turnOnJackpot"/>
+                    <else/>
+                        <raise event="turnOffJackpot"/>
+                    </if>
+
+                    <if cond="In('lightImpulseOn')">
+                        <if cond="In('offState')">
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOnJackpot"/>
+                            <raise event="turnOnGameOver"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        <else/>
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        </if>
+                    <else/>
+                        <if cond="In('offState')">
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffJackpot"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                        <else/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                        </if>
+                        <raise event="turnOffHurry"/>
+                        <raise event="turnOffGameOver"/>
+                    </if>
+                </transition>
+            </state>
+        </parallel>
+    </parallel>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf2.scxml b/tests/auto/qscxmlc/data/elseWithoutIf2.scxml
new file mode 100644
index 0000000..830831f
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf2.scxml
@@ -0,0 +1,164 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="O" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+  id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="o]erand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assige location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf3.scxml b/tests/auto/qscxmlc/data/elseWithoutIf3.scxml
new file mode 100644
index 0000000..beca8f6
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf3.scxml
@@ -0,0 +1,163 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+    <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elsDif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf4.scxml b/tests/auto/qscxmlc/data/elseWithoutIf4.scxml
new file mode 100644
index 0000000..8e8018d
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf4.scxml
@@ -0,0 +1,165 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+  <state id="zero1">
+       tion="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf5.scxml b/tests/auto/qscxmlc/data/elseWithoutIf5.scxml
new file mode 100644
index 0000000..47af4f3
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf5.scxml
@@ -0,0 +1,374 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: no -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       name="Pinball" datamodel="ecmascript">
+    <datamodel>
+        <data id="highScore" expr="0"/>
+        <data id="score" expr="0"/>
+    </datamodel>
+    <parallel id="global">
+        <parallel id="guiControl">
+            <state id="cLight">
+                <state id="cLightOn">
+                    <transition event="turnOffC" target="cLightOff"/>
+                </state>
+                <state id="cLightOff">
+                    <transition event="turnOnC" target="cLightOn"/>
+                </state>
+            </state>
+            <state id="rLight">
+                <state id="rLightOn">
+                    <transition event="turnOffR" target="rLightOff"/>
+                </state>
+                <state id="rLightOff">
+                    <transition event="turnOnR" target="rLightOn"/>
+                </state>
+            </state>
+            <state id="aLight">
+                <state id="aLightOn">
+                    <transition event="turnOffA" target="aLightOff"/>
+                </state>
+                <state id="aLightOff">
+                    <transition event="turnOnA" target="aLightOn"/>
+                </state>
+            </state>
+            <state id="zLight">
+                <state id="zLightOn">
+                    <transition event="turnOffZ" target="zLightOff"/>
+                </state>
+                <state id="zLightOff">
+                    <transition event="turnOnZ" target="zLightOn"/>
+                </state>
+            </state>
+            <state id="yLight">
+                <state id="yLightOn">
+                    <transition event="turnOffY" target="yLightOff"/>
+                </state>
+                <state id="yLightOff">
+                    <transition event="turnOnY" target="yLightOn"/>
+                </state>
+            </state>
+            <state id="hurryLight">
+                <state id="hurryLightOn">
+                    <transition event="turnOffHurry" target="hurryLightOff"/>
+                </state>
+                <state id="hurryLightOff">
+                    <transition event="turnOnHurry" target="hurryLightOn"/>
+                </state>
+            </state>
+            <state id="jackpotLight">
+                <state id="jackpotLightOn">
+                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
+                </state>
+                <state id="jackpotLightOff">
+                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
+                </state>
+            </state>
+            <state id="gameOverLight">
+                <state id="gameOverLightOn">
+                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
+                </state>
+                <state id="gameOverLightOff">
+                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
+                </state>
+            </state>
+        </parallel>
+
+        <parallel id="internalState">
+            <parallel id="logicalState">
+                <state id="letterState">
+                    <parallel id="lettersState">
+                        <state id="letter.C">
+                            <state id="cLetterOff">
+                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
+                            </state>
+                            <final id="cLetterOn"/>
+                        </state>
+                        <state id="letter.R">
+                            <state id="rLetterOff">
+                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
+                            </state>
+                            <final id="rLetterOn"/>
+                        </state>
+                        <state id="letter.A">
+                            <state id="aLetterOff">
+                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
+                            </state>
+                            <final id="aLetterOn"/>
+                        </state>
+                        <state id="letter.Z">
+                            <state id="zLetterOff">
+                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
+                            </state>
+                            <final id="zLetterOn"/>
+                        </state>
+                        <state id="letter.Y">
+                            <state id="yLetterOff">
+                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
+                            </state>
+                            <final id="yLetterOn"/>
+                        </state>
+                        <transition event="resetLetters" target="lettersState"/>
+                    </parallel>
+                </state>
+                <state id="modeState">
+                    <state id="offState">
+                        <onentry>
+                            <if cond="highScore &lt; score">
+                                <assign location="highScore" expr="score"/>
+                            </if>
+                            <raise event="resetLetters"/>
+                            <raise event="update"/>
+                        </onentry>
+                        <transition event="startTriggered" target="onState"/>
+                    </state>
+                    <parallel id="onState">
+                        <onentry>
+                            <assign location="score" expr="0"/>
+                        </onentry>
+                        <state id="hurryState">
+                            <state id="hurryStateOff">
+                                <onentry>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOn" target="hurryStateOn"/>
+                            </state>
+                            <state id="hurryStateOn">
+                                <onentry>
+                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOff" target="hurryStateOff"/>
+                                <onexit>
+                                    <cancel sendid="hurryId"/>
+                                </onexit>
+                            </state>
+                        </state>
+                        <state id="jackpotState">
+                            <state id="jackpotStateOff">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goForJackpot" target="jackpotStateOn"/>
+                            </state>
+                            <state id="jackpotStateOn">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                            </state>
+                        </state>
+                        <transition event="ballOutTriggered" target="offState"/>
+                    </parallel>
+                </state>
+            </parallel>
+
+            <state id="workflow">
+                <state id="lightImpulseGenerator">
+                    <state id="lightImpulseOn"/>
+                    <state id="lightImpulseOff"/>
+
+                    <onentry>
+                        <raise event="update"/>
+                    </onentry>
+
+                    <transition event="scheduleNewImpulse">
+                        <cancel sendid="lightId"/>
+                        |if cond="In('offState')">
+                            <send event="lightImpulse" id="lightId" delay="1s"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <send event="lightImpulse" id="lightId" delay="500ms"/>
+                        <else/>
+                            <send event="lightImpulse" id="lightId" delay="200ms"/>
+                        </if>
+                    </transition>
+
+                    <transition event="update">
+                        <raise event="scheduleNewImpulse"/>
+                        <raise event="updateLights"/>
+                    </transition>
+
+                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
+                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
+                </state>
+
+                <transition event="done.state.letter.*">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 1000"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 10000"/>
+                    </if>
+                    <raise event="updateLights"/>
+                </transition>
+
+                <transition event="done.state.lettersState">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 100000"/>
+                        <raise event="goToHurryOn"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 1000000"/>
+                        <raise event="goToHurryOff"/>
+                        <raise event="goForJackpot"/>
+                    </if>
+                </transition>
+
+                <transition event="updateLights">
+                    <send type="qt:signal" event="updateScore">
+                        <param name="highScore" expr="highScore"/>
+                        <param name="score" expr="score"/>
+                    </send>
+                    <if cond="In('jackpotStateOn')">
+                        <raise event="turnOnJackpot"/>
+                    <else/>
+                        <raise event="turnOffJackpot"/>
+                    </if>
+
+                    <if cond="In('lightImpulseOn')">
+                        <if cond="In('offState')">
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOnJackpot"/>
+                            <raise event="turnOnGameOver"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        <else/>
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        </if>
+                    <else/>
+                        <if cond="In('offState')">
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffJackpot"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                        <else/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                        </if>
+                        <raise event="turnOffHurry"/>
+                        <raise event="turnOffGameOver"/>
+                    </if>
+                </transition>
+            </state>
+        </parallel>
+    </parallel>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf6.scxml b/tests/auto/qscxmlc/data/elseWithoutIf6.scxml
new file mode 100644
index 0000000..beaf539
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf6.scxml
@@ -0,0 +1,374 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: no -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       name="Pinball" datamodel="ecmascript">
+    <datamodel>
+        <data id="highScore" expr="0"/>
+        <data id="score" expr="0"/>
+    </datamodel>
+    <parallel id="global">
+        <parallel id="guiControl">
+            <state id="cLight">
+                <state id="cLightOn">
+                    <transition event="turnOffC" target="cLightOff"/>
+                </state>
+                <state id="cLightOff">
+                    <transition event="turnOnC" target="cLightOn"/>
+                </state>
+            </state>
+            <state id="rLight">
+                <state id="rLightOn">
+                    <transition event="turnOffR" target="rLightOff"/>
+                </state>
+                <state id="rLightOff">
+                    <transition event="turnOnR" target="rLightOn"/>
+                </state>
+            </state>
+            <state id="aLight">
+                <state id="aLightOn">
+                    <transition event="turnOffA" target="aLightOff"/>
+                </state>
+                <state id="aLightOff">
+                    <transition event="turnOnA" target="aLightOn"/>
+                </state>
+            </state>
+            <state id="zLight">
+                <state id="zLightOn">
+                    <transition event="turnOffZ" target="zLightOff"/>
+                </state>
+                <state id="zLightOff">
+                    <transition event="turnOnZ" target="zLightOn"/>
+                </state>
+            </state>
+            <state id="yLight">
+                <state id="yLightOn">
+                    <transition event="turnOffY" target="yLightOff"/>
+                </state>
+                <state id="yLightOff">
+                    <transition event="turnOnY" target="yLightOn"/>
+                </state>
+            </state>
+            <state id="hurryLight">
+                <state id="hurryLightOn">
+                    <transition event="turnOffHurry" target="hurryLightOff"/>
+                </state>
+                <state id="hurryLightOff">
+                    <transition event="turnOnHurry" target="hurryLightOn"/>
+                </state>
+            </state>
+            <state id="jackpotLight">
+                <state id="jackpotLightOn">
+                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
+                </state>
+                <state id="jackpotLightOff">
+                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
+                </state>
+            </state>
+            <state id="gameOverLight">
+                <state id="gameOverLightOn">
+                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
+                </state>
+                <state id="gameOverLightOff">
+                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
+                </state>
+            </state>
+        </parallel>
+
+        <parallel id="internalState">
+            <parallel id="logicalState">
+                <state id="letterState">
+                    <parallel id="lettersState">
+                        <state id="letter.C">
+                            <state id="cLetterOff">
+                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
+                            </state>
+                            <final id="cLetterOn"/>
+                        </state>
+                        <state id="letter.R">
+                            <state id="rLetterOff">
+                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
+                            </state>
+                            <final id="rLetterOn"/>
+                        </state>
+                        <state id="letter.A">
+                            <state id="aLetterOff">
+                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
+                            </state>
+                            <final id="aLetterOn"/>
+                        </state>
+                        <state id="letter.Z">
+                            <state id="zLetterOff">
+                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
+                            </state>
+                            <final id="zLetterOn"/>
+                        </state>
+                        <state id="letter.Y">
+                            <state id="yLetterOff">
+                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
+                            </state>
+                            <final id="yLetterOn"/>
+                        </state>
+                        <transition event="resetLetters" target="lettersState"/>
+                    </parallel>
+                </state>
+                <state id="modeState">
+                    <state id="offState">
+                        <onentry>
+                            <if cond="highScore &lt; score">
+                                <assign location="highScore" expr="score"/>
+                            </if>
+                            <raise event="resetLetters"/>
+                            <raise event="update"/>
+                        </onentry>
+                        <transition event="startTriggered" target="onState"/>
+                    </state>
+                    <parallel id="onState">
+                        <onentry>
+                            <assign location="score" expr="0"/>
+                        </onentry>
+                        <state id="hurryState">
+                            <state id="hurryStateOff">
+                                <onentry>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOn" target="hurryStateOn"/>
+                            </state>
+                            <state id="hurryStateOn">
+                                <onentry>
+                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOff" target="hurryStateOff"/>
+                                <onexit>
+                                    <cancel sendid="hurryId"/>
+                                </onexit>
+                            </state>
+                        </state>
+                        <state id="jackpotState">
+                            <state id="jackpotStateOff">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goForJackpot" target="jackpotStateOn"/>
+                            </state>
+                            <state id="jackpotStateOn">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                            </state>
+                        </state>
+                        <transition event="ballOutTriggered" target="offState"/>
+                    </parallel>
+                </state>
+            </parallel>
+
+            <state id="workflow">
+                <state id="lightImpulseGenerator">
+                    <state id="lightImpulseOn"/>
+                    <state id="lightImpulseOff"/>
+
+                    <onentry>
+                        <raise event="update"/>
+                    </onentry>
+
+                    <transition event="scheduleNewImpulse">
+                        <cancel sendid="lightId"/>
+                        <if cond="In('offState')">
+                            <send event="lightImpulse" id="lightId" delay="1s"/>
+                        <Elseif cond="In('hurryStateOff')"/>
+                            <send event="lightImpulse" id="lightId" delay="500ms"/>
+                        <else/>
+                            <send event="lightImpulse" id="lightId" delay="200ms"/>
+                        </if>
+                    </transition>
+
+                    <transition event="update">
+                        <raise event="scheduleNewImpulse"/>
+                        <raise event="updateLights"/>
+                    </transition>
+
+                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
+                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
+                </state>
+
+                <transition event="done.state.letter.*">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 1000"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 10000"/>
+                    </if>
+                    <raise event="updateLights"/>
+                </transition>
+
+                <transition event="done.state.lettersState">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 100000"/>
+                        <raise event="goToHurryOn"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 1000000"/>
+                        <raise event="goToHurryOff"/>
+                        <raise event="goForJackpot"/>
+                    </if>
+                </transition>
+
+                <transition event="updateLights">
+                    <send type="qt:signal" event="updateScore">
+                        <param name="highScore" expr="highScore"/>
+                        <param name="score" expr="score"/>
+                    </send>
+                    <if cond="In('jackpotStateOn')">
+                        <raise event="turnOnJackpot"/>
+                    <else/>
+                        <raise event="turnOffJackpot"/>
+                    </if>
+
+                    <if cond="In('lightImpulseOn')">
+                        <if cond="In('offState')">
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOnJackpot"/>
+                            <raise event="turnOnGameOver"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        <else/>
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        </if>
+                    <else/>
+                        <if cond="In('offState')">
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffJackpot"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                        <else/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                        </if>
+                        <raise event="turnOffHurry"/>
+                        <raise event="turnOffGameOver"/>
+                    </if>
+                </transition>
+            </state>
+        </parallel>
+    </parallel>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf7.scxml b/tests/auto/qscxmlc/data/elseWithoutIf7.scxml
new file mode 100644
index 0000000..21bfe08
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf7.scxml
@@ -0,0 +1,374 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: no -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       name="Pinball" datamodel="ecmascript">
+    <datamodel>
+        <data id="highScore" expr="0"/>
+        <data id="score" expr="0"/>
+    </datamodel>
+    <parallel id="global">
+        <parallel id="guiControl">
+            <state id="cLight">
+                <state id="cLightOn">
+                    <transition event="turnOffC" target="cLightOff"/>
+                </state>
+                <state id="cLightOff">
+                    <transition event="turnOnC" target="cLightOn"/>
+                </state>
+            </state>
+            <state id="rLight">
+                <state id="rLightOn">
+                    <transition event="turnOffR" target="rLightOff"/>
+                </state>
+                <state id="rLightOff">
+                    <transition event="turnOnR" target="rLightOn"/>
+                </state>
+            </state>
+            <state id="aLight">
+                <state id="aLightOn">
+                    <transition event="turnOffA" target="aLightOff"/>
+                </state>
+                <state id="aLightOff">
+                    <transition event="turnOnA" target="aLightOn"/>
+                </state>
+            </state>
+            <state id="zLight">
+                <state id="zLightOn">
+                    <transition event="turnOffZ" target="zLightOff"/>
+                </state>
+                <state id="zLightOff">
+                    <transition event="turnOnZ" target="zLightOn"/>
+                </state>
+            </state>
+            <state id="yLight">
+                <state id="yLightOn">
+                    <transition event="turnOffY" target="yLightOff"/>
+                </state>
+                <state id="yLightOff">
+                    <transition event="turnOnY" target="yLightOn"/>
+                </state>
+            </state>
+            <state id="hurryLight">
+                <state id="hurryLightOn">
+                    <transition event="turnOffHurry" target="hurryLightOff"/>
+                </state>
+                <state id="hurryLightOff">
+                    <transition event="turnOnHurry" target="hurryLightOn"/>
+                </state>
+            </state>
+            <state id="jackpotLight">
+                <state id="jackpotLightOn">
+                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
+                </state>
+                <state id="jackpotLightOff">
+                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
+                </state>
+            </state>
+            <state id="gameOverLight">
+                <state id="gameOverLightOn">
+                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
+                </state>
+                <state id="gameOverLightOff">
+                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
+                </state>
+            </state>
+        </parallel>
+
+        <parallel id="internalState">
+            <parallel id="logicalState">
+                <state id="letterState">
+                    <parallel id="lettersState">
+                        <state id="letter.C">
+                            <state id="cLetterOff">
+                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
+                            </state>
+                            <final id="cLetterOn"/>
+                        </state>
+                        <state id="letter.R">
+                            <state id="rLetterOff">
+                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
+                            </state>
+                            <final id="rLetterOn"/>
+                        </state>
+                        <state id="letter.A">
+                            <state id="aLetterOff">
+                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
+                            </state>
+                            <final id="aLetterOn"/>
+                        </state>
+                        <state id="letter.Z">
+                            <state id="zLetterOff">
+                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
+                            </state>
+                            <final id="zLetterOn"/>
+                        </state>
+                        <state id="letter.Y">
+                            <state id="yLetterOff">
+                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
+                            </state>
+                            <final id="yLetterOn"/>
+                        </state>
+                        <transition event="resetLetters" target="lettersState"/>
+                    </parallel>
+                </state>
+                <state id="modeState">
+                    <state id="offState">
+                        <onentry>
+                            <if cond="highScore &lt; score">
+                                <assign location="highScore" expr="score"/>
+                            </if>
+                            <raise event="resetLetters"/>
+                            <raise event="update"/>
+                        </onentry>
+                        <transition event="startTriggered" target="onState"/>
+                    </state>
+                    <parallel id="onState">
+                        <onentry>
+                            <assign location="score" expr="0"/>
+                        </onentry>
+                        <state id="hurryState">
+                            <state id="hurryStateOff">
+                                <onentry>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOn" target="hurryStateOn"/>
+                            </state>
+                            <state id="hurryStateOn">
+                                <onentry>
+                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOff" target="hurryStateOff"/>
+                                <onexit>
+                                    <cancel sendid="hurryId"/>
+                                </onexit>
+                            </state>
+                        </state>
+                        <state id="jackpotState">
+                            <state id="jackpotStateOff">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goForJackpot" target="jackpotStateOn"/>
+                            </state>
+                            <state id="jackpotStateOn">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                            </state>
+                        </state>
+                        <transition event="ballOutTriggered" target="offState"/>
+                    </parallel>
+                </state>
+            </parallel>
+
+            <state id="workflow">
+                <state id="lightImpulseGenerator">
+                    <state id="lightImpulseOn"/>
+                    <state id="lightImpulseOff"/>
+
+                    <onentry>
+                        <raise event="update"/>
+                    </onentry>
+
+                    <transition event="scheduleNewImpulse">
+                        <cancel sendid="lightId"/>
+                        <if cond="In('offState')">
+                            <send event="lightImpulse" id="lightId" delay="1s"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <send event="lightImpulse" id="lightId" delay="500ms"/>
+                        <else/>
+                            <send event="lightImpulse" id="lightId" delay="200ms"/>
+                        </if>
+                    </transition>
+
+                    <transition event="update">
+                        <raise event="scheduleNewImpulse"/>
+                        <raise event="updateLights"/>
+                    </transition>
+
+                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
+                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
+                </state>
+
+                <transition event="done.state.letter.*">
+                    |if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 1000"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 10000"/>
+                    </if>
+                    <raise event="updateLights"/>
+                </transition>
+
+                <transition event="done.state.lettersState">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 100000"/>
+                        <raise event="goToHurryOn"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 1000000"/>
+                        <raise event="goToHurryOff"/>
+                        <raise event="goForJackpot"/>
+                    </if>
+                </transition>
+
+                <transition event="updateLights">
+                    <send type="qt:signal" event="updateScore">
+                        <param name="highScore" expr="highScore"/>
+                        <param name="score" expr="score"/>
+                    </send>
+                    <if cond="In('jackpotStateOn')">
+                        <raise event="turnOnJackpot"/>
+                    <else/>
+                        <raise event="turnOffJackpot"/>
+                    </if>
+
+                    <if cond="In('lightImpulseOn')">
+                        <if cond="In('offState')">
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOnJackpot"/>
+                            <raise event="turnOnGameOver"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        <else/>
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        </if>
+                    <else/>
+                        <if cond="In('offState')">
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffJackpot"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                        <else/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                        </if>
+                        <raise event="turnOffHurry"/>
+                        <raise event="turnOffGameOver"/>
+                    </if>
+                </transition>
+            </state>
+        </parallel>
+    </parallel>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf8.scxml b/tests/auto/qscxmlc/data/elseWithoutIf8.scxml
new file mode 100644
index 0000000..b49bd32
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf8.scxml
@@ -0,0 +1,374 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: no -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       name="Pinball" datamodel="ecmascript">
+    <datamodel>
+        <data id="highScore" expr="0"/>
+        <data id="score" expr="0"/>
+    </datamodel>
+    <parallel id="global">
+        <parallel id="guiControl">
+            <state id="cLight">
+                <state id="cLightOn">
+                    <transition event="turnOffC" target="cLightOff"/>
+                </state>
+                <state id="cLightOff">
+                    <transition event="turnOnC" target="cLightOn"/>
+                </state>
+            </state>
+            <state id="rLight">
+                <state id="rLightOn">
+                    <transition event="turnOffR" target="rLightOff"/>
+                </state>
+                <state id="rLightOff">
+                    <transition event="turnOnR" target="rLightOn"/>
+                </state>
+            </state>
+            <state id="aLight">
+                <state id="aLightOn">
+                    <transition event="turnOffA" target="aLightOff"/>
+                </state>
+                <state id="aLightOff">
+                    <transition event="turnOnA" target="aLightOn"/>
+                </state>
+            </state>
+            <state id="zLight">
+                <state id="zLightOn">
+                    <transition event="turnOffZ" target="zLightOff"/>
+                </state>
+                <state id="zLightOff">
+                    <transition event="turnOnZ" target="zLightOn"/>
+                </state>
+            </state>
+            <state id="yLight">
+                <state id="yLightOn">
+                    <transition event="turnOffY" target="yLightOff"/>
+                </state>
+                <state id="yLightOff">
+                    <transition event="turnOnY" target="yLightOn"/>
+                </state>
+            </state>
+            <state id="hurryLight">
+                <state id="hurryLightOn">
+                    <transition event="turnOffHurry" target="hurryLightOff"/>
+                </state>
+                <state id="hurryLightOff">
+                    <transition event="turnOnHurry" target="hurryLightOn"/>
+                </state>
+            </state>
+            <state id="jackpotLight">
+                <state id="jackpotLightOn">
+                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
+                </state>
+                <state id="jackpotLightOff">
+                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
+                </state>
+            </state>
+            <state id="gameOverLight">
+                <state id="gameOverLightOn">
+                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
+                </state>
+                <state id="gameOverLightOff">
+                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
+                </state>
+            </state>
+        </parallel>
+
+        <parallel id="internalState">
+            <parallel id="logicalState">
+                <state id="letterState">
+                    <parallel id="lettersState">
+                        <state id="letter.C">
+                            <state id="cLetterOff">
+                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
+                            </state>
+                            <final id="cLetterOn"/>
+                        </state>
+                        <state id="letter.R">
+                            <state id="rLetterOff">
+                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
+                            </state>
+                            <final id="rLetterOn"/>
+                        </state>
+                        <state id="letter.A">
+                            <state id="aLetterOff">
+                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
+                            </state>
+                            <final id="aLetterOn"/>
+                        </state>
+                        <state id="letter.Z">
+                            <state id="zLetterOff">
+                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
+                            </state>
+                            <final id="zLetterOn"/>
+                        </state>
+                        <state id="letter.Y">
+                            <state id="yLetterOff">
+                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
+                            </state>
+                            <final id="yLetterOn"/>
+                        </state>
+                        <transition event="resetLetters" target="lettersState"/>
+                    </parallel>
+                </state>
+                <state id="modeState">
+                    <state id="offState">
+                        <onentry>
+                            <if cond="highScore &lt; score">
+                                <assign location="highScore" expr="score"/>
+                            </if>
+                            <raise event="resetLetters"/>
+                            <raise event="update"/>
+                        </onentry>
+                        <transition event="startTriggered" target="onState"/>
+                    </state>
+                    <parallel id="onState">
+                        <onentry>
+                            <assign location="score" expr="0"/>
+                        </onentry>
+                        <state id="hurryState">
+                            <state id="hurryStateOff">
+                                <onentry>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOn" target="hurryStateOn"/>
+                            </state>
+                            <state id="hurryStateOn">
+                                <onentry>
+                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOff" target="hurryStateOff"/>
+                                <onexit>
+                                    <cancel sendid="hurryId"/>
+                                </onexit>
+                            </state>
+                        </state>
+                        <state id="jackpotState">
+                            <state id="jackpotStateOff">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goForJackpot" target="jackpotStateOn"/>
+                            </state>
+                            <state id="jackpotStateOn">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                            </state>
+                        </state>
+                        <transition event="ballOutTriggered" target="offState"/>
+                    </parallel>
+                </state>
+            </parallel>
+
+            <state id="workflow">
+                <state id="lightImpulseGenerator">
+                    <state id="lightImpulseOn"/>
+                    <state id="lightImpulseOff"/>
+
+                    <onentry>
+                        <raise event="update"/>
+                    </onentry>
+
+                    <transition event="scheduleNewImpulse">
+                        <cancel sendid="lightId"/>
+                        <if cond="In('offState')">
+                            <send event="lightImpulse" id="lightId" delay="1s"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <send event="lightImpulse" id="lightId" delay="500ms"/>
+                        <else/>
+                            <send event="lightImpulse" id="lightId" delay="200ms"/>
+                        </if>
+                    </transition>
+
+                    <transition event="update">
+                        <raise event="scheduleNewImpulse"/>
+                        <raise event="updateLights"/>
+                    </transition>
+
+                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
+                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
+                </state>
+
+                <transition event="done.state.letter.*">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 1000"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 10000"/>
+                    </if>
+                    <raise event="updateLights"/>
+                </transition>
+
+                <transition event="done.state.lettersState">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 100000"/>
+                        <raise event="goToHurryOn"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 1000000"/>
+                        <raise event="goToHurryOff"/>
+                        <raise event="goForJackpot"/>
+                    </if>
+                </transition>
+
+                <transition event="updateLights">
+                    <send type="qt:signal" event="updateScore">
+                        <param name="highScore" expr="highScore"/>
+                        <param name="score" expr="score"/>
+                    </send>
+                    |if cond="In('jackpotStateOn')">
+                        <raise event="turnOnJackpot"/>
+                    <else/>
+                        <raise event="turnOffJackpot"/>
+                    </if>
+
+                    <if cond="In('lightImpulseOn')">
+                        <if cond="In('offState')">
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOnJackpot"/>
+                            <raise event="turnOnGameOver"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        <else/>
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        </if>
+                    <else/>
+                        <if cond="In('offState')">
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffJackpot"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                        <else/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                        </if>
+                        <raise event="turnOffHurry"/>
+                        <raise event="turnOffGameOver"/>
+                    </if>
+                </transition>
+            </state>
+        </parallel>
+    </parallel>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/elseWithoutIf9.scxml b/tests/auto/qscxmlc/data/elseWithoutIf9.scxml
new file mode 100644
index 0000000..b753246
--- /dev/null
+++ b/tests/auto/qscxmlc/data/elseWithoutIf9.scxml
@@ -0,0 +1,374 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: no -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       name="Pinball" datamodel="ecmascript">
+    <datamodel>
+        <data id="highScore" expr="0"/>
+        <data id="score" expr="0"/>
+    </datamodel>
+    <parallel id="global">
+        <parallel id="guiControl">
+            <state id="cLight">
+                <state id="cLightOn">
+                    <transition event="turnOffC" target="cLightOff"/>
+                </state>
+                <state id="cLightOff">
+                    <transition event="turnOnC" target="cLightOn"/>
+                </state>
+            </state>
+            <state id="rLight">
+                <state id="rLightOn">
+                    <transition event="turnOffR" target="rLightOff"/>
+                </state>
+                <state id="rLightOff">
+                    <transition event="turnOnR" target="rLightOn"/>
+                </state>
+            </state>
+            <state id="aLight">
+                <state id="aLightOn">
+                    <transition event="turnOffA" target="aLightOff"/>
+                </state>
+                <state id="aLightOff">
+                    <transition event="turnOnA" target="aLightOn"/>
+                </state>
+            </state>
+            <state id="zLight">
+                <state id="zLightOn">
+                    <transition event="turnOffZ" target="zLightOff"/>
+                </state>
+                <state id="zLightOff">
+                    <transition event="turnOnZ" target="zLightOn"/>
+                </state>
+            </state>
+            <state id="yLight">
+                <state id="yLightOn">
+                    <transition event="turnOffY" target="yLightOff"/>
+                </state>
+                <state id="yLightOff">
+                    <transition event="turnOnY" target="yLightOn"/>
+                </state>
+            </state>
+            <state id="hurryLight">
+                <state id="hurryLightOn">
+                    <transition event="turnOffHurry" target="hurryLightOff"/>
+                </state>
+                <state id="hurryLightOff">
+                    <transition event="turnOnHurry" target="hurryLightOn"/>
+                </state>
+            </state>
+            <state id="jackpotLight">
+                <state id="jackpotLightOn">
+                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
+                </state>
+                <state id="jackpotLightOff">
+                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
+                </state>
+            </state>
+            <state id="gameOverLight">
+                <state id="gameOverLightOn">
+                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
+                </state>
+                <state id="gameOverLightOff">
+                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
+                </state>
+            </state>
+        </parallel>
+
+        <parallel id="internalState">
+            <parallel id="logicalState">
+                <state id="letterState">
+                    <parallel id="lettersState">
+                        <state id="letter.C">
+                            <state id="cLetterOff">
+                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
+                            </state>
+                            <final id="cLetterOn"/>
+                        </state>
+                        <state id="letter.R">
+                            <state id="rLetterOff">
+                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
+                            </state>
+                            <final id="rLetterOn"/>
+                        </state>
+                        <state id="letter.A">
+                            <state id="aLetterOff">
+                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
+                            </state>
+                            <final id="aLetterOn"/>
+                        </state>
+                        <state id="letter.Z">
+                            <state id="zLetterOff">
+                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
+                            </state>
+                            <final id="zLetterOn"/>
+                        </state>
+                        <state id="letter.Y">
+                            <state id="yLetterOff">
+                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
+                            </state>
+                            <final id="yLetterOn"/>
+                        </state>
+                        <transition event="resetLetters" target="lettersState"/>
+                    </parallel>
+                </state>
+                <state id="modeState">
+                    <state id="offState">
+                        <onentry>
+                            <if cond="highScore &lt; score">
+                                <assign location="highScore" expr="score"/>
+                            </if>
+                            <raise event="resetLetters"/>
+                            <raise event="update"/>
+                        </onentry>
+                        <transition event="startTriggered" target="onState"/>
+                    </state>
+                    <parallel id="onState">
+                        <onentry>
+                            <assign location="score" expr="0"/>
+                        </onentry>
+                        <state id="hurryState">
+                            <state id="hurryStateOff">
+                                <onentry>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOn" target="hurryStateOn"/>
+                            </state>
+                            <state id="hurryStateOn">
+                                <onentry>
+                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOff" target="hurryStateOff"/>
+                                <onexit>
+                                    <cancel sendid="hurryId"/>
+                                </onexit>
+                            </state>
+                        </state>
+                        <state id="jackpotState">
+                            <state id="jackpotStateOff">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goForJackpot" target="jackpotStateOn"/>
+                            </state>
+                            <state id="jackpotStateOn">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                            </state>
+                        </state>
+                        <transition event="ballOutTriggered" target="offState"/>
+                    </parallel>
+                </state>
+            </parallel>
+
+            <state id="workflow">
+                <state id="lightImpulseGenerator">
+                    <state id="lightImpulseOn"/>
+                    <state id="lightImpulseOff"/>
+
+                    <onentry>
+                        <raise event="update"/>
+                    </onentry>
+
+                    <transition event="scheduleNewImpulse">
+                        <cancel sendid="lightId"/>
+                        <if cond="In('offState')">
+                            <send event="lightImpulse" id="lightId" delay="1s"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <send event="lightImpulse" id="lightId" delay="500ms"/>
+                        <else/>
+                            <send event="lightImpulse" id="lightId" delay="200ms"/>
+                        </if>
+                    </transition>
+
+                    <transition event="update">
+                        <raise event="scheduleNewImpulse"/>
+                        <raise event="updateLights"/>
+                    </transition>
+
+                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
+                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
+                </state>
+
+                <transition event="done.state.letter.*">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 1000"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 10000"/>
+                    </if>
+                    <raise event="updateLights"/>
+                </transition>
+
+                <transition event="done.state.lettersState">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 100000"/>
+                        <raise event="goToHurryOn"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 1000000"/>
+                        <raise event="goToHurryOff"/>
+                        <raise event="goForJackpot"/>
+                    </if>
+                </transition>
+
+                <transition event="updateLights">
+                    <send type="qt:signal" event="updateScore">
+                        <param name="highScore" expr="highScore"/>
+                        <param name="score" expr="score"/>
+                    </send>
+                    <if cond="In('jackpotStateOn')">
+                        <raise event="turnOnJackpot"/>
+                    <else/>
+                        <raise event="turnOffJackpot"/>
+                    </if>
+
+                    |if cond="In('lightImpulseOn')">
+                        <if cond="In('offState')">
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOnJackpot"/>
+                            <raise event="turnOnGameOver"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        <else/>
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        </if>
+                    <else/>
+                        <if cond="In('offState')">
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffJackpot"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                        <else/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                        </if>
+                        <raise event="turnOffHurry"/>
+                        <raise event="turnOffGameOver"/>
+                    </if>
+                </transition>
+            </state>
+        </parallel>
+    </parallel>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/id000000sig11src000000opflip1pos24.scxml b/tests/auto/qscxmlc/data/id000000sig11src000000opflip1pos24.scxml
deleted file mode 100644
index 8f23220..0000000
--- a/tests/auto/qscxmlc/data/id000000sig11src000000opflip1pos24.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" ?>
-<Scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000001sig11src000000opflip1pos7243.scxml b/tests/auto/qscxmlc/data/id000001sig11src000000opflip1pos7243.scxml
deleted file mode 100644
index 16788fb..0000000
--- a/tests/auto/qscxmlc/data/id000001sig11src000000opflip1pos7243.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            |if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000002sig11src000000opflip1pos7244.scxml b/tests/auto/qscxmlc/data/id000002sig11src000000opflip1pos7244.scxml
deleted file mode 100644
index 7239721..0000000
--- a/tests/auto/qscxmlc/data/id000002sig11src000000opflip1pos7244.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <If cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000003sig11src000000opflip1pos7442.scxml b/tests/auto/qscxmlc/data/id000003sig11src000000opflip1pos7442.scxml
deleted file mode 100644
index 3e22993..0000000
--- a/tests/auto/qscxmlc/data/id000003sig11src000000opflip1pos7442.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <Assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000004sig06src000000opflip4pos7335.scxml b/tests/auto/qscxmlc/data/id000004sig06src000000opflip4pos7335.scxml
deleted file mode 100644
index fb50085..0000000
--- a/tests/auto/qscxmlc/data/id000004sig06src000000opflip4pos7335.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr">expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000005sig11src000000opint8pos1val+0.scxml b/tests/auto/qscxmlc/data/id000005sig11src000000opint8pos1val+0.scxml
deleted file mode 100644
index 84a6c35..0000000
Binary files a/tests/auto/qscxmlc/data/id000005sig11src000000opint8pos1val+0.scxml and /dev/null differ
diff --git a/tests/auto/qscxmlc/data/id000006sig11src000000opext_AOpos1.scxml b/tests/auto/qscxmlc/data/id000006sig11src000000opext_AOpos1.scxml
deleted file mode 100644
index d2b0a3b..0000000
--- a/tests/auto/qscxmlc/data/id000006sig11src000000opext_AOpos1.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<ry>l version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000007sig11src000000ophavocrep8.scxml b/tests/auto/qscxmlc/data/id000007sig11src000000ophavocrep8.scxml
deleted file mode 100644
index 0674542..0000000
--- a/tests/auto/qscxmlc/data/id000007sig11src000000ophavocrep8.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transitifn event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
- location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            nameate>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_e:ent.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="shornt.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'." />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-  nsi                   <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assigZ location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000008sig11src000000ophavocrep4.scxml b/tests/auto/qscxmlc/data/id000008sig11src000000ophavocrep4.scxml
deleted file mode 100644
index 830831f..0000000
--- a/tests/auto/qscxmlc/data/id000008sig11src000000ophavocrep4.scxml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="O" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-  id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="o]erand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assige location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000009sig11src000000ophavocrep2.scxml b/tests/auto/qscxmlc/data/id000009sig11src000000ophavocrep2.scxml
deleted file mode 100644
index beca8f6..0000000
--- a/tests/auto/qscxmlc/data/id000009sig11src000000ophavocrep2.scxml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-    <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elsDif cond="_event.data.operator=='OPER.MINUS'" />
-                <assign location="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000010sig11src000000ophavocrep1.scxml b/tests/auto/qscxmlc/data/id000010sig11src000000ophavocrep1.scxml
deleted file mode 100644
index 8e8018d..0000000
--- a/tests/auto/qscxmlc/data/id000010sig11src000000ophavocrep1.scxml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" ?>
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
-    <datamodel>
-         <data id="long_expr" />
-         <data id="short_expr" />
-         <data id="res" />
-    </datamodel>
-    <state id="wrapper" initial="on">
-        <state id="on" initial="ready">
-            <onentry>
-                <send event="DISPLAY.UPDATE" />
-            </onentry>
-            <state id="ready" initial="begin">
-                <state id="begin">
-                    <transition event="OPER.MINUS" target="negated1" />
-                    <onentry>
-                        <assign location="long_expr" expr="''" />
-                        <assign location="short_expr" expr="0" />
-                        <assign location="res" expr="0" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="result">
-                </state>
-                <transition event="OPER" target="opEntered" />
-                <transition event="DIGIT.0" target="zero1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="DIGIT" target="int1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-                <transition event="POINT" target="frac1">
-                    <assign location="short_expr" expr="''" />
-                </transition>
-            </state>
-            <state id="negated1">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero1" />
-                <transition event="DIGIT" target="int1" />
-                <transition event="POINT" target="frac1" />
-            </state>
-            <state id="operand1">
-                <state id="zero1">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
-                    <transition event="POINT" target="frac1" />
-                </state>
-                <state id="int1">
-                    <transition event="POINT" target="frac1" />
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                </state>
-                <state id="frac1">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered" />
-            </state>
-            <state id="opEntered">
-                <transition event="OPER.MINUS" target="negated2" />
-                <transition event="POINT" target="frac2" />
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <onentry>
-                    <raise event="CALC.SUB" />
-                    <send target="#_internal" event="OP.INSERT">
-                        <param name="operator" expr="_event.name" />
-                    </send>
-                </onentry>
-            </state>
-            <state id="negated2">
-                <onentry>
-                    <assign location="short_expr" expr="'-'" />
-                    <send event="DISPLAY.UPDATE" />
-                </onentry>
-                <transition event="DIGIT.0" target="zero2" />
-                <transition event="DIGIT" target="int2" />
-                <transition event="POINT" target="frac2" />
-            </state>
-            <state id="operand2">
-                <state id="zero2">
-                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="int2">
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="POINT" target="frac2" />
-                </state>
-                <state id="frac2">
-                    <onentry>
-                        <assign location="short_expr" expr="short_expr +'.'" />
-                        <send event="DISPLAY.UPDATE" />
-                    </onentry>
-                    <transition event="DIGIT">
-                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
-                        <send event="DISPLAY.UPDATE" />
-                    </transition>
-                </state>
-                <transition event="OPER" target="opEntered">
-                    <raise event="CALC.SUB" />
-                    <raise event="OP.INSERT" />
-                </transition>
-                <transition event="EQUALS" target="result">
-                    <raise event="CALC.SUB" />
-                    <raise event="CALC.DO" />
-                </transition>
-            </state>
-            <transition event="C" target="on" />
-        </state>
-        <transition event="CALC.DO">
-            <assign location="short_expr" expr="''+ res" />
-            <assign location="long_expr" expr="''" />
-            <assign location="res" expr="0" />
-        </transition>
-        <transition event="CALC.SUB">
-            <if cond="short_expr!=''">
-                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
-            </if>
-            <assign location="res" expr="eval(long_expr)" />
-            <assign location="short_expr" expr="''" />
-            <send event="DISPLAY.UPDATE" />
-        </transition>
-        <transition event="DISPLAY.UPDATE">
-            <log label="'result'" expr="short_expr==''?res:short_expr" />
-            <send type="qt:signal" event="updateDisplay">
-                <param name="display" expr="short_expr==''?res:short_expr"/>
-            </send>
-        </transition>
-        <transition event="OP.INSERT">
-            <log expr="_event.data.operator" />
-            <if cond="_event.data.operator == 'OPER.PLUS'">
-                <assign location="long_expr" expr="long_expr+'+'" />
-            <elseif cond="_event.data.operator=='OPER.MINUS'" />
-  <state id="zero1">
-       tion="long_expr" expr="long_expr+'-'" />
-            <elseif cond="_event.data.operator=='OPER.STAR'" />
-                <assign location="long_expr" expr="long_expr+'*'" />
-            <elseif cond="_event.data.operator=='OPER.DIV'" />
-                <assign location="long_expr" expr="long_expr+'/'" />
-            </if>
-        </transition>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000011sig11src000001opflip1pos2533.scxml b/tests/auto/qscxmlc/data/id000011sig11src000001opflip1pos2533.scxml
deleted file mode 100644
index 73e0138..0000000
--- a/tests/auto/qscxmlc/data/id000011sig11src000001opflip1pos2533.scxml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes m->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <content>
-                    <scxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000012sig06src000001opflip1pos2538.scxml b/tests/auto/qscxmlc/data/id000012sig06src000001opflip1pos2538.scxml
deleted file mode 100644
index 9c3ba01..0000000
--- a/tests/auto/qscxmlc/data/id000012sig06src000001opflip1pos2538.scxml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<Scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <content>
-                    <scxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000013sig11src000001opflip1pos2914.scxml b/tests/auto/qscxmlc/data/id000013sig11src000001opflip1pos2914.scxml
deleted file mode 100644
index 5758c04..0000000
--- a/tests/auto/qscxmlc/data/id000013sig11src000001opflip1pos2914.scxml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">                <content>
-                    <scxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000014sig11src000001opflip1pos2914.scxml b/tests/auto/qscxmlc/data/id000014sig11src000001opflip1pos2914.scxml
deleted file mode 100644
index 218474e..0000000
--- a/tests/auto/qscxmlc/data/id000014sig11src000001opflip1pos2914.scxml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">                <content>
-                    <scxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000015sig11src000001opflip1pos2926.scxml b/tests/auto/qscxmlc/data/id000015sig11src000001opflip1pos2926.scxml
deleted file mode 100644
index 10e9130..0000000
Binary files a/tests/auto/qscxmlc/data/id000015sig11src000001opflip1pos2926.scxml and /dev/null differ
diff --git a/tests/auto/qscxmlc/data/id000016sig06src000001opflip1pos2961.scxml b/tests/auto/qscxmlc/data/id000016sig06src000001opflip1pos2961.scxml
deleted file mode 100644
index ce225b0..0000000
--- a/tests/auto/qscxmlc/data/id000016sig06src000001opflip1pos2961.scxml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <content>
-                    |scxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000017sig11src000001opext_AOpos2931.scxml b/tests/auto/qscxmlc/data/id000017sig11src000001opext_AOpos2931.scxml
deleted file mode 100644
index 5743c85..0000000
--- a/tests/auto/qscxmlc/data/id000017sig11src000001opext_AOpos2931.scxml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                http://www.w3.org/2005/07/scxmlscxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000018sig06src000001opext_AOpos2939.scxml b/tests/auto/qscxmlc/data/id000018sig06src000001opext_AOpos2939.scxml
deleted file mode 100644
index 387bf21..0000000
--- a/tests/auto/qscxmlc/data/id000018sig06src000001opext_AOpos2939.scxml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <content />                   <scxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000019sig11src000001opext_AOpos2940.scxml b/tests/auto/qscxmlc/data/id000019sig11src000001opext_AOpos2940.scxml
deleted file mode 100644
index ce56def..0000000
--- a/tests/auto/qscxmlc/data/id000019sig11src000001opext_AOpos2940.scxml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <content>
-<!--                <scxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000020sig11src000001ophavocrep8.scxml b/tests/auto/qscxmlc/data/id000020sig11src000001ophavocrep8.scxml
deleted file mode 100644
index 961a71e..0000000
--- a/tests/auto/qscxmlc/data/id000020sig11src000001ophavocrep8.scxml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <contenscxml name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                       <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000021sig11src000001ophavocrep8.scxml b/tests/auto/qscxmlc/data/id000021sig11src000001ophavocrep8.scxml
deleted file mode 100644
index 8d7f017..0000000
--- a/tests/auto/qscxmlc/data/id000021sig11src000001ophavocrep8.scxml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplace"
->
-    <state id="anyp\ace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <contenon use t               <sl name="anywhere version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-      * Redistr </content>
-            </invoke>
-      , </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000022sig11src000001ophavocrep4.scxml b/tests/auto/qscxmlc/data/id000022sig11src000001ophavocrep4.scxml
deleted file mode 100644
index 039f22b..0000000
Binary files a/tests/auto/qscxmlc/data/id000022sig11src000001ophavocrep4.scxml and /dev/null differ
diff --git a/tests/auto/qscxmlc/data/id000023sig06src000001ophavocrep4.scxml b/tests/auto/qscxmlc/data/id000023sig06src000001ophavocrep4.scxml
deleted file mode 100644
index 9d6cce0..0000000
--- a/tests/auto/qscxmlc/data/id000023sig06src000001ophavocrep4.scxml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-  initial="anyplace"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="somewhere">
-            <invoke type="http://www.w3.org/TR/scxml/">
-                <content>
-                    <scxmn name="anywhere" version="1.0">
-                        <state id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there"datamodel                     <transition event="goHere" target="here"/>
-                        </state>
-                    </scxml>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000024sig11src000001ophavocrep16.scxml b/tests/auto/qscxmlc/data/id000024sig11src000001ophavocrep16.scxml
deleted file mode 100644
index 49eaa54..0000000
--- a/tests/auto/qscxmlc/data/id000024sig11src000001ophavocrep16.scxml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="Directions"
-    initial="anyplacE"
->
-    <state id="anyplace">
-        <transition event="goNowhere" target="nowhere"/>
-        <transition event="goSomewhere" target="somewhere"/>
-
-        <state id="nowhere"/>
-        <state id="s* LIMITomewhere">
-            <invoke type="http://www.w$.org/TR/scxml/">
-               <content>
-                    <scxml name="anywhere" version="1.0">
-                        <sta e id="here">
-                            <transition event="goThere" target="there"/>
-                        </state>
-                        <state id="there">
-                            <transition event="goHere" target="here"/>
-                        </state>
-                    </scxm8>
-                </content>
-            </invoke>
-        </state>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000025sig06src000001ophavocrep8.scxml b/tests/auto/qscxmlc/data/id000025sig06src000001ophavocrep8.scxml
deleted file mode 100644
index f0f4a79..0000000
Binary files a/tests/auto/qscxmlc/data/id000025sig06src000001ophavocrep8.scxml and /dev/null differ
diff --git a/tests/auto/qscxmlc/data/id000026sig06src000003opext_AOpos2880.scxml b/tests/auto/qscxmlc/data/id000026sig06src000003opext_AOpos2880.scxml
deleted file mode 100644
index 52dffce..0000000
--- a/tests/auto/qscxmlc/data/id000026sig06src000003opext_AOpos2880.scxml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml
-    xmlns="http://www.w3.org/2005/07/scxml"
-    version="1.0"
-    name="MediaPlayerStateMachine"
-    initial="stopped"
-    datamodel="ecmascript"
->
-    <datamodel>
-        <data id="media"/>
-    </datamodel>
-
-    <script>
-        function isValidMedia() {
-            var m = _event.data.media
-            return (m + "").length > 0
-        }
-    <initial>
-
-    <state id="stopped">
-        <transition event="tap" cond="isValidMedia()" target="playing"/>
-    </state>
-
-    <state id="playing">
-        <onentry>
-            <assign location="media" expr="_event.data.media"/>
-            <send type="qt:signal" event="playbackStarted">
-                <param name="media" expr="media"/>
-            </send>
-        </onentry>
-
-        <onexit>
-            <send type="qt:signal" event="playbackStopped">
-                <param name="media" expr="media"/>
-            </send>
-        </onexit>
-
-        <transition event="tap" cond="!isValidMedia() || media === _event.data.media" target="stopped"/>
-        <transition event="tap" cond="isValidMedia() &amp;&amp; media !== _event.data.media" target="playing"/>
-    </state>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000027sig11src000004opflip1pos2521.scxml b/tests/auto/qscxmlc/data/id000027sig11src000004opflip1pos2521.scxml
deleted file mode 100644
index 2e2b6f0..0000000
--- a/tests/auto/qscxmlc/data/id000027sig11src000004opflip1pos2521.scxml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: no -->
-<Scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="Pinball" datamodel="ecmascript">
-    <datamodel>
-        <data id="highScore" expr="0"/>
-        <data id="score" expr="0"/>
-    </datamodel>
-    <parallel id="global">
-        <parallel id="guiControl">
-            <state id="cLight">
-                <state id="cLightOn">
-                    <transition event="turnOffC" target="cLightOff"/>
-                </state>
-                <state id="cLightOff">
-                    <transition event="turnOnC" target="cLightOn"/>
-                </state>
-            </state>
-            <state id="rLight">
-                <state id="rLightOn">
-                    <transition event="turnOffR" target="rLightOff"/>
-                </state>
-                <state id="rLightOff">
-                    <transition event="turnOnR" target="rLightOn"/>
-                </state>
-            </state>
-            <state id="aLight">
-                <state id="aLightOn">
-                    <transition event="turnOffA" target="aLightOff"/>
-                </state>
-                <state id="aLightOff">
-                    <transition event="turnOnA" target="aLightOn"/>
-                </state>
-            </state>
-            <state id="zLight">
-                <state id="zLightOn">
-                    <transition event="turnOffZ" target="zLightOff"/>
-                </state>
-                <state id="zLightOff">
-                    <transition event="turnOnZ" target="zLightOn"/>
-                </state>
-            </state>
-            <state id="yLight">
-                <state id="yLightOn">
-                    <transition event="turnOffY" target="yLightOff"/>
-                </state>
-                <state id="yLightOff">
-                    <transition event="turnOnY" target="yLightOn"/>
-                </state>
-            </state>
-            <state id="hurryLight">
-                <state id="hurryLightOn">
-                    <transition event="turnOffHurry" target="hurryLightOff"/>
-                </state>
-                <state id="hurryLightOff">
-                    <transition event="turnOnHurry" target="hurryLightOn"/>
-                </state>
-            </state>
-            <state id="jackpotLight">
-                <state id="jackpotLightOn">
-                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
-                </state>
-                <state id="jackpotLightOff">
-                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
-                </state>
-            </state>
-            <state id="gameOverLight">
-                <state id="gameOverLightOn">
-                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
-                </state>
-                <state id="gameOverLightOff">
-                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
-                </state>
-            </state>
-        </parallel>
-
-        <parallel id="internalState">
-            <parallel id="logicalState">
-                <state id="letterState">
-                    <parallel id="lettersState">
-                        <state id="letter.C">
-                            <state id="cLetterOff">
-                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
-                            </state>
-                            <final id="cLetterOn"/>
-                        </state>
-                        <state id="letter.R">
-                            <state id="rLetterOff">
-                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
-                            </state>
-                            <final id="rLetterOn"/>
-                        </state>
-                        <state id="letter.A">
-                            <state id="aLetterOff">
-                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
-                            </state>
-                            <final id="aLetterOn"/>
-                        </state>
-                        <state id="letter.Z">
-                            <state id="zLetterOff">
-                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
-                            </state>
-                            <final id="zLetterOn"/>
-                        </state>
-                        <state id="letter.Y">
-                            <state id="yLetterOff">
-                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
-                            </state>
-                            <final id="yLetterOn"/>
-                        </state>
-                        <transition event="resetLetters" target="lettersState"/>
-                    </parallel>
-                </state>
-                <state id="modeState">
-                    <state id="offState">
-                        <onentry>
-                            <if cond="highScore &lt; score">
-                                <assign location="highScore" expr="score"/>
-                            </if>
-                            <raise event="resetLetters"/>
-                            <raise event="update"/>
-                        </onentry>
-                        <transition event="startTriggered" target="onState"/>
-                    </state>
-                    <parallel id="onState">
-                        <onentry>
-                            <assign location="score" expr="0"/>
-                        </onentry>
-                        <state id="hurryState">
-                            <state id="hurryStateOff">
-                                <onentry>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOn" target="hurryStateOn"/>
-                            </state>
-                            <state id="hurryStateOn">
-                                <onentry>
-                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOff" target="hurryStateOff"/>
-                                <onexit>
-                                    <cancel sendid="hurryId"/>
-                                </onexit>
-                            </state>
-                        </state>
-                        <state id="jackpotState">
-                            <state id="jackpotStateOff">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goForJackpot" target="jackpotStateOn"/>
-                            </state>
-                            <state id="jackpotStateOn">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                            </state>
-                        </state>
-                        <transition event="ballOutTriggered" target="offState"/>
-                    </parallel>
-                </state>
-            </parallel>
-
-            <state id="workflow">
-                <state id="lightImpulseGenerator">
-                    <state id="lightImpulseOn"/>
-                    <state id="lightImpulseOff"/>
-
-                    <onentry>
-                        <raise event="update"/>
-                    </onentry>
-
-                    <transition event="scheduleNewImpulse">
-                        <cancel sendid="lightId"/>
-                        <if cond="In('offState')">
-                            <send event="lightImpulse" id="lightId" delay="1s"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <send event="lightImpulse" id="lightId" delay="500ms"/>
-                        <else/>
-                            <send event="lightImpulse" id="lightId" delay="200ms"/>
-                        </if>
-                    </transition>
-
-                    <transition event="update">
-                        <raise event="scheduleNewImpulse"/>
-                        <raise event="updateLights"/>
-                    </transition>
-
-                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
-                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
-                </state>
-
-                <transition event="done.state.letter.*">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 1000"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 10000"/>
-                    </if>
-                    <raise event="updateLights"/>
-                </transition>
-
-                <transition event="done.state.lettersState">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 100000"/>
-                        <raise event="goToHurryOn"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 1000000"/>
-                        <raise event="goToHurryOff"/>
-                        <raise event="goForJackpot"/>
-                    </if>
-                </transition>
-
-                <transition event="updateLights">
-                    <send type="qt:signal" event="updateScore">
-                        <param name="highScore" expr="highScore"/>
-                        <param name="score" expr="score"/>
-                    </send>
-                    <if cond="In('jackpotStateOn')">
-                        <raise event="turnOnJackpot"/>
-                    <else/>
-                        <raise event="turnOffJackpot"/>
-                    </if>
-
-                    <if cond="In('lightImpulseOn')">
-                        <if cond="In('offState')">
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOnJackpot"/>
-                            <raise event="turnOnGameOver"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        <else/>
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        </if>
-                    <else/>
-                        <if cond="In('offState')">
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffJackpot"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                        <else/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                        </if>
-                        <raise event="turnOffHurry"/>
-                        <raise event="turnOffGameOver"/>
-                    </if>
-                </transition>
-            </state>
-        </parallel>
-    </parallel>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000028sig11src000004opflip1pos10502.scxml b/tests/auto/qscxmlc/data/id000028sig11src000004opflip1pos10502.scxml
deleted file mode 100644
index 47af4f3..0000000
--- a/tests/auto/qscxmlc/data/id000028sig11src000004opflip1pos10502.scxml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: no -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="Pinball" datamodel="ecmascript">
-    <datamodel>
-        <data id="highScore" expr="0"/>
-        <data id="score" expr="0"/>
-    </datamodel>
-    <parallel id="global">
-        <parallel id="guiControl">
-            <state id="cLight">
-                <state id="cLightOn">
-                    <transition event="turnOffC" target="cLightOff"/>
-                </state>
-                <state id="cLightOff">
-                    <transition event="turnOnC" target="cLightOn"/>
-                </state>
-            </state>
-            <state id="rLight">
-                <state id="rLightOn">
-                    <transition event="turnOffR" target="rLightOff"/>
-                </state>
-                <state id="rLightOff">
-                    <transition event="turnOnR" target="rLightOn"/>
-                </state>
-            </state>
-            <state id="aLight">
-                <state id="aLightOn">
-                    <transition event="turnOffA" target="aLightOff"/>
-                </state>
-                <state id="aLightOff">
-                    <transition event="turnOnA" target="aLightOn"/>
-                </state>
-            </state>
-            <state id="zLight">
-                <state id="zLightOn">
-                    <transition event="turnOffZ" target="zLightOff"/>
-                </state>
-                <state id="zLightOff">
-                    <transition event="turnOnZ" target="zLightOn"/>
-                </state>
-            </state>
-            <state id="yLight">
-                <state id="yLightOn">
-                    <transition event="turnOffY" target="yLightOff"/>
-                </state>
-                <state id="yLightOff">
-                    <transition event="turnOnY" target="yLightOn"/>
-                </state>
-            </state>
-            <state id="hurryLight">
-                <state id="hurryLightOn">
-                    <transition event="turnOffHurry" target="hurryLightOff"/>
-                </state>
-                <state id="hurryLightOff">
-                    <transition event="turnOnHurry" target="hurryLightOn"/>
-                </state>
-            </state>
-            <state id="jackpotLight">
-                <state id="jackpotLightOn">
-                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
-                </state>
-                <state id="jackpotLightOff">
-                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
-                </state>
-            </state>
-            <state id="gameOverLight">
-                <state id="gameOverLightOn">
-                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
-                </state>
-                <state id="gameOverLightOff">
-                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
-                </state>
-            </state>
-        </parallel>
-
-        <parallel id="internalState">
-            <parallel id="logicalState">
-                <state id="letterState">
-                    <parallel id="lettersState">
-                        <state id="letter.C">
-                            <state id="cLetterOff">
-                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
-                            </state>
-                            <final id="cLetterOn"/>
-                        </state>
-                        <state id="letter.R">
-                            <state id="rLetterOff">
-                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
-                            </state>
-                            <final id="rLetterOn"/>
-                        </state>
-                        <state id="letter.A">
-                            <state id="aLetterOff">
-                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
-                            </state>
-                            <final id="aLetterOn"/>
-                        </state>
-                        <state id="letter.Z">
-                            <state id="zLetterOff">
-                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
-                            </state>
-                            <final id="zLetterOn"/>
-                        </state>
-                        <state id="letter.Y">
-                            <state id="yLetterOff">
-                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
-                            </state>
-                            <final id="yLetterOn"/>
-                        </state>
-                        <transition event="resetLetters" target="lettersState"/>
-                    </parallel>
-                </state>
-                <state id="modeState">
-                    <state id="offState">
-                        <onentry>
-                            <if cond="highScore &lt; score">
-                                <assign location="highScore" expr="score"/>
-                            </if>
-                            <raise event="resetLetters"/>
-                            <raise event="update"/>
-                        </onentry>
-                        <transition event="startTriggered" target="onState"/>
-                    </state>
-                    <parallel id="onState">
-                        <onentry>
-                            <assign location="score" expr="0"/>
-                        </onentry>
-                        <state id="hurryState">
-                            <state id="hurryStateOff">
-                                <onentry>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOn" target="hurryStateOn"/>
-                            </state>
-                            <state id="hurryStateOn">
-                                <onentry>
-                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOff" target="hurryStateOff"/>
-                                <onexit>
-                                    <cancel sendid="hurryId"/>
-                                </onexit>
-                            </state>
-                        </state>
-                        <state id="jackpotState">
-                            <state id="jackpotStateOff">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goForJackpot" target="jackpotStateOn"/>
-                            </state>
-                            <state id="jackpotStateOn">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                            </state>
-                        </state>
-                        <transition event="ballOutTriggered" target="offState"/>
-                    </parallel>
-                </state>
-            </parallel>
-
-            <state id="workflow">
-                <state id="lightImpulseGenerator">
-                    <state id="lightImpulseOn"/>
-                    <state id="lightImpulseOff"/>
-
-                    <onentry>
-                        <raise event="update"/>
-                    </onentry>
-
-                    <transition event="scheduleNewImpulse">
-                        <cancel sendid="lightId"/>
-                        |if cond="In('offState')">
-                            <send event="lightImpulse" id="lightId" delay="1s"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <send event="lightImpulse" id="lightId" delay="500ms"/>
-                        <else/>
-                            <send event="lightImpulse" id="lightId" delay="200ms"/>
-                        </if>
-                    </transition>
-
-                    <transition event="update">
-                        <raise event="scheduleNewImpulse"/>
-                        <raise event="updateLights"/>
-                    </transition>
-
-                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
-                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
-                </state>
-
-                <transition event="done.state.letter.*">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 1000"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 10000"/>
-                    </if>
-                    <raise event="updateLights"/>
-                </transition>
-
-                <transition event="done.state.lettersState">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 100000"/>
-                        <raise event="goToHurryOn"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 1000000"/>
-                        <raise event="goToHurryOff"/>
-                        <raise event="goForJackpot"/>
-                    </if>
-                </transition>
-
-                <transition event="updateLights">
-                    <send type="qt:signal" event="updateScore">
-                        <param name="highScore" expr="highScore"/>
-                        <param name="score" expr="score"/>
-                    </send>
-                    <if cond="In('jackpotStateOn')">
-                        <raise event="turnOnJackpot"/>
-                    <else/>
-                        <raise event="turnOffJackpot"/>
-                    </if>
-
-                    <if cond="In('lightImpulseOn')">
-                        <if cond="In('offState')">
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOnJackpot"/>
-                            <raise event="turnOnGameOver"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        <else/>
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        </if>
-                    <else/>
-                        <if cond="In('offState')">
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffJackpot"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                        <else/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                        </if>
-                        <raise event="turnOffHurry"/>
-                        <raise event="turnOffGameOver"/>
-                    </if>
-                </transition>
-            </state>
-        </parallel>
-    </parallel>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000029sig11src000004opflip1pos10635.scxml b/tests/auto/qscxmlc/data/id000029sig11src000004opflip1pos10635.scxml
deleted file mode 100644
index beaf539..0000000
--- a/tests/auto/qscxmlc/data/id000029sig11src000004opflip1pos10635.scxml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: no -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="Pinball" datamodel="ecmascript">
-    <datamodel>
-        <data id="highScore" expr="0"/>
-        <data id="score" expr="0"/>
-    </datamodel>
-    <parallel id="global">
-        <parallel id="guiControl">
-            <state id="cLight">
-                <state id="cLightOn">
-                    <transition event="turnOffC" target="cLightOff"/>
-                </state>
-                <state id="cLightOff">
-                    <transition event="turnOnC" target="cLightOn"/>
-                </state>
-            </state>
-            <state id="rLight">
-                <state id="rLightOn">
-                    <transition event="turnOffR" target="rLightOff"/>
-                </state>
-                <state id="rLightOff">
-                    <transition event="turnOnR" target="rLightOn"/>
-                </state>
-            </state>
-            <state id="aLight">
-                <state id="aLightOn">
-                    <transition event="turnOffA" target="aLightOff"/>
-                </state>
-                <state id="aLightOff">
-                    <transition event="turnOnA" target="aLightOn"/>
-                </state>
-            </state>
-            <state id="zLight">
-                <state id="zLightOn">
-                    <transition event="turnOffZ" target="zLightOff"/>
-                </state>
-                <state id="zLightOff">
-                    <transition event="turnOnZ" target="zLightOn"/>
-                </state>
-            </state>
-            <state id="yLight">
-                <state id="yLightOn">
-                    <transition event="turnOffY" target="yLightOff"/>
-                </state>
-                <state id="yLightOff">
-                    <transition event="turnOnY" target="yLightOn"/>
-                </state>
-            </state>
-            <state id="hurryLight">
-                <state id="hurryLightOn">
-                    <transition event="turnOffHurry" target="hurryLightOff"/>
-                </state>
-                <state id="hurryLightOff">
-                    <transition event="turnOnHurry" target="hurryLightOn"/>
-                </state>
-            </state>
-            <state id="jackpotLight">
-                <state id="jackpotLightOn">
-                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
-                </state>
-                <state id="jackpotLightOff">
-                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
-                </state>
-            </state>
-            <state id="gameOverLight">
-                <state id="gameOverLightOn">
-                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
-                </state>
-                <state id="gameOverLightOff">
-                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
-                </state>
-            </state>
-        </parallel>
-
-        <parallel id="internalState">
-            <parallel id="logicalState">
-                <state id="letterState">
-                    <parallel id="lettersState">
-                        <state id="letter.C">
-                            <state id="cLetterOff">
-                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
-                            </state>
-                            <final id="cLetterOn"/>
-                        </state>
-                        <state id="letter.R">
-                            <state id="rLetterOff">
-                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
-                            </state>
-                            <final id="rLetterOn"/>
-                        </state>
-                        <state id="letter.A">
-                            <state id="aLetterOff">
-                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
-                            </state>
-                            <final id="aLetterOn"/>
-                        </state>
-                        <state id="letter.Z">
-                            <state id="zLetterOff">
-                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
-                            </state>
-                            <final id="zLetterOn"/>
-                        </state>
-                        <state id="letter.Y">
-                            <state id="yLetterOff">
-                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
-                            </state>
-                            <final id="yLetterOn"/>
-                        </state>
-                        <transition event="resetLetters" target="lettersState"/>
-                    </parallel>
-                </state>
-                <state id="modeState">
-                    <state id="offState">
-                        <onentry>
-                            <if cond="highScore &lt; score">
-                                <assign location="highScore" expr="score"/>
-                            </if>
-                            <raise event="resetLetters"/>
-                            <raise event="update"/>
-                        </onentry>
-                        <transition event="startTriggered" target="onState"/>
-                    </state>
-                    <parallel id="onState">
-                        <onentry>
-                            <assign location="score" expr="0"/>
-                        </onentry>
-                        <state id="hurryState">
-                            <state id="hurryStateOff">
-                                <onentry>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOn" target="hurryStateOn"/>
-                            </state>
-                            <state id="hurryStateOn">
-                                <onentry>
-                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOff" target="hurryStateOff"/>
-                                <onexit>
-                                    <cancel sendid="hurryId"/>
-                                </onexit>
-                            </state>
-                        </state>
-                        <state id="jackpotState">
-                            <state id="jackpotStateOff">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goForJackpot" target="jackpotStateOn"/>
-                            </state>
-                            <state id="jackpotStateOn">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                            </state>
-                        </state>
-                        <transition event="ballOutTriggered" target="offState"/>
-                    </parallel>
-                </state>
-            </parallel>
-
-            <state id="workflow">
-                <state id="lightImpulseGenerator">
-                    <state id="lightImpulseOn"/>
-                    <state id="lightImpulseOff"/>
-
-                    <onentry>
-                        <raise event="update"/>
-                    </onentry>
-
-                    <transition event="scheduleNewImpulse">
-                        <cancel sendid="lightId"/>
-                        <if cond="In('offState')">
-                            <send event="lightImpulse" id="lightId" delay="1s"/>
-                        <Elseif cond="In('hurryStateOff')"/>
-                            <send event="lightImpulse" id="lightId" delay="500ms"/>
-                        <else/>
-                            <send event="lightImpulse" id="lightId" delay="200ms"/>
-                        </if>
-                    </transition>
-
-                    <transition event="update">
-                        <raise event="scheduleNewImpulse"/>
-                        <raise event="updateLights"/>
-                    </transition>
-
-                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
-                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
-                </state>
-
-                <transition event="done.state.letter.*">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 1000"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 10000"/>
-                    </if>
-                    <raise event="updateLights"/>
-                </transition>
-
-                <transition event="done.state.lettersState">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 100000"/>
-                        <raise event="goToHurryOn"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 1000000"/>
-                        <raise event="goToHurryOff"/>
-                        <raise event="goForJackpot"/>
-                    </if>
-                </transition>
-
-                <transition event="updateLights">
-                    <send type="qt:signal" event="updateScore">
-                        <param name="highScore" expr="highScore"/>
-                        <param name="score" expr="score"/>
-                    </send>
-                    <if cond="In('jackpotStateOn')">
-                        <raise event="turnOnJackpot"/>
-                    <else/>
-                        <raise event="turnOffJackpot"/>
-                    </if>
-
-                    <if cond="In('lightImpulseOn')">
-                        <if cond="In('offState')">
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOnJackpot"/>
-                            <raise event="turnOnGameOver"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        <else/>
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        </if>
-                    <else/>
-                        <if cond="In('offState')">
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffJackpot"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                        <else/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                        </if>
-                        <raise event="turnOffHurry"/>
-                        <raise event="turnOffGameOver"/>
-                    </if>
-                </transition>
-            </state>
-        </parallel>
-    </parallel>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000030sig11src000004opflip1pos11452.scxml b/tests/auto/qscxmlc/data/id000030sig11src000004opflip1pos11452.scxml
deleted file mode 100644
index 21bfe08..0000000
--- a/tests/auto/qscxmlc/data/id000030sig11src000004opflip1pos11452.scxml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: no -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="Pinball" datamodel="ecmascript">
-    <datamodel>
-        <data id="highScore" expr="0"/>
-        <data id="score" expr="0"/>
-    </datamodel>
-    <parallel id="global">
-        <parallel id="guiControl">
-            <state id="cLight">
-                <state id="cLightOn">
-                    <transition event="turnOffC" target="cLightOff"/>
-                </state>
-                <state id="cLightOff">
-                    <transition event="turnOnC" target="cLightOn"/>
-                </state>
-            </state>
-            <state id="rLight">
-                <state id="rLightOn">
-                    <transition event="turnOffR" target="rLightOff"/>
-                </state>
-                <state id="rLightOff">
-                    <transition event="turnOnR" target="rLightOn"/>
-                </state>
-            </state>
-            <state id="aLight">
-                <state id="aLightOn">
-                    <transition event="turnOffA" target="aLightOff"/>
-                </state>
-                <state id="aLightOff">
-                    <transition event="turnOnA" target="aLightOn"/>
-                </state>
-            </state>
-            <state id="zLight">
-                <state id="zLightOn">
-                    <transition event="turnOffZ" target="zLightOff"/>
-                </state>
-                <state id="zLightOff">
-                    <transition event="turnOnZ" target="zLightOn"/>
-                </state>
-            </state>
-            <state id="yLight">
-                <state id="yLightOn">
-                    <transition event="turnOffY" target="yLightOff"/>
-                </state>
-                <state id="yLightOff">
-                    <transition event="turnOnY" target="yLightOn"/>
-                </state>
-            </state>
-            <state id="hurryLight">
-                <state id="hurryLightOn">
-                    <transition event="turnOffHurry" target="hurryLightOff"/>
-                </state>
-                <state id="hurryLightOff">
-                    <transition event="turnOnHurry" target="hurryLightOn"/>
-                </state>
-            </state>
-            <state id="jackpotLight">
-                <state id="jackpotLightOn">
-                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
-                </state>
-                <state id="jackpotLightOff">
-                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
-                </state>
-            </state>
-            <state id="gameOverLight">
-                <state id="gameOverLightOn">
-                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
-                </state>
-                <state id="gameOverLightOff">
-                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
-                </state>
-            </state>
-        </parallel>
-
-        <parallel id="internalState">
-            <parallel id="logicalState">
-                <state id="letterState">
-                    <parallel id="lettersState">
-                        <state id="letter.C">
-                            <state id="cLetterOff">
-                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
-                            </state>
-                            <final id="cLetterOn"/>
-                        </state>
-                        <state id="letter.R">
-                            <state id="rLetterOff">
-                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
-                            </state>
-                            <final id="rLetterOn"/>
-                        </state>
-                        <state id="letter.A">
-                            <state id="aLetterOff">
-                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
-                            </state>
-                            <final id="aLetterOn"/>
-                        </state>
-                        <state id="letter.Z">
-                            <state id="zLetterOff">
-                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
-                            </state>
-                            <final id="zLetterOn"/>
-                        </state>
-                        <state id="letter.Y">
-                            <state id="yLetterOff">
-                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
-                            </state>
-                            <final id="yLetterOn"/>
-                        </state>
-                        <transition event="resetLetters" target="lettersState"/>
-                    </parallel>
-                </state>
-                <state id="modeState">
-                    <state id="offState">
-                        <onentry>
-                            <if cond="highScore &lt; score">
-                                <assign location="highScore" expr="score"/>
-                            </if>
-                            <raise event="resetLetters"/>
-                            <raise event="update"/>
-                        </onentry>
-                        <transition event="startTriggered" target="onState"/>
-                    </state>
-                    <parallel id="onState">
-                        <onentry>
-                            <assign location="score" expr="0"/>
-                        </onentry>
-                        <state id="hurryState">
-                            <state id="hurryStateOff">
-                                <onentry>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOn" target="hurryStateOn"/>
-                            </state>
-                            <state id="hurryStateOn">
-                                <onentry>
-                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOff" target="hurryStateOff"/>
-                                <onexit>
-                                    <cancel sendid="hurryId"/>
-                                </onexit>
-                            </state>
-                        </state>
-                        <state id="jackpotState">
-                            <state id="jackpotStateOff">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goForJackpot" target="jackpotStateOn"/>
-                            </state>
-                            <state id="jackpotStateOn">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                            </state>
-                        </state>
-                        <transition event="ballOutTriggered" target="offState"/>
-                    </parallel>
-                </state>
-            </parallel>
-
-            <state id="workflow">
-                <state id="lightImpulseGenerator">
-                    <state id="lightImpulseOn"/>
-                    <state id="lightImpulseOff"/>
-
-                    <onentry>
-                        <raise event="update"/>
-                    </onentry>
-
-                    <transition event="scheduleNewImpulse">
-                        <cancel sendid="lightId"/>
-                        <if cond="In('offState')">
-                            <send event="lightImpulse" id="lightId" delay="1s"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <send event="lightImpulse" id="lightId" delay="500ms"/>
-                        <else/>
-                            <send event="lightImpulse" id="lightId" delay="200ms"/>
-                        </if>
-                    </transition>
-
-                    <transition event="update">
-                        <raise event="scheduleNewImpulse"/>
-                        <raise event="updateLights"/>
-                    </transition>
-
-                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
-                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
-                </state>
-
-                <transition event="done.state.letter.*">
-                    |if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 1000"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 10000"/>
-                    </if>
-                    <raise event="updateLights"/>
-                </transition>
-
-                <transition event="done.state.lettersState">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 100000"/>
-                        <raise event="goToHurryOn"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 1000000"/>
-                        <raise event="goToHurryOff"/>
-                        <raise event="goForJackpot"/>
-                    </if>
-                </transition>
-
-                <transition event="updateLights">
-                    <send type="qt:signal" event="updateScore">
-                        <param name="highScore" expr="highScore"/>
-                        <param name="score" expr="score"/>
-                    </send>
-                    <if cond="In('jackpotStateOn')">
-                        <raise event="turnOnJackpot"/>
-                    <else/>
-                        <raise event="turnOffJackpot"/>
-                    </if>
-
-                    <if cond="In('lightImpulseOn')">
-                        <if cond="In('offState')">
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOnJackpot"/>
-                            <raise event="turnOnGameOver"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        <else/>
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        </if>
-                    <else/>
-                        <if cond="In('offState')">
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffJackpot"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                        <else/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                        </if>
-                        <raise event="turnOffHurry"/>
-                        <raise event="turnOffGameOver"/>
-                    </if>
-                </transition>
-            </state>
-        </parallel>
-    </parallel>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000031sig11src000004opflip1pos12612.scxml b/tests/auto/qscxmlc/data/id000031sig11src000004opflip1pos12612.scxml
deleted file mode 100644
index b49bd32..0000000
--- a/tests/auto/qscxmlc/data/id000031sig11src000004opflip1pos12612.scxml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: no -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="Pinball" datamodel="ecmascript">
-    <datamodel>
-        <data id="highScore" expr="0"/>
-        <data id="score" expr="0"/>
-    </datamodel>
-    <parallel id="global">
-        <parallel id="guiControl">
-            <state id="cLight">
-                <state id="cLightOn">
-                    <transition event="turnOffC" target="cLightOff"/>
-                </state>
-                <state id="cLightOff">
-                    <transition event="turnOnC" target="cLightOn"/>
-                </state>
-            </state>
-            <state id="rLight">
-                <state id="rLightOn">
-                    <transition event="turnOffR" target="rLightOff"/>
-                </state>
-                <state id="rLightOff">
-                    <transition event="turnOnR" target="rLightOn"/>
-                </state>
-            </state>
-            <state id="aLight">
-                <state id="aLightOn">
-                    <transition event="turnOffA" target="aLightOff"/>
-                </state>
-                <state id="aLightOff">
-                    <transition event="turnOnA" target="aLightOn"/>
-                </state>
-            </state>
-            <state id="zLight">
-                <state id="zLightOn">
-                    <transition event="turnOffZ" target="zLightOff"/>
-                </state>
-                <state id="zLightOff">
-                    <transition event="turnOnZ" target="zLightOn"/>
-                </state>
-            </state>
-            <state id="yLight">
-                <state id="yLightOn">
-                    <transition event="turnOffY" target="yLightOff"/>
-                </state>
-                <state id="yLightOff">
-                    <transition event="turnOnY" target="yLightOn"/>
-                </state>
-            </state>
-            <state id="hurryLight">
-                <state id="hurryLightOn">
-                    <transition event="turnOffHurry" target="hurryLightOff"/>
-                </state>
-                <state id="hurryLightOff">
-                    <transition event="turnOnHurry" target="hurryLightOn"/>
-                </state>
-            </state>
-            <state id="jackpotLight">
-                <state id="jackpotLightOn">
-                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
-                </state>
-                <state id="jackpotLightOff">
-                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
-                </state>
-            </state>
-            <state id="gameOverLight">
-                <state id="gameOverLightOn">
-                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
-                </state>
-                <state id="gameOverLightOff">
-                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
-                </state>
-            </state>
-        </parallel>
-
-        <parallel id="internalState">
-            <parallel id="logicalState">
-                <state id="letterState">
-                    <parallel id="lettersState">
-                        <state id="letter.C">
-                            <state id="cLetterOff">
-                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
-                            </state>
-                            <final id="cLetterOn"/>
-                        </state>
-                        <state id="letter.R">
-                            <state id="rLetterOff">
-                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
-                            </state>
-                            <final id="rLetterOn"/>
-                        </state>
-                        <state id="letter.A">
-                            <state id="aLetterOff">
-                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
-                            </state>
-                            <final id="aLetterOn"/>
-                        </state>
-                        <state id="letter.Z">
-                            <state id="zLetterOff">
-                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
-                            </state>
-                            <final id="zLetterOn"/>
-                        </state>
-                        <state id="letter.Y">
-                            <state id="yLetterOff">
-                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
-                            </state>
-                            <final id="yLetterOn"/>
-                        </state>
-                        <transition event="resetLetters" target="lettersState"/>
-                    </parallel>
-                </state>
-                <state id="modeState">
-                    <state id="offState">
-                        <onentry>
-                            <if cond="highScore &lt; score">
-                                <assign location="highScore" expr="score"/>
-                            </if>
-                            <raise event="resetLetters"/>
-                            <raise event="update"/>
-                        </onentry>
-                        <transition event="startTriggered" target="onState"/>
-                    </state>
-                    <parallel id="onState">
-                        <onentry>
-                            <assign location="score" expr="0"/>
-                        </onentry>
-                        <state id="hurryState">
-                            <state id="hurryStateOff">
-                                <onentry>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOn" target="hurryStateOn"/>
-                            </state>
-                            <state id="hurryStateOn">
-                                <onentry>
-                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOff" target="hurryStateOff"/>
-                                <onexit>
-                                    <cancel sendid="hurryId"/>
-                                </onexit>
-                            </state>
-                        </state>
-                        <state id="jackpotState">
-                            <state id="jackpotStateOff">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goForJackpot" target="jackpotStateOn"/>
-                            </state>
-                            <state id="jackpotStateOn">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                            </state>
-                        </state>
-                        <transition event="ballOutTriggered" target="offState"/>
-                    </parallel>
-                </state>
-            </parallel>
-
-            <state id="workflow">
-                <state id="lightImpulseGenerator">
-                    <state id="lightImpulseOn"/>
-                    <state id="lightImpulseOff"/>
-
-                    <onentry>
-                        <raise event="update"/>
-                    </onentry>
-
-                    <transition event="scheduleNewImpulse">
-                        <cancel sendid="lightId"/>
-                        <if cond="In('offState')">
-                            <send event="lightImpulse" id="lightId" delay="1s"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <send event="lightImpulse" id="lightId" delay="500ms"/>
-                        <else/>
-                            <send event="lightImpulse" id="lightId" delay="200ms"/>
-                        </if>
-                    </transition>
-
-                    <transition event="update">
-                        <raise event="scheduleNewImpulse"/>
-                        <raise event="updateLights"/>
-                    </transition>
-
-                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
-                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
-                </state>
-
-                <transition event="done.state.letter.*">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 1000"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 10000"/>
-                    </if>
-                    <raise event="updateLights"/>
-                </transition>
-
-                <transition event="done.state.lettersState">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 100000"/>
-                        <raise event="goToHurryOn"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 1000000"/>
-                        <raise event="goToHurryOff"/>
-                        <raise event="goForJackpot"/>
-                    </if>
-                </transition>
-
-                <transition event="updateLights">
-                    <send type="qt:signal" event="updateScore">
-                        <param name="highScore" expr="highScore"/>
-                        <param name="score" expr="score"/>
-                    </send>
-                    |if cond="In('jackpotStateOn')">
-                        <raise event="turnOnJackpot"/>
-                    <else/>
-                        <raise event="turnOffJackpot"/>
-                    </if>
-
-                    <if cond="In('lightImpulseOn')">
-                        <if cond="In('offState')">
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOnJackpot"/>
-                            <raise event="turnOnGameOver"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        <else/>
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        </if>
-                    <else/>
-                        <if cond="In('offState')">
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffJackpot"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                        <else/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                        </if>
-                        <raise event="turnOffHurry"/>
-                        <raise event="turnOffGameOver"/>
-                    </if>
-                </transition>
-            </state>
-        </parallel>
-    </parallel>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000032sig11src000004opflip1pos12831.scxml b/tests/auto/qscxmlc/data/id000032sig11src000004opflip1pos12831.scxml
deleted file mode 100644
index b753246..0000000
--- a/tests/auto/qscxmlc/data/id000032sig11src000004opflip1pos12831.scxml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: no -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="Pinball" datamodel="ecmascript">
-    <datamodel>
-        <data id="highScore" expr="0"/>
-        <data id="score" expr="0"/>
-    </datamodel>
-    <parallel id="global">
-        <parallel id="guiControl">
-            <state id="cLight">
-                <state id="cLightOn">
-                    <transition event="turnOffC" target="cLightOff"/>
-                </state>
-                <state id="cLightOff">
-                    <transition event="turnOnC" target="cLightOn"/>
-                </state>
-            </state>
-            <state id="rLight">
-                <state id="rLightOn">
-                    <transition event="turnOffR" target="rLightOff"/>
-                </state>
-                <state id="rLightOff">
-                    <transition event="turnOnR" target="rLightOn"/>
-                </state>
-            </state>
-            <state id="aLight">
-                <state id="aLightOn">
-                    <transition event="turnOffA" target="aLightOff"/>
-                </state>
-                <state id="aLightOff">
-                    <transition event="turnOnA" target="aLightOn"/>
-                </state>
-            </state>
-            <state id="zLight">
-                <state id="zLightOn">
-                    <transition event="turnOffZ" target="zLightOff"/>
-                </state>
-                <state id="zLightOff">
-                    <transition event="turnOnZ" target="zLightOn"/>
-                </state>
-            </state>
-            <state id="yLight">
-                <state id="yLightOn">
-                    <transition event="turnOffY" target="yLightOff"/>
-                </state>
-                <state id="yLightOff">
-                    <transition event="turnOnY" target="yLightOn"/>
-                </state>
-            </state>
-            <state id="hurryLight">
-                <state id="hurryLightOn">
-                    <transition event="turnOffHurry" target="hurryLightOff"/>
-                </state>
-                <state id="hurryLightOff">
-                    <transition event="turnOnHurry" target="hurryLightOn"/>
-                </state>
-            </state>
-            <state id="jackpotLight">
-                <state id="jackpotLightOn">
-                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
-                </state>
-                <state id="jackpotLightOff">
-                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
-                </state>
-            </state>
-            <state id="gameOverLight">
-                <state id="gameOverLightOn">
-                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
-                </state>
-                <state id="gameOverLightOff">
-                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
-                </state>
-            </state>
-        </parallel>
-
-        <parallel id="internalState">
-            <parallel id="logicalState">
-                <state id="letterState">
-                    <parallel id="lettersState">
-                        <state id="letter.C">
-                            <state id="cLetterOff">
-                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
-                            </state>
-                            <final id="cLetterOn"/>
-                        </state>
-                        <state id="letter.R">
-                            <state id="rLetterOff">
-                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
-                            </state>
-                            <final id="rLetterOn"/>
-                        </state>
-                        <state id="letter.A">
-                            <state id="aLetterOff">
-                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
-                            </state>
-                            <final id="aLetterOn"/>
-                        </state>
-                        <state id="letter.Z">
-                            <state id="zLetterOff">
-                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
-                            </state>
-                            <final id="zLetterOn"/>
-                        </state>
-                        <state id="letter.Y">
-                            <state id="yLetterOff">
-                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
-                            </state>
-                            <final id="yLetterOn"/>
-                        </state>
-                        <transition event="resetLetters" target="lettersState"/>
-                    </parallel>
-                </state>
-                <state id="modeState">
-                    <state id="offState">
-                        <onentry>
-                            <if cond="highScore &lt; score">
-                                <assign location="highScore" expr="score"/>
-                            </if>
-                            <raise event="resetLetters"/>
-                            <raise event="update"/>
-                        </onentry>
-                        <transition event="startTriggered" target="onState"/>
-                    </state>
-                    <parallel id="onState">
-                        <onentry>
-                            <assign location="score" expr="0"/>
-                        </onentry>
-                        <state id="hurryState">
-                            <state id="hurryStateOff">
-                                <onentry>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOn" target="hurryStateOn"/>
-                            </state>
-                            <state id="hurryStateOn">
-                                <onentry>
-                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOff" target="hurryStateOff"/>
-                                <onexit>
-                                    <cancel sendid="hurryId"/>
-                                </onexit>
-                            </state>
-                        </state>
-                        <state id="jackpotState">
-                            <state id="jackpotStateOff">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goForJackpot" target="jackpotStateOn"/>
-                            </state>
-                            <state id="jackpotStateOn">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                            </state>
-                        </state>
-                        <transition event="ballOutTriggered" target="offState"/>
-                    </parallel>
-                </state>
-            </parallel>
-
-            <state id="workflow">
-                <state id="lightImpulseGenerator">
-                    <state id="lightImpulseOn"/>
-                    <state id="lightImpulseOff"/>
-
-                    <onentry>
-                        <raise event="update"/>
-                    </onentry>
-
-                    <transition event="scheduleNewImpulse">
-                        <cancel sendid="lightId"/>
-                        <if cond="In('offState')">
-                            <send event="lightImpulse" id="lightId" delay="1s"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <send event="lightImpulse" id="lightId" delay="500ms"/>
-                        <else/>
-                            <send event="lightImpulse" id="lightId" delay="200ms"/>
-                        </if>
-                    </transition>
-
-                    <transition event="update">
-                        <raise event="scheduleNewImpulse"/>
-                        <raise event="updateLights"/>
-                    </transition>
-
-                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
-                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
-                </state>
-
-                <transition event="done.state.letter.*">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 1000"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 10000"/>
-                    </if>
-                    <raise event="updateLights"/>
-                </transition>
-
-                <transition event="done.state.lettersState">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 100000"/>
-                        <raise event="goToHurryOn"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 1000000"/>
-                        <raise event="goToHurryOff"/>
-                        <raise event="goForJackpot"/>
-                    </if>
-                </transition>
-
-                <transition event="updateLights">
-                    <send type="qt:signal" event="updateScore">
-                        <param name="highScore" expr="highScore"/>
-                        <param name="score" expr="score"/>
-                    </send>
-                    <if cond="In('jackpotStateOn')">
-                        <raise event="turnOnJackpot"/>
-                    <else/>
-                        <raise event="turnOffJackpot"/>
-                    </if>
-
-                    |if cond="In('lightImpulseOn')">
-                        <if cond="In('offState')">
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOnJackpot"/>
-                            <raise event="turnOnGameOver"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        <else/>
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        </if>
-                    <else/>
-                        <if cond="In('offState')">
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffJackpot"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                        <else/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                        </if>
-                        <raise event="turnOffHurry"/>
-                        <raise event="turnOffGameOver"/>
-                    </if>
-                </transition>
-            </state>
-        </parallel>
-    </parallel>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/id000033sig06src000004opflip4pos10704.scxml b/tests/auto/qscxmlc/data/id000033sig06src000004opflip4pos10704.scxml
deleted file mode 100644
index 920fd84..0000000
--- a/tests/auto/qscxmlc/data/id000033sig06src000004opflip4pos10704.scxml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: no -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="Pinball" datamodel="ecmascript">
-    <datamodel>
-        <data id="highScore" expr="0"/>
-        <data id="score" expr="0"/>
-    </datamodel>
-    <parallel id="global">
-        <parallel id="guiControl">
-            <state id="cLight">
-                <state id="cLightOn">
-                    <transition event="turnOffC" target="cLightOff"/>
-                </state>
-                <state id="cLightOff">
-                    <transition event="turnOnC" target="cLightOn"/>
-                </state>
-            </state>
-            <state id="rLight">
-                <state id="rLightOn">
-                    <transition event="turnOffR" target="rLightOff"/>
-                </state>
-                <state id="rLightOff">
-                    <transition event="turnOnR" target="rLightOn"/>
-                </state>
-            </state>
-            <state id="aLight">
-                <state id="aLightOn">
-                    <transition event="turnOffA" target="aLightOff"/>
-                </state>
-                <state id="aLightOff">
-                    <transition event="turnOnA" target="aLightOn"/>
-                </state>
-            </state>
-            <state id="zLight">
-                <state id="zLightOn">
-                    <transition event="turnOffZ" target="zLightOff"/>
-                </state>
-                <state id="zLightOff">
-                    <transition event="turnOnZ" target="zLightOn"/>
-                </state>
-            </state>
-            <state id="yLight">
-                <state id="yLightOn">
-                    <transition event="turnOffY" target="yLightOff"/>
-                </state>
-                <state id="yLightOff">
-                    <transition event="turnOnY" target="yLightOn"/>
-                </state>
-            </state>
-            <state id="hurryLight">
-                <state id="hurryLightOn">
-                    <transition event="turnOffHurry" target="hurryLightOff"/>
-                </state>
-                <state id="hurryLightOff">
-                    <transition event="turnOnHurry" target="hurryLightOn"/>
-                </state>
-            </state>
-            <state id="jackpotLight">
-                <state id="jackpotLightOn">
-                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
-                </state>
-                <state id="jackpotLightOff">
-                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
-                </state>
-            </state>
-            <state id="gameOverLight">
-                <state id="gameOverLightOn">
-                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
-                </state>
-                <state id="gameOverLightOff">
-                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
-                </state>
-            </state>
-        </parallel>
-
-        <parallel id="internalState">
-            <parallel id="logicalState">
-                <state id="letterState">
-                    <parallel id="lettersState">
-                        <state id="letter.C">
-                            <state id="cLetterOff">
-                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
-                            </state>
-                            <final id="cLetterOn"/>
-                        </state>
-                        <state id="letter.R">
-                            <state id="rLetterOff">
-                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
-                            </state>
-                            <final id="rLetterOn"/>
-                        </state>
-                        <state id="letter.A">
-                            <state id="aLetterOff">
-                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
-                            </state>
-                            <final id="aLetterOn"/>
-                        </state>
-                        <state id="letter.Z">
-                            <state id="zLetterOff">
-                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
-                            </state>
-                            <final id="zLetterOn"/>
-                        </state>
-                        <state id="letter.Y">
-                            <state id="yLetterOff">
-                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
-                            </state>
-                            <final id="yLetterOn"/>
-                        </state>
-                        <transition event="resetLetters" target="lettersState"/>
-                    </parallel>
-                </state>
-                <state id="modeState">
-                    <state id="offState">
-                        <onentry>
-                            <if cond="highScore &lt; score">
-                                <assign location="highScore" expr="score"/>
-                            </if>
-                            <raise event="resetLetters"/>
-                            <raise event="update"/>
-                        </onentry>
-                        <transition event="startTriggered" target="onState"/>
-                    </state>
-                    <parallel id="onState">
-                        <onentry>
-                            <assign location="score" expr="0"/>
-                        </onentry>
-                        <state id="hurryState">
-                            <state id="hurryStateOff">
-                                <onentry>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOn" target="hurryStateOn"/>
-                            </state>
-                            <state id="hurryStateOn">
-                                <onentry>
-                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
-                                    <raise event="resetLetters"/>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goToHurryOff" target="hurryStateOff"/>
-                                <onexit>
-                                    <cancel sendid="hurryId"/>
-                                </onexit>
-                            </state>
-                        </state>
-                        <state id="jackpotState">
-                            <state id="jackpotStateOff">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                                <transition event="goForJackpot" target="jackpotStateOn"/>
-                            </state>
-                            <state id="jackpotStateOn">
-                                <onentry>
-                                    <raise event="update"/>
-                                </onentry>
-                            </state>
-                        </state>
-                        <transition event="ballOutTriggered" target="offState"/>
-                    </parallel>
-                </state>
-            </parallel>
-
-            <state id="workflow">
-                <state id="lightImpulseGenerator">
-                    <state id="lightImpulseOn"/>
-                    <state id="lightImpulseOff"/>
-
-                    <onentry>
-                        <raise event="update"/>
-                    </onentry>
-
-                    <transition event="scheduleNewImpulse">
-                        <cancel sendid="lightId"/>
-                        <if cond="In('offState')">
-                            <send event="lightImpulse" id="lightId" delay="1s"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <send>event="lightImpulse" id="lightId" delay="500ms"/>
-                        <else/>
-                            <send event="lightImpulse" id="lightId" delay="200ms"/>
-                        </if>
-                    </transition>
-
-                    <transition event="update">
-                        <raise event="scheduleNewImpulse"/>
-                        <raise event="updateLights"/>
-                    </transition>
-
-                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
-                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
-                </state>
-
-                <transition event="done.state.letter.*">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 1000"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 10000"/>
-                    </if>
-                    <raise event="updateLights"/>
-                </transition>
-
-                <transition event="done.state.lettersState">
-                    <if cond="In('hurryStateOff')">
-                        <assign location="score" expr="score + 100000"/>
-                        <raise event="goToHurryOn"/>
-                    <elseif cond="In('hurryStateOn')"/>
-                        <assign location="score" expr="score + 1000000"/>
-                        <raise event="goToHurryOff"/>
-                        <raise event="goForJackpot"/>
-                    </if>
-                </transition>
-
-                <transition event="updateLights">
-                    <send type="qt:signal" event="updateScore">
-                        <param name="highScore" expr="highScore"/>
-                        <param name="score" expr="score"/>
-                    </send>
-                    <if cond="In('jackpotStateOn')">
-                        <raise event="turnOnJackpot"/>
-                    <else/>
-                        <raise event="turnOffJackpot"/>
-                    </if>
-
-                    <if cond="In('lightImpulseOn')">
-                        <if cond="In('offState')">
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOnJackpot"/>
-                            <raise event="turnOnGameOver"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        <else/>
-                            <raise event="turnOnC"/>
-                            <raise event="turnOnR"/>
-                            <raise event="turnOnA"/>
-                            <raise event="turnOnZ"/>
-                            <raise event="turnOnY"/>
-                            <raise event="turnOnHurry"/>
-                            <raise event="turnOffGameOver"/>
-                        </if>
-                    <else/>
-                        <if cond="In('offState')">
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                            <raise event="turnOffHurry"/>
-                            <raise event="turnOffJackpot"/>
-                        <elseif cond="In('hurryStateOff')"/>
-                            <raise event="turnOffC"/>
-                            <raise event="turnOffR"/>
-                            <raise event="turnOffA"/>
-                            <raise event="turnOffZ"/>
-                            <raise event="turnOffY"/>
-                        <else/>
-                            <if cond="In('cLetterOn')">
-                                <raise event="turnOnC"/>
-                            <else/>
-                                <raise event="turnOffC"/>
-                            </if>
-                            <if cond="In('rLetterOn')">
-                                <raise event="turnOnR"/>
-                            <else/>
-                                <raise event="turnOffR"/>
-                            </if>
-                            <if cond="In('aLetterOn')">
-                                <raise event="turnOnA"/>
-                            <else/>
-                                <raise event="turnOffA"/>
-                            </if>
-                            <if cond="In('zLetterOn')">
-                                <raise event="turnOnZ"/>
-                            <else/>
-                                <raise event="turnOffZ"/>
-                            </if>
-                            <if cond="In('yLetterOn')">
-                                <raise event="turnOnY"/>
-                            <else/>
-                                <raise event="turnOffY"/>
-                            </if>
-                        </if>
-                        <raise event="turnOffHurry"/>
-                        <raise event="turnOffGameOver"/>
-                    </if>
-                </transition>
-            </state>
-        </parallel>
-    </parallel>
-</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidAssign.scxml b/tests/auto/qscxmlc/data/invalidAssign.scxml
new file mode 100644
index 0000000..3e22993
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidAssign.scxml
@@ -0,0 +1,164 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <Assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidAssign2.scxml b/tests/auto/qscxmlc/data/invalidAssign2.scxml
new file mode 100644
index 0000000..fb50085
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidAssign2.scxml
@@ -0,0 +1,164 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr">expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidContent.scxml b/tests/auto/qscxmlc/data/invalidContent.scxml
new file mode 100644
index 0000000..387bf21
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidContent.scxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <content />                   <scxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidIf.scxml b/tests/auto/qscxmlc/data/invalidIf.scxml
new file mode 100644
index 0000000..16788fb
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidIf.scxml
@@ -0,0 +1,164 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            |if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidIf2.scxml b/tests/auto/qscxmlc/data/invalidIf2.scxml
new file mode 100644
index 0000000..7239721
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidIf2.scxml
@@ -0,0 +1,164 @@
+<?xml version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <If cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidInvoke.scxml b/tests/auto/qscxmlc/data/invalidInvoke.scxml
new file mode 100644
index 0000000..5758c04
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidInvoke.scxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">                <content>
+                    <scxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidInvoke2.scxml b/tests/auto/qscxmlc/data/invalidInvoke2.scxml
new file mode 100644
index 0000000..218474e
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidInvoke2.scxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">                <content>
+                    <scxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidInvoke3.scxml b/tests/auto/qscxmlc/data/invalidInvoke3.scxml
new file mode 100644
index 0000000..10e9130
Binary files /dev/null and b/tests/auto/qscxmlc/data/invalidInvoke3.scxml differ
diff --git a/tests/auto/qscxmlc/data/invalidInvoke4.scxml b/tests/auto/qscxmlc/data/invalidInvoke4.scxml
new file mode 100644
index 0000000..5743c85
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidInvoke4.scxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                http://www.w3.org/2005/07/scxmlscxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidRoot.scxml b/tests/auto/qscxmlc/data/invalidRoot.scxml
new file mode 100644
index 0000000..8f23220
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidRoot.scxml
@@ -0,0 +1,164 @@
+<?xml version="1.0" ?>
+<Scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidRoot2.scxml b/tests/auto/qscxmlc/data/invalidRoot2.scxml
new file mode 100644
index 0000000..9d6cce0
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidRoot2.scxml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+  initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <content>
+                    <scxmn name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there"datamodel                     <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidRoot3.scxml b/tests/auto/qscxmlc/data/invalidRoot3.scxml
new file mode 100644
index 0000000..f0f4a79
Binary files /dev/null and b/tests/auto/qscxmlc/data/invalidRoot3.scxml differ
diff --git a/tests/auto/qscxmlc/data/invalidRoot4.scxml b/tests/auto/qscxmlc/data/invalidRoot4.scxml
new file mode 100644
index 0000000..2e2b6f0
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidRoot4.scxml
@@ -0,0 +1,374 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: no -->
+<Scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       name="Pinball" datamodel="ecmascript">
+    <datamodel>
+        <data id="highScore" expr="0"/>
+        <data id="score" expr="0"/>
+    </datamodel>
+    <parallel id="global">
+        <parallel id="guiControl">
+            <state id="cLight">
+                <state id="cLightOn">
+                    <transition event="turnOffC" target="cLightOff"/>
+                </state>
+                <state id="cLightOff">
+                    <transition event="turnOnC" target="cLightOn"/>
+                </state>
+            </state>
+            <state id="rLight">
+                <state id="rLightOn">
+                    <transition event="turnOffR" target="rLightOff"/>
+                </state>
+                <state id="rLightOff">
+                    <transition event="turnOnR" target="rLightOn"/>
+                </state>
+            </state>
+            <state id="aLight">
+                <state id="aLightOn">
+                    <transition event="turnOffA" target="aLightOff"/>
+                </state>
+                <state id="aLightOff">
+                    <transition event="turnOnA" target="aLightOn"/>
+                </state>
+            </state>
+            <state id="zLight">
+                <state id="zLightOn">
+                    <transition event="turnOffZ" target="zLightOff"/>
+                </state>
+                <state id="zLightOff">
+                    <transition event="turnOnZ" target="zLightOn"/>
+                </state>
+            </state>
+            <state id="yLight">
+                <state id="yLightOn">
+                    <transition event="turnOffY" target="yLightOff"/>
+                </state>
+                <state id="yLightOff">
+                    <transition event="turnOnY" target="yLightOn"/>
+                </state>
+            </state>
+            <state id="hurryLight">
+                <state id="hurryLightOn">
+                    <transition event="turnOffHurry" target="hurryLightOff"/>
+                </state>
+                <state id="hurryLightOff">
+                    <transition event="turnOnHurry" target="hurryLightOn"/>
+                </state>
+            </state>
+            <state id="jackpotLight">
+                <state id="jackpotLightOn">
+                    <transition event="turnOffJackpot" target="jackpotLightOff"/>
+                </state>
+                <state id="jackpotLightOff">
+                    <transition event="turnOnJackpot" target="jackpotLightOn"/>
+                </state>
+            </state>
+            <state id="gameOverLight">
+                <state id="gameOverLightOn">
+                    <transition event="turnOffGameOver" target="gameOverLightOff"/>
+                </state>
+                <state id="gameOverLightOff">
+                    <transition event="turnOnGameOver" target="gameOverLightOn"/>
+                </state>
+            </state>
+        </parallel>
+
+        <parallel id="internalState">
+            <parallel id="logicalState">
+                <state id="letterState">
+                    <parallel id="lettersState">
+                        <state id="letter.C">
+                            <state id="cLetterOff">
+                                <transition event="cLetterTriggered" cond="In('onState')" target="cLetterOn"/>
+                            </state>
+                            <final id="cLetterOn"/>
+                        </state>
+                        <state id="letter.R">
+                            <state id="rLetterOff">
+                                <transition event="rLetterTriggered" cond="In('onState')" target="rLetterOn"/>
+                            </state>
+                            <final id="rLetterOn"/>
+                        </state>
+                        <state id="letter.A">
+                            <state id="aLetterOff">
+                                <transition event="aLetterTriggered" cond="In('onState')" target="aLetterOn"/>
+                            </state>
+                            <final id="aLetterOn"/>
+                        </state>
+                        <state id="letter.Z">
+                            <state id="zLetterOff">
+                                <transition event="zLetterTriggered" cond="In('onState')" target="zLetterOn"/>
+                            </state>
+                            <final id="zLetterOn"/>
+                        </state>
+                        <state id="letter.Y">
+                            <state id="yLetterOff">
+                                <transition event="yLetterTriggered" cond="In('onState')" target="yLetterOn"/>
+                            </state>
+                            <final id="yLetterOn"/>
+                        </state>
+                        <transition event="resetLetters" target="lettersState"/>
+                    </parallel>
+                </state>
+                <state id="modeState">
+                    <state id="offState">
+                        <onentry>
+                            <if cond="highScore &lt; score">
+                                <assign location="highScore" expr="score"/>
+                            </if>
+                            <raise event="resetLetters"/>
+                            <raise event="update"/>
+                        </onentry>
+                        <transition event="startTriggered" target="onState"/>
+                    </state>
+                    <parallel id="onState">
+                        <onentry>
+                            <assign location="score" expr="0"/>
+                        </onentry>
+                        <state id="hurryState">
+                            <state id="hurryStateOff">
+                                <onentry>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOn" target="hurryStateOn"/>
+                            </state>
+                            <state id="hurryStateOn">
+                                <onentry>
+                                    <send event="goToHurryOff" id="hurryId" delay="5s"/>
+                                    <raise event="resetLetters"/>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goToHurryOff" target="hurryStateOff"/>
+                                <onexit>
+                                    <cancel sendid="hurryId"/>
+                                </onexit>
+                            </state>
+                        </state>
+                        <state id="jackpotState">
+                            <state id="jackpotStateOff">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                                <transition event="goForJackpot" target="jackpotStateOn"/>
+                            </state>
+                            <state id="jackpotStateOn">
+                                <onentry>
+                                    <raise event="update"/>
+                                </onentry>
+                            </state>
+                        </state>
+                        <transition event="ballOutTriggered" target="offState"/>
+                    </parallel>
+                </state>
+            </parallel>
+
+            <state id="workflow">
+                <state id="lightImpulseGenerator">
+                    <state id="lightImpulseOn"/>
+                    <state id="lightImpulseOff"/>
+
+                    <onentry>
+                        <raise event="update"/>
+                    </onentry>
+
+                    <transition event="scheduleNewImpulse">
+                        <cancel sendid="lightId"/>
+                        <if cond="In('offState')">
+                            <send event="lightImpulse" id="lightId" delay="1s"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <send event="lightImpulse" id="lightId" delay="500ms"/>
+                        <else/>
+                            <send event="lightImpulse" id="lightId" delay="200ms"/>
+                        </if>
+                    </transition>
+
+                    <transition event="update">
+                        <raise event="scheduleNewImpulse"/>
+                        <raise event="updateLights"/>
+                    </transition>
+
+                    <transition event="lightImpulse" cond="In('lightImpulseOn')" target="lightImpulseOff"/>
+                    <transition event="lightImpulse" cond="In('lightImpulseOff')" target="lightImpulseOn"/>
+                </state>
+
+                <transition event="done.state.letter.*">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 1000"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 10000"/>
+                    </if>
+                    <raise event="updateLights"/>
+                </transition>
+
+                <transition event="done.state.lettersState">
+                    <if cond="In('hurryStateOff')">
+                        <assign location="score" expr="score + 100000"/>
+                        <raise event="goToHurryOn"/>
+                    <elseif cond="In('hurryStateOn')"/>
+                        <assign location="score" expr="score + 1000000"/>
+                        <raise event="goToHurryOff"/>
+                        <raise event="goForJackpot"/>
+                    </if>
+                </transition>
+
+                <transition event="updateLights">
+                    <send type="qt:signal" event="updateScore">
+                        <param name="highScore" expr="highScore"/>
+                        <param name="score" expr="score"/>
+                    </send>
+                    <if cond="In('jackpotStateOn')">
+                        <raise event="turnOnJackpot"/>
+                    <else/>
+                        <raise event="turnOffJackpot"/>
+                    </if>
+
+                    <if cond="In('lightImpulseOn')">
+                        <if cond="In('offState')">
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOnJackpot"/>
+                            <raise event="turnOnGameOver"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        <else/>
+                            <raise event="turnOnC"/>
+                            <raise event="turnOnR"/>
+                            <raise event="turnOnA"/>
+                            <raise event="turnOnZ"/>
+                            <raise event="turnOnY"/>
+                            <raise event="turnOnHurry"/>
+                            <raise event="turnOffGameOver"/>
+                        </if>
+                    <else/>
+                        <if cond="In('offState')">
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                            <raise event="turnOffHurry"/>
+                            <raise event="turnOffJackpot"/>
+                        <elseif cond="In('hurryStateOff')"/>
+                            <raise event="turnOffC"/>
+                            <raise event="turnOffR"/>
+                            <raise event="turnOffA"/>
+                            <raise event="turnOffZ"/>
+                            <raise event="turnOffY"/>
+                        <else/>
+                            <if cond="In('cLetterOn')">
+                                <raise event="turnOnC"/>
+                            <else/>
+                                <raise event="turnOffC"/>
+                            </if>
+                            <if cond="In('rLetterOn')">
+                                <raise event="turnOnR"/>
+                            <else/>
+                                <raise event="turnOffR"/>
+                            </if>
+                            <if cond="In('aLetterOn')">
+                                <raise event="turnOnA"/>
+                            <else/>
+                                <raise event="turnOffA"/>
+                            </if>
+                            <if cond="In('zLetterOn')">
+                                <raise event="turnOnZ"/>
+                            <else/>
+                                <raise event="turnOffZ"/>
+                            </if>
+                            <if cond="In('yLetterOn')">
+                                <raise event="turnOnY"/>
+                            <else/>
+                                <raise event="turnOffY"/>
+                            </if>
+                        </if>
+                        <raise event="turnOffHurry"/>
+                        <raise event="turnOffGameOver"/>
+                    </if>
+                </transition>
+            </state>
+        </parallel>
+    </parallel>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidScxml.scxml b/tests/auto/qscxmlc/data/invalidScxml.scxml
new file mode 100644
index 0000000..9c3ba01
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidScxml.scxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<Scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <content>
+                    <scxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/invalidXmlHeader.scxml b/tests/auto/qscxmlc/data/invalidXmlHeader.scxml
new file mode 100644
index 0000000..84a6c35
Binary files /dev/null and b/tests/auto/qscxmlc/data/invalidXmlHeader.scxml differ
diff --git a/tests/auto/qscxmlc/data/invalidXmlHeader2.scxml b/tests/auto/qscxmlc/data/invalidXmlHeader2.scxml
new file mode 100644
index 0000000..d2b0a3b
--- /dev/null
+++ b/tests/auto/qscxmlc/data/invalidXmlHeader2.scxml
@@ -0,0 +1,164 @@
+<ry>l version="1.0" ?>
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
+    <datamodel>
+         <data id="long_expr" />
+         <data id="short_expr" />
+         <data id="res" />
+    </datamodel>
+    <state id="wrapper" initial="on">
+        <state id="on" initial="ready">
+            <onentry>
+                <send event="DISPLAY.UPDATE" />
+            </onentry>
+            <state id="ready" initial="begin">
+                <state id="begin">
+                    <transition event="OPER.MINUS" target="negated1" />
+                    <onentry>
+                        <assign location="long_expr" expr="''" />
+                        <assign location="short_expr" expr="0" />
+                        <assign location="res" expr="0" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="result">
+                </state>
+                <transition event="OPER" target="opEntered" />
+                <transition event="DIGIT.0" target="zero1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="DIGIT" target="int1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+                <transition event="POINT" target="frac1">
+                    <assign location="short_expr" expr="''" />
+                </transition>
+            </state>
+            <state id="negated1">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero1" />
+                <transition event="DIGIT" target="int1" />
+                <transition event="POINT" target="frac1" />
+            </state>
+            <state id="operand1">
+                <state id="zero1">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int1" />
+                    <transition event="POINT" target="frac1" />
+                </state>
+                <state id="int1">
+                    <transition event="POINT" target="frac1" />
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                </state>
+                <state id="frac1">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered" />
+            </state>
+            <state id="opEntered">
+                <transition event="OPER.MINUS" target="negated2" />
+                <transition event="POINT" target="frac2" />
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <onentry>
+                    <raise event="CALC.SUB" />
+                    <send target="#_internal" event="OP.INSERT">
+                        <param name="operator" expr="_event.name" />
+                    </send>
+                </onentry>
+            </state>
+            <state id="negated2">
+                <onentry>
+                    <assign location="short_expr" expr="'-'" />
+                    <send event="DISPLAY.UPDATE" />
+                </onentry>
+                <transition event="DIGIT.0" target="zero2" />
+                <transition event="DIGIT" target="int2" />
+                <transition event="POINT" target="frac2" />
+            </state>
+            <state id="operand2">
+                <state id="zero2">
+                    <transition event="DIGIT" cond="_event.name != 'DIGIT.0'" target="int2" />
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="int2">
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr+_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="POINT" target="frac2" />
+                </state>
+                <state id="frac2">
+                    <onentry>
+                        <assign location="short_expr" expr="short_expr +'.'" />
+                        <send event="DISPLAY.UPDATE" />
+                    </onentry>
+                    <transition event="DIGIT">
+                        <assign location="short_expr" expr="short_expr +_event.name.substr(_event.name.lastIndexOf('.')+1)" />
+                        <send event="DISPLAY.UPDATE" />
+                    </transition>
+                </state>
+                <transition event="OPER" target="opEntered">
+                    <raise event="CALC.SUB" />
+                    <raise event="OP.INSERT" />
+                </transition>
+                <transition event="EQUALS" target="result">
+                    <raise event="CALC.SUB" />
+                    <raise event="CALC.DO" />
+                </transition>
+            </state>
+            <transition event="C" target="on" />
+        </state>
+        <transition event="CALC.DO">
+            <assign location="short_expr" expr="''+ res" />
+            <assign location="long_expr" expr="''" />
+            <assign location="res" expr="0" />
+        </transition>
+        <transition event="CALC.SUB">
+            <if cond="short_expr!=''">
+                <assign location="long_expr" expr="long_expr+'('+short_expr+')'" />
+            </if>
+            <assign location="res" expr="eval(long_expr)" />
+            <assign location="short_expr" expr="''" />
+            <send event="DISPLAY.UPDATE" />
+        </transition>
+        <transition event="DISPLAY.UPDATE">
+            <log label="'result'" expr="short_expr==''?res:short_expr" />
+            <send type="qt:signal" event="updateDisplay">
+                <param name="display" expr="short_expr==''?res:short_expr"/>
+            </send>
+        </transition>
+        <transition event="OP.INSERT">
+            <log expr="_event.data.operator" />
+            <if cond="_event.data.operator == 'OPER.PLUS'">
+                <assign location="long_expr" expr="long_expr+'+'" />
+            <elseif cond="_event.data.operator=='OPER.MINUS'" />
+                <assign location="long_expr" expr="long_expr+'-'" />
+            <elseif cond="_event.data.operator=='OPER.STAR'" />
+                <assign location="long_expr" expr="long_expr+'*'" />
+            <elseif cond="_event.data.operator=='OPER.DIV'" />
+                <assign location="long_expr" expr="long_expr+'/'" />
+            </if>
+        </transition>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/noContentInInvoke.scxml b/tests/auto/qscxmlc/data/noContentInInvoke.scxml
new file mode 100644
index 0000000..961a71e
--- /dev/null
+++ b/tests/auto/qscxmlc/data/noContentInInvoke.scxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <contenscxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                       <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/noContentInInvoke2.scxml b/tests/auto/qscxmlc/data/noContentInInvoke2.scxml
new file mode 100644
index 0000000..8d7f017
--- /dev/null
+++ b/tests/auto/qscxmlc/data/noContentInInvoke2.scxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyp\ace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <contenon use t               <sl name="anywhere version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+      * Redistr </content>
+            </invoke>
+      , </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/noContentInInvoke3.scxml b/tests/auto/qscxmlc/data/noContentInInvoke3.scxml
new file mode 100644
index 0000000..039f22b
Binary files /dev/null and b/tests/auto/qscxmlc/data/noContentInInvoke3.scxml differ
diff --git a/tests/auto/qscxmlc/data/noContentInInvoke4.scxml b/tests/auto/qscxmlc/data/noContentInInvoke4.scxml
new file mode 100644
index 0000000..49eaa54
--- /dev/null
+++ b/tests/auto/qscxmlc/data/noContentInInvoke4.scxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplacE"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="s* LIMITomewhere">
+            <invoke type="http://www.w$.org/TR/scxml/">
+               <content>
+                    <scxml name="anywhere" version="1.0">
+                        <sta e id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxm8>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/prematureEndOfDocument.scxml b/tests/auto/qscxmlc/data/prematureEndOfDocument.scxml
new file mode 100644
index 0000000..73e0138
--- /dev/null
+++ b/tests/auto/qscxmlc/data/prematureEndOfDocument.scxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes m->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <content>
+                    <scxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/prematureEndOfDocument2.scxml b/tests/auto/qscxmlc/data/prematureEndOfDocument2.scxml
new file mode 100644
index 0000000..ce56def
--- /dev/null
+++ b/tests/auto/qscxmlc/data/prematureEndOfDocument2.scxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <content>
+<!--                <scxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/data/wrongRoot.scxml b/tests/auto/qscxmlc/data/wrongRoot.scxml
new file mode 100644
index 0000000..ce225b0
--- /dev/null
+++ b/tests/auto/qscxmlc/data/wrongRoot.scxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<!-- enable-qt-mode: yes -->
+<scxml
+    xmlns="http://www.w3.org/2005/07/scxml"
+    version="1.0"
+    name="Directions"
+    initial="anyplace"
+>
+    <state id="anyplace">
+        <transition event="goNowhere" target="nowhere"/>
+        <transition event="goSomewhere" target="somewhere"/>
+
+        <state id="nowhere"/>
+        <state id="somewhere">
+            <invoke type="http://www.w3.org/TR/scxml/">
+                <content>
+                    |scxml name="anywhere" version="1.0">
+                        <state id="here">
+                            <transition event="goThere" target="there"/>
+                        </state>
+                        <state id="there">
+                            <transition event="goHere" target="here"/>
+                        </state>
+                    </scxml>
+                </content>
+            </invoke>
+        </state>
+    </state>
+</scxml>
diff --git a/tests/auto/qscxmlc/tst_qscxmlc.qrc b/tests/auto/qscxmlc/tst_qscxmlc.qrc
index 24ee227..e6f9e37 100644
--- a/tests/auto/qscxmlc/tst_qscxmlc.qrc
+++ b/tests/auto/qscxmlc/tst_qscxmlc.qrc
@@ -2,40 +2,40 @@
     <qresource prefix="/tst_qscxmlc">
         <file>data/empty.scxml</file>
         <file>data/misplacedinvoke.scxml</file>
-        <file>data/id000000sig11src000000opflip1pos24.scxml</file>
-        <file>data/id000001sig11src000000opflip1pos7243.scxml</file>
-        <file>data/id000002sig11src000000opflip1pos7244.scxml</file>
-        <file>data/id000003sig11src000000opflip1pos7442.scxml</file>
-        <file>data/id000004sig06src000000opflip4pos7335.scxml</file>
-        <file>data/id000005sig11src000000opint8pos1val+0.scxml</file>
-        <file>data/id000006sig11src000000opext_AOpos1.scxml</file>
-        <file>data/id000007sig11src000000ophavocrep8.scxml</file>
-        <file>data/id000008sig11src000000ophavocrep4.scxml</file>
-        <file>data/id000009sig11src000000ophavocrep2.scxml</file>
-        <file>data/id000010sig11src000000ophavocrep1.scxml</file>
-        <file>data/id000011sig11src000001opflip1pos2533.scxml</file>
-        <file>data/id000012sig06src000001opflip1pos2538.scxml</file>
-        <file>data/id000013sig11src000001opflip1pos2914.scxml</file>
-        <file>data/id000014sig11src000001opflip1pos2914.scxml</file>
-        <file>data/id000015sig11src000001opflip1pos2926.scxml</file>
-        <file>data/id000016sig06src000001opflip1pos2961.scxml</file>
-        <file>data/id000017sig11src000001opext_AOpos2931.scxml</file>
-        <file>data/id000018sig06src000001opext_AOpos2939.scxml</file>
-        <file>data/id000019sig11src000001opext_AOpos2940.scxml</file>
-        <file>data/id000020sig11src000001ophavocrep8.scxml</file>
-        <file>data/id000021sig11src000001ophavocrep8.scxml</file>
-        <file>data/id000022sig11src000001ophavocrep4.scxml</file>
-        <file>data/id000023sig06src000001ophavocrep4.scxml</file>
-        <file>data/id000024sig11src000001ophavocrep16.scxml</file>
-        <file>data/id000025sig06src000001ophavocrep8.scxml</file>
-        <file>data/id000026sig06src000003opext_AOpos2880.scxml</file>
-        <file>data/id000027sig11src000004opflip1pos2521.scxml</file>
-        <file>data/id000028sig11src000004opflip1pos10502.scxml</file>
-        <file>data/id000029sig11src000004opflip1pos10635.scxml</file>
-        <file>data/id000030sig11src000004opflip1pos11452.scxml</file>
-        <file>data/id000031sig11src000004opflip1pos12612.scxml</file>
-        <file>data/id000032sig11src000004opflip1pos12831.scxml</file>
-        <file>data/id000033sig06src000004opflip4pos10704.scxml</file>
+        <file>data/invalidRoot.scxml</file>
+        <file>data/invalidIf.scxml</file>
+        <file>data/invalidIf2.scxml</file>
+        <file>data/invalidAssign.scxml</file>
+        <file>data/invalidAssign2.scxml</file>
+        <file>data/invalidXmlHeader.scxml</file>
+        <file>data/invalidXmlHeader2.scxml</file>
+        <file>data/elseWithoutIf.scxml</file>
+        <file>data/elseWithoutIf2.scxml</file>
+        <file>data/elseWithoutIf3.scxml</file>
         <file>data/invalidstatemachinename.scxml</file>
+        <file>data/invalidScxml.scxml</file>
+        <file>data/prematureEndOfDocument.scxml</file>
+        <file>data/elseWithoutIf4.scxml</file>
+        <file>data/badInitial.scxml</file>
+        <file>data/elseWithoutIf5.scxml</file>
+        <file>data/elseWithoutIf6.scxml</file>
+        <file>data/elseWithoutIf7.scxml</file>
+        <file>data/elseWithoutIf8.scxml</file>
+        <file>data/elseWithoutIf9.scxml</file>
+        <file>data/elseWithoutIf10.scxml</file>
+        <file>data/invalidContent.scxml</file>
+        <file>data/invalidInvoke.scxml</file>
+        <file>data/invalidInvoke2.scxml</file>
+        <file>data/invalidInvoke3.scxml</file>
+        <file>data/invalidInvoke4.scxml</file>
+        <file>data/invalidRoot2.scxml</file>
+        <file>data/invalidRoot3.scxml</file>
+        <file>data/invalidRoot4.scxml</file>
+        <file>data/noContentInInvoke.scxml</file>
+        <file>data/noContentInInvoke2.scxml</file>
+        <file>data/noContentInInvoke3.scxml</file>
+        <file>data/noContentInInvoke4.scxml</file>
+        <file>data/prematureEndOfDocument2.scxml</file>
+        <file>data/wrongRoot.scxml</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3