diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 9f27d8d..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,592 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="75ef5724-93bc-4ed4-82b2-ff12411188dc" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/python/javaDS.py" beforeDir="false" afterPath="$PROJECT_DIR$/python/javaDS.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DefaultGradleProjectSettings">
-    <option name="isMigrated" value="true" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>Ifst</find>
-      <find>push(8</find>
-      <find>Method</find>
-      <find>body</find>
-      <find>push(8,</find>
-      <find>catch</find>
-      <find>Body</find>
-      <find>ody</find>
-      <find>Body:&quot;</find>
-      <find>catchbody</find>
-      <find>Body:</find>
-      <find>CreateJCloudsContainerMetadata</find>
-      <find>thread.sleep</find>
-      <find>for (</find>
-      <find>String pa : publicAddresses</find>
-      <find>Assignment</find>
-      <find>forst</find>
-      <find>visitBody</find>
-      <find>postOr</find>
-      <find>enha</find>
-      <find>for</find>
-      <find>while</find>
-      <find>setHasAcessDate</find>
-      <find>SwitchStatement</find>
-      <find>block</find>
-      <find>&quot;Block&quot;,</find>
-      <find>switch</find>
-      <find>case</find>
-      <find>SynchronizedStatement</find>
-      <find>todo</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>fixminer</replace>
-    </replaceStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="alwaysUpdateSnapshots" value="true" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="ProjectId" id="1d1vSh6kcsH7f7UD8sxlgrJsuvj" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.38275862" />
-    <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
-      <recent name="" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="edu.lu.uni.serval" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/richedit/src/main/resource" />
-      <recent name="$PROJECT_DIR$/python/data" />
-      <recent name="$PROJECT_DIR$/src/main/resources" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Application.Launcher">
-    <configuration default="true" type="Applet">
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="Launcher" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.Launcher" />
-      <module name="RichEdit" />
-      <option name="PROGRAM_PARAMETERS" value="$PROJECT_DIR$/src/main/resources/config.yml RICHEDITSCRIPT" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TestJavaMiner" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="RichEdit" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestJavaMiner" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TestJavaMiner.test_collections_2d6bc8_506966" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="RichEdit" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestJavaMiner" />
-      <option name="METHOD_NAME" value="test_collections_2d6bc8_506966" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TestJavaMiner.test_collections_3761b5_3639ab" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="RichEdit" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestJavaMiner" />
-      <option name="METHOD_NAME" value="test_collections_3761b5_3639ab" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TestJavaMiner.test_fuse_cb3362_cfb295" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="RichEdit" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestJavaMiner" />
-      <option name="METHOD_NAME" value="test_fuse_cb3362_cfb295" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="TEST_OBJECT" value="class" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="FixPatternMiner [assembly:assembly]" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list>
-                <option value="assembly:assembly" />
-                <option value="-DskipTests" />
-              </list>
-            </option>
-            <option name="pomFileName" value="pom.xml" />
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="$PROJECT_DIR$" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method v="2" />
-    </configuration>
-    <configuration name="FixPatternMiner [package]" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list>
-                <option value="package" />
-                <option value="-DskipTests" />
-              </list>
-            </option>
-            <option name="pomFileName" value="pom.xml" />
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="$PROJECT_DIR$" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="TestNG">
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <properties />
-      <listeners />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file enabled="true" id="idea.log" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <list>
-      <item itemvalue="Application.Launcher" />
-      <item itemvalue="JUnit.TestJavaMiner.test_collections_3761b5_3639ab" />
-      <item itemvalue="JUnit.TestJavaMiner" />
-      <item itemvalue="JUnit.TestJavaMiner.test_fuse_cb3362_cfb295" />
-      <item itemvalue="JUnit.TestJavaMiner.test_collections_2d6bc8_506966" />
-      <item itemvalue="Maven.FixPatternMiner [assembly:assembly]" />
-      <item itemvalue="Maven.FixPatternMiner [package]" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.Launcher" />
-        <item itemvalue="JUnit.TestJavaMiner.test_collections_2d6bc8_506966" />
-        <item itemvalue="JUnit.TestJavaMiner" />
-        <item itemvalue="JUnit.TestJavaMiner.test_collections_3761b5_3639ab" />
-        <item itemvalue="JUnit.TestJavaMiner.test_fuse_cb3362_cfb295" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="ServiceViewManager">
-    <option name="viewStates">
-      <list>
-        <serviceView>
-          <treeState>
-            <expand />
-            <select />
-          </treeState>
-        </serviceView>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="75ef5724-93bc-4ed4-82b2-ff12411188dc" name="Default Changelist" comment="" />
-      <created>1586198160464</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1586198160464</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="880" y="387" key="#Project_Structure" timestamp="1591606458799">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state x="880" y="387" key="#Project_Structure/0.0.2560.1440@0.0.2560.1440" timestamp="1591606458799" />
-    <state x="744" y="383" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1591607084798">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state x="744" y="383" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2560.1440@0.0.2560.1440" timestamp="1591607084798" />
-    <state width="2518" height="519" key="GridCell.Tab.0.bottom" timestamp="1591609026407">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.0.bottom/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026407" />
-    <state width="2518" height="519" key="GridCell.Tab.0.center" timestamp="1591609026406">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.0.center/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026406" />
-    <state width="2518" height="519" key="GridCell.Tab.0.left" timestamp="1591609026406">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.0.left/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026406" />
-    <state width="2518" height="519" key="GridCell.Tab.0.right" timestamp="1591609026407">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.0.right/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026407" />
-    <state width="2518" height="519" key="GridCell.Tab.1.bottom" timestamp="1591609026408">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.1.bottom/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026408" />
-    <state width="2518" height="519" key="GridCell.Tab.1.center" timestamp="1591609026408">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.1.center/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026408" />
-    <state width="2518" height="519" key="GridCell.Tab.1.left" timestamp="1591609026407">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.1.left/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026407" />
-    <state width="2518" height="519" key="GridCell.Tab.1.right" timestamp="1591609026408">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state width="2518" height="519" key="GridCell.Tab.1.right/0.0.2560.1440@0.0.2560.1440" timestamp="1591609026408" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java</url>
-          <line>49</line>
-          <option name="timeStamp" value="9" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java</url>
-          <line>72</line>
-          <option name="timeStamp" value="25" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/io/TreeIoUtils.java</url>
-          <line>652</line>
-          <option name="timeStamp" value="31" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionGenerator.java</url>
-          <line>60</line>
-          <option name="timeStamp" value="32" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java</url>
-          <line>164</line>
-          <option name="timeStamp" value="36" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java</url>
-          <line>71</line>
-          <option name="timeStamp" value="37" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java</url>
-          <line>88</line>
-          <option name="timeStamp" value="38" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java</url>
-          <line>21</line>
-          <option name="timeStamp" value="39" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java</url>
-          <line>109</line>
-          <option name="timeStamp" value="46" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>19</line>
-          <option name="timeStamp" value="49" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java</url>
-          <line>69</line>
-          <option name="timeStamp" value="50" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java</url>
-          <line>72</line>
-          <option name="timeStamp" value="51" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java</url>
-          <line>89</line>
-          <option name="timeStamp" value="52" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>29</line>
-          <option name="timeStamp" value="60" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>44</line>
-          <option name="timeStamp" value="61" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>109</line>
-          <option name="timeStamp" value="81" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java</url>
-          <line>318</line>
-          <option name="timeStamp" value="84" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>301</line>
-          <option name="timeStamp" value="91" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java</url>
-          <line>1134</line>
-          <option name="timeStamp" value="95" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gen/jdt/exp/ExpJdtVisitor.java</url>
-          <line>1243</line>
-          <option name="timeStamp" value="96" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>337</line>
-          <option name="timeStamp" value="97" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>389</line>
-          <option name="timeStamp" value="99" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>450</line>
-          <option name="timeStamp" value="102" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>461</line>
-          <option name="timeStamp" value="103" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>594</line>
-          <option name="timeStamp" value="105" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>619</line>
-          <option name="timeStamp" value="106" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>654</line>
-          <option name="timeStamp" value="109" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>746</line>
-          <option name="timeStamp" value="112" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestJavaMiner.java</url>
-          <line>776</line>
-          <option name="timeStamp" value="113" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java</url>
-          <line>100</line>
-          <option name="timeStamp" value="116" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java</url>
-          <line>38</line>
-          <option name="timeStamp" value="117" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java</url>
-          <line>90</line>
-          <option name="timeStamp" value="118" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java</url>
-          <line>85</line>
-          <option name="timeStamp" value="119" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="debuggerHistoryManager">
-    <expressions id="evaluateCodeFragment">
-      <expression>
-        <expression-string>((Tree)hierarchicalActionSet1.node).getChildren().stream().filter(x-&gt;x.getType() == 14).collect(Collectors.toList())</expression-string>
-        <language-id>JAVA</language-id>
-        <custom-info>com.github.gumtreediff.tree.Tree</custom-info>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>((Tree)hierarchicalActionSet1.node).getChildren().stream().filter(x-&gt;x.getType() == 14)</expression-string>
-        <language-id>JAVA</language-id>
-        <custom-info>com.github.gumtreediff.tree.Tree</custom-info>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>((Tree)hierarchicalActionSet1.node).getChildren()</expression-string>
-        <language-id>JAVA</language-id>
-        <custom-info>com.github.gumtreediff.tree.Tree</custom-info>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>((Tree)hierarchicalActionSet1.node).children</expression-string>
-        <language-id>JAVA</language-id>
-        <custom-info>com.github.gumtreediff.tree.Tree</custom-info>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>postOrder(reActionSets1.get(0)).stream().collect(Collectors.toList()).get(0)</expression-string>
-        <language-id>JAVA</language-id>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>postOrder(reActionSets1.get(0)).stream().collect(Collectors.toList()).get(0).getNode().getChild(0).getType()</expression-string>
-        <language-id>JAVA</language-id>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>postOrder(reActionSets1.get(0)).stream().collect(Collectors.toList()).get(0).getNode()</expression-string>
-        <language-id>JAVA</language-id>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>postOrder(reActionSets1.get(0)).stream().collect(Collectors.toList())</expression-string>
-        <language-id>JAVA</language-id>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>postOrder(reActionSets1.get(0)).stream().filter(x-&gt;isStatement(x)).collect(Collectors.toList())</expression-string>
-        <language-id>JAVA</language-id>
-        <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
-      </expression>
-    </expressions>
-  </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 22bf4c0..3e8645d 100644
--- a/README.md
+++ b/README.md
@@ -84,10 +84,10 @@ In order to launch FixMiner, execute [fixminer.sh](python/fixminer.sh)
 
     bash fixminer.sh [JOB] [CONFIG_FILE]
      e.g. bash fixminer.sh  dataset4c /Users/projects/release/fixminer_source/src/main/resources/config.yml
+     
+A log file (app.log) is created after every execution of the [fixminer.sh]((python/fixminer.sh)). Please check this log file in order to access more information. 
+ 
 
-#### Redis Commands
-hlen diffEntry
-To see number of patches / diff entries computed rich edit
     
 #### Job Types  
 
@@ -111,6 +111,10 @@ To see number of patches / diff entries computed rich edit
                           
                            ```     
    5. __cluster__ : Forms clusters of identical trees. The output of this step is written to __shapes__ folder which will be generated under __datapath__ in [config file](src/main/resources/config.yml)
+   
+   6. __stats__: Calculate frequency statistics of the patterns under statsshapes.csv in datapath. The information is also written in app.log file.
+   
+   7. __exportPatterns__ : Export FixPatterns of APR integration under patterns folder located in datapath/
                                                                                                                    
    <!--
     
@@ -236,9 +240,81 @@ Replication Data:
 
 #### Data Viewer
 
-The data provided with replication package is listed in directory [python/data](python/data)
-The data is stored in different formats. (e.g. pickle, db, csv, etc..)
+The intermediate data provided computed during the steps are listed in directory datapath (see [config file](src/main/resources/config.yml))
+                                                                                                  
+The data is stored in different formats. (e.g. pickle, redis db, csv, etc..)
 
+###### Redis Commands
+
+Connect to redis instance
+
+ ```powershell
+     redis-cli -p 6399
+  ```   
+
+We use 3 databases inside the redis, 0,1,2.
+DB 0 stores the richedit dumps, comparison indices
+DB 1 stores the filenames and their corresponding indices
+DB 2 stores the output of comparison, a.k.a same trees.
+
+In order to switch between these database use the following command
+
+ ```powershell
+     select 2
+  ```   
+
+In order to trace the status of the stored rich edit scripts, use the following command
+
+ ```powershell
+     hlen dump
+  ```   
+
+In order to access the rich edit of a single hunk, first locate the key from DB 0. This command returns the exact name of the keys
+
+ ```powershell
+keys *NAME_OF_THE_HUNK
+
+keys *fuse_67b14b_04e5b1_fabric#fabric-client#src#main#java#org#fusesource#fabric#jolokia#facade#facades#ProfileFacade.java.txt_1
+
+OUTPUT:
+1) "MethodDeclaration/40/fuse_67b14b_04e5b1_fabric#fabric-client#src#main#java#org#fusesource#fabric#jolokia#facade#facades#ProfileFacade.java.txt_1"
+  ```   
+
+Then, use the exact key in order to access the rich edit:
+ ```powershell
+hget dump NAME_OF_THE_EXACT_KEY
+
+hget dump MethodDeclaration/40/fuse_67b14b_04e5b1_fabric#fabric-client#src#main#java#org#fusesource#fabric#jolokia#facade#facades#ProfileFacade.java.txt_1
+
+OUTPUT:
+"INS MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @TO@ TypeDeclaration@@[public]ProfileFacade, [Profile, HasId] @AT@ 7279 @LENGTH@ 309\n---INS Modifier@@public @TO@ MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @AT@ 7279 @LENGTH@ 6\n---INS PrimitiveType@@void @TO@ MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @AT@ 7286 @LENGTH@ 4\n---INS SimpleName@@MethodName:setConfiguration @TO@ MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @AT@ 7291 @LENGTH@ 16\n---INS SingleVariableDeclaration@@String pid @TO@ MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @AT@ 7308 @LENGTH@ 10\n------INS SimpleType@@String @TO@ SingleVariableDeclaration@@String pid @AT@ 7308 @LENGTH@ 6\n------INS SimpleName@@pid @TO@ SingleVariableDeclaration@@String pid @AT@ 7315 @LENGTH@ 3\n---INS SingleVariableDeclaration@@Map<String,String> configuration @TO@ MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @AT@ 7320 @LENGTH@ 33\n------INS ParameterizedType@@Map<String,String> @TO@ SingleVariableDeclaration@@Map<String,String> configuration @AT@ 7320 @LENGTH@ 19\n---------INS SimpleType@@Map @TO@ ParameterizedType@@Map<String,String> @AT@ 7320 @LENGTH@ 3\n---------INS SimpleType@@String @TO@ ParameterizedType@@Map<String,String> @AT@ 7324 @LENGTH@ 6\n---------INS SimpleType@@String @TO@ ParameterizedType@@Map<String,String> @AT@ 7332 @LENGTH@ 6\n------INS SimpleName@@configuration @TO@ SingleVariableDeclaration@@Map<String,String> configuration @AT@ 7340 @LENGTH@ 13\n---INS VariableDeclarationStatement@@Map<String,Map<String,String>> configurations=getConfigurations(); @TO@ MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @AT@ 7365 @LENGTH@ 70\n------INS ParameterizedType@@Map<String,Map<String,String>> @TO@ VariableDeclarationStatement@@Map<String,Map<String,String>> configurations=getConfigurations(); @AT@ 7365 @LENGTH@ 32\n---------INS SimpleType@@Map @TO@ ParameterizedType@@Map<String,Map<String,String>> @AT@ 7365 @LENGTH@ 3\n---------INS SimpleType@@String @TO@ ParameterizedType@@Map<String,Map<String,String>> @AT@ 7369 @LENGTH@ 6\n---------INS ParameterizedType@@Map<String,String> @TO@ ParameterizedType@@Map<String,Map<String,String>> @AT@ 7377 @LENGTH@ 19\n------------INS SimpleType@@Map @TO@ ParameterizedType@@Map<String,String> @AT@ 7377 @LENGTH@ 3\n------------INS SimpleType@@String @TO@ ParameterizedType@@Map<String,String> @AT@ 7381 @LENGTH@ 6\n------------INS SimpleType@@String @TO@ ParameterizedType@@Map<String,String> @AT@ 7389 @LENGTH@ 6\n------INS VariableDeclarationFragment@@configurations=getConfigurations() @TO@ VariableDeclarationStatement@@Map<String,Map<String,String>> configurations=getConfigurations(); @AT@ 7398 @LENGTH@ 36\n---------INS SimpleName@@configurations @TO@ VariableDeclarationFragment@@configurations=getConfigurations() @AT@ 7398 @LENGTH@ 14\n---------INS MethodInvocation@@MethodName:getConfigurations:[] @TO@ VariableDeclarationFragment@@configurations=getConfigurations() @AT@ 7415 @LENGTH@ 19\n---INS IfStatement@@if (configurations != null) {  configurations.put(pid,configuration);  setConfigurations(configurations);} @TO@ MethodDeclaration@@public, void, MethodName:setConfiguration, String pid, Map<String,String> configuration,  @AT@ 7444 @LENGTH@ 138\n------INS InfixExpression@@configurations != null @TO@ IfStatement@@if (configurations != null) {  configurations.put(pid,configuration);  setConfigurations(configurations);} @AT@ 7448 @LENGTH@ 22\n---------INS SimpleName@@configurations @TO@ InfixExpression@@configurations != null @AT@ 7448 @LENGTH@ 14\n---------INS Operator@@!= @TO@ InfixExpression@@configurations != null @AT@ 7462 @LENGTH@ 2\n---------INS NullLiteral@@null @TO@ InfixExpression@@configurations != null @AT@ 7466 @LENGTH@ 4\n------INS Block@@ThenBody:{  configurations.put(pid,configuration);  setConfigurations(configurations);} @TO@ IfStatement@@if (configurations != null) {  configurations.put(pid,configuration);  setConfigurations(configurations);} @AT@ 7472 @LENGTH@ 110\n---------INS ExpressionStatement@@MethodInvocation:configurations.put(pid,configuration) @TO@ Block@@ThenBody:{  configurations.put(pid,configuration);  setConfigurations(configurations);} @AT@ 7486 @LENGTH@ 39\n------------INS MethodInvocation@@configurations.put(pid,configuration) @TO@ ExpressionStatement@@MethodInvocation:configurations.put(pid,configuration) @AT@ 7486 @LENGTH@ 38\n---------------INS SimpleName@@Name:configurations @TO@ MethodInvocation@@configurations.put(pid,configuration) @AT@ 7486 @LENGTH@ 14\n---------------INS SimpleName@@MethodName:put:[pid, configuration] @TO@ MethodInvocation@@configurations.put(pid,configuration) @AT@ 7501 @LENGTH@ 23\n------------------INS SimpleName@@pid @TO@ SimpleName@@MethodName:put:[pid, configuration] @AT@ 7505 @LENGTH@ 3\n------------------INS SimpleName@@configuration @TO@ SimpleName@@MethodName:put:[pid, configuration] @AT@ 7510 @LENGTH@ 13\n---------INS ExpressionStatement@@MethodInvocation:setConfigurations(configurations) @TO@ Block@@ThenBody:{  configurations.put(pid,configuration);  setConfigurations(configurations);} @AT@ 7538 @LENGTH@ 34\n------------INS MethodInvocation@@setConfigurations(configurations) @TO@ ExpressionStatement@@MethodInvocation:setConfigurations(configurations) @AT@ 7538 @LENGTH@ 33\n---------------INS SimpleName@@MethodName:setConfigurations:[configurations] @TO@ MethodInvocation@@setConfigurations(configurations) @AT@ 7538 @LENGTH@ 33\n------------------INS SimpleName@@configurations @TO@ SimpleName@@MethodName:setConfigurations:[configurations] @AT@ 7556 @LENGTH@ 14\n"  
+  ```  
+
+Or use the following command to access specialized trees:
+
+ ```powershell
+hgetall NAME_OF_THE_EXACT_KEY
+
+hgetall MethodDeclaration/40/fuse_67b14b_04e5b1_fabric#fabric-client#src#main#java#org#fusesource#fabric#jolokia#facade#facades#ProfileFacade.java.txt_1
+
+OUTPUT:
+1) "targetTree"
+2) "[(55@@[(31@@)][(31@@)][(31@@)][(31@@[(44@@)][(44@@)])][(31@@[(44@@[(74@@)][(74@@)][(74@@)])][(44@@)])][(31@@[(60@@[(74@@)][(74@@)][(74@@[(74@@)][(74@@)][(74@@)])])][(60@@[(59@@)][(59@@)])])][(31@@[(25@@[(27@@)][(27@@)][(27@@)])][(25@@[(8@@[(21@@[(32@@)][(32@@[(42@@)][(42@@)])])])][(8@@[(21@@[(32@@[(42@@)])])])])])])]"
+3) "actionTree"
+4) "[(100@@[(100@@)][(100@@)][(100@@)][(100@@[(100@@)][(100@@)])][(100@@[(100@@[(100@@)][(100@@)][(100@@)])][(100@@)])][(100@@[(100@@[(100@@)][(100@@)][(100@@[(100@@)][(100@@)][(100@@)])])][(100@@[(100@@)][(100@@)])])][(100@@[(100@@[(100@@)][(100@@)][(100@@)])][(100@@[(100@@[(100@@[(100@@)][(100@@[(100@@)][(100@@)])])])][(100@@[(100@@[(100@@[(100@@)])])])])])])]"
+5) "shapeTree"
+6) "[(31@@[(83@@)][(39@@)][(42@@)][(44@@[(43@@)][(42@@)])][(44@@[(74@@[(43@@)][(43@@)][(43@@)])][(42@@)])][(60@@[(74@@[(43@@)][(43@@)][(74@@[(43@@)][(43@@)][(43@@)])])][(59@@[(42@@)][(32@@)])])][(25@@[(27@@[(42@@)][(-1@@)][(33@@)])][(8@@[(21@@[(32@@[(42@@)][(42@@[(42@@)][(42@@)])])])][(21@@[(32@@[(42@@[(42@@)])])])])])])]"
+  ```  
+
+After executing the shapeSI step, the rich edit scripts to be compared are stored in a key in DB 0. Use the following command to verify number of comparison to be made.
+
+This command can also be used in order to progress the compare step. When the comparison is completed the following command will return 0.
+ ```powershell
+scard compare
+  ``` 
+
+
+###### Pickle
 The see content of the .pickle file the following script could be used.
 
   ```python
diff --git a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java
index 9332f78..0d573fa 100644
--- a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java
+++ b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java
@@ -113,12 +113,13 @@ public abstract class AbstractSrcmlTreeGenerator extends TreeGenerator {
                             typeLabel = prefix + ":"+typeLabel;
                         }
 
-                        if(typeLabel.equals("literal")){
+                        if(typeLabel.equals("literal") || typeLabel.equals("if")){
                             if(s.getAttributeByName(COMMENT_BLOCK) != null){
                                 String value = s.getAttributeByName(COMMENT_BLOCK).getValue();
                                 typeLabel = typeLabel + ":"+value;
                             }
                         }
+
                         List<Integer> keysByValue = getKeysByValue(NodeMap_new.map, typeLabel);
                         if(keysByValue == null || keysByValue.size() ==0){
                             System.out.println(typeLabel);
diff --git a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java
index 183ae06..25162db 100644
--- a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java
+++ b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java
@@ -421,6 +421,9 @@ public class NodeMap_new {
         StatementMap.put(    39  , "goto");
         StatementMap.put(    40  , "label");
 
+        StatementMap.put(    43  , "macro");
+        StatementMap.put(    55  , "switch");
+
         StatementMap.put(    81  , "struct");
         StatementMap.put(    82  , "struct_decl");
         StatementMap.put(    83  , "union");
diff --git a/python/abstractPatch.py b/python/abstractPatch.py
index fb49db7..2a7bea9 100644
--- a/python/abstractPatch.py
+++ b/python/abstractPatch.py
@@ -295,7 +295,7 @@ def dumpFilesCore(t):
     except Exception as ex:
         logging.error(t)
         logging.error(ex)
-        raise ex
+        # raise ex
 
 
 
diff --git a/python/common/__init__.pyc b/python/common/__init__.pyc
index c0c4f67..d8686b6 100644
Binary files a/python/common/__init__.pyc and b/python/common/__init__.pyc differ
diff --git a/python/common/__pycache__/__init__.cpython-37.pyc b/python/common/__pycache__/__init__.cpython-37.pyc
deleted file mode 100644
index 5496b70..0000000
Binary files a/python/common/__pycache__/__init__.cpython-37.pyc and /dev/null differ
diff --git a/python/data/datasets.csv b/python/data/datasets.csv
index dc7dee4..e57d44c 100644
--- a/python/data/datasets.csv
+++ b/python/data/datasets.csv
@@ -8,7 +8,6 @@ gzip, https://git.savannah.gnu.org/git/gzip.git
 libarchive, https://github.com/libarchive/libarchive
 cairo, https://gitlab.freedesktop.org/cairo/cairo.git
 vlc, https://github.com/videolan/vlc.git
-freebsd, https://github.com/freebsd/freebsd
 curl, https://github.com/curl/curl.git
 tcl, https://github.com/tcltk/tcl.git
 cpython, https://github.com/python/cpython.git
diff --git a/python/fixminer.sh b/python/fixminer.sh
index a682433..2fc18e3 100644
--- a/python/fixminer.sh
+++ b/python/fixminer.sh
@@ -3,4 +3,4 @@
 
 source activate fixminerEnv
 
-PYTHONPATH=$(pwd) python -u main.py -root $(pwd) -job $1 -prop $2
+PYTHONPATH=$(pwd) python -u main.py -root $(pwd) -job $2 -prop $1
diff --git a/python/main.py b/python/main.py
index 7db95cd..d632bbc 100644
--- a/python/main.py
+++ b/python/main.py
@@ -140,26 +140,26 @@ if __name__ == '__main__':
 
 
         elif job =='indexClusters':
-            # from sprinferIndex import runSpinfer
-            # runSpinfer()
+            from sprinferIndex import runSpinfer
+            runSpinfer()
+
+            from sprinferIndex import test
+            test()
+            from sprinferIndex import divideCoccis
+            divideCoccis()
+            from sprinferIndex import removeDuplicates
+            removeDuplicates()
+
+
+            # from patchManyBugs import patchCore
+            # patchCore()
+            # # from patchManyBugs import patched
+            # # patched()
+            # from patchManyBugs import exportSosPatches
+            # exportSosPatches()
+            # from validate_manybugs import validate
             #
-            # from sprinferIndex import test
-            # test()
-            # from sprinferIndex import divideCoccis
-            # divideCoccis()
-            # from sprinferIndex import removeDuplicates
-            # removeDuplicates()
-
-
-            from patchManyBugs import patchCore
-            patchCore()
-            # from patchManyBugs import patched
-            # patched()
-            from patchManyBugs import exportSosPatches
-            exportSosPatches()
-            from validate_manybugs import validate
-
-            validate()
+            # validate()
 
         elif job =='patternOperations':
             from sprinferIndex import patternOperations
diff --git a/python/otherDatasets.py b/python/otherDatasets.py
index d5b7589..1aecb49 100644
--- a/python/otherDatasets.py
+++ b/python/otherDatasets.py
@@ -204,7 +204,11 @@ def collectBugFixPatches(dsName):
     # commits = commits[commits.files.apply(lambda x: len(x) == 1)]
     # commits['cocci'] = commits.log.apply(lambda x: True if re.search('cocci|coccinelle', x) else False)
     # coccis = commits[commits.cocci].commit.values.tolist()
-    fixes = commits[commits.fixes.str.len()!=0].commit.values.tolist()
+    if dsName == 'linux':
+        commits['cocci'] = commits.log.apply(lambda x: True if re.search('cocci|coccinelle', x) else False)
+        fixes = commits[commits.cocci].commit.values.tolist()
+    else:
+        fixes = commits[commits.fixes.str.len()!=0].commit.values.tolist()
     # links = commits[commits.links.str.len()!=0].commit.values.tolist()
 
     # bugs = set(fixes).union(links).union(coccis)
diff --git a/python/sprinferIndex.py b/python/sprinferIndex.py
index fae3f6d..8544ea6 100644
--- a/python/sprinferIndex.py
+++ b/python/sprinferIndex.py
@@ -201,7 +201,9 @@ def removeDuplicates():
             ind = ind +1
     cocciPatterns['iFiles'] = cocciPatterns.inferedFrom.apply(lambda x: getInferred(x[0]))
 
-
+    cocciPatterns['freq'] = cocciPatterns.iFiles.apply(lambda x: len(x))
+    cocciPatterns['project'] = cocciPatterns.iFiles.apply(lambda x: list(set([i.split('/{')[0].replace('(','') for i in x])))
+    cocciPatterns.sort_values(by='freq', inplace=True, ascending=False)
     save_zipped_pickle(cocciPatterns,join(DATA_PATH,'allCocciPatterns.pickle'))
     allPatterns = cocciPatterns.cid.values.tolist()
     uniquePatterns = cocciPatterns.drop_duplicates(subset=['pattern']).cid.values.tolist()
diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java
index 5068b0d..56f2cf4 100755
--- a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java
+++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java
@@ -23,52 +23,52 @@ public class EDiffHunkParser extends EDiffParser {
 	private static Logger logger = LoggerFactory.getLogger(EDiffHunkParser.class);
 	@Override
 	public void parseFixPatterns(File prevFile, File revFile, File diffentryFile, String project, JedisPool innerPool,String srcMLPath,String hunkLimit,boolean isJava) {
-
-		String datasetName = project;
-		String[] split1 = diffentryFile.getParent().split(datasetName);
-		String root = split1[0];
-		String pj = split1[1].split("/")[1];
+		try {
+			String datasetName = project;
+			String[] split1 = diffentryFile.getParent().split(datasetName);
+			String root = split1[0];
+			String pj = split1[1].split("/")[1];
 
 
-		List<HierarchicalActionSet> actionSets = parseChangedSourceCodeWithGumTree2(prevFile, revFile, srcMLPath,isJava);
+			List<HierarchicalActionSet> actionSets = parseChangedSourceCodeWithGumTree2(prevFile, revFile, srcMLPath, isJava);
 
-		if (actionSets != null && actionSets.size() != 0) {
+			if (actionSets != null && actionSets.size() != 0) {
 
-			boolean processActionSet = true;
+				boolean processActionSet = true;
 
-			if (actionSets.size() > Integer.valueOf(hunkLimit)) {
-				processActionSet = false;
-				logger.debug("Skipping {} set size {}", diffentryFile.getName(), hunkLimit);
-			}
+				if (actionSets.size() > Integer.valueOf(hunkLimit)) {
+					processActionSet = false;
+					logger.debug("Skipping {} set size {}", diffentryFile.getName(), hunkLimit);
+				}
 
-			int hunkSet = 0;
-			if (processActionSet) {
+				int hunkSet = 0;
+				if (processActionSet) {
 
-				for (HierarchicalActionSet actionSet : actionSets) {
+					for (HierarchicalActionSet actionSet : actionSets) {
 //					FileOutputStream f = null;
 
-					try {
+//						try {
 
-						String astNodeType = actionSet.getAstNodeType();
+							String astNodeType = actionSet.getAstNodeType();
 //						if (astNodeType.equals(rootType)){
 //
 //						}
-						actionSet.toString();
-						int size = actionSet.getActionSize();
+							actionSet.toString();
+							int size = actionSet.getActionSize();
 
 
-						String key = astNodeType + "/" + String.valueOf(size) + "/" + pj + "_" + diffentryFile.getName() + "_" + String.valueOf(hunkSet);
+							String key = astNodeType + "/" + String.valueOf(size) + "/" + pj + "_" + diffentryFile.getName() + "_" + String.valueOf(hunkSet);
 
-						ITree targetTree = EDiffHelper.getTargets(actionSet,isJava);
-						ITree actionTree = EDiffHelper.getActionTrees(actionSet);
-						ITree shapeTree = EDiffHelper.getShapeTree(actionSet,isJava);
-						try (Jedis inner = innerPool.getResource()) {
+							ITree targetTree = EDiffHelper.getTargets(actionSet, isJava);
+							ITree actionTree = EDiffHelper.getActionTrees(actionSet);
+							ITree shapeTree = EDiffHelper.getShapeTree(actionSet, isJava);
+							try (Jedis inner = innerPool.getResource()) {
 
-							inner.hset("dump", key, actionSet.toString());
-							inner.hset(key, "actionTree", actionTree.toStaticHashString());
-							inner.hset(key, "targetTree", targetTree.toStaticHashString());
-							inner.hset(key, "shapeTree", shapeTree.toStaticHashString());
-						}
+								inner.hset("dump", key, actionSet.toString());
+								inner.hset(key, "actionTree", actionTree.toStaticHashString());
+								inner.hset(key, "targetTree", targetTree.toStaticHashString());
+								inner.hset(key, "shapeTree", shapeTree.toStaticHashString());
+							}
 //						File f = new File(root+"dumps/"+astNodeType+"/"+String.valueOf(size)+"/");
 //						f.mkdirs();
 //						f = new File(root+"dumps/"+key);
@@ -82,18 +82,22 @@ public class EDiffHunkParser extends EDiffParser {
 //						oos.flush();
 //						oos.close();
 
-					} catch (Exception e) {
-						logger.error("error", e);
-//						e.printStackTrace();
+//						} catch (Exception e) {
+//							logger.error("error", e);
+////						e.printStackTrace();
+//						}
+						hunkSet++;
+					}
+					try (Jedis inner = innerPool.getResource()) {
+						inner.hset("diffEntry", pj + "_" + diffentryFile.getName(), "1");
 					}
-					hunkSet++;
-				}
-				try (Jedis inner = innerPool.getResource()) {
-					inner.hset("diffEntry", pj + "_" + diffentryFile.getName(), "1");
-				}
 
+				}
 			}
-		}
+		} catch (Exception e) {
+		logger.error("error", e);
+//						e.printStackTrace();
+	}
 
 
 	}
diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java
index 9b4f75f..c85f279 100755
--- a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java
+++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java
@@ -59,7 +59,7 @@ public class EDiffParser extends Parser {
 		}
 		if (gumTreeResults == null) {
 			this.resultType = 1;
-			return null;
+			return actionSets;
 		} else if (gumTreeResults.size() == 0){
 			this.resultType = 2;
 			return actionSets;
@@ -69,11 +69,11 @@ public class EDiffParser extends Parser {
 			if (isJava){
 				allActionSets = new HierarchicalRegrouper().regroupGumTreeResults(gumTreeResults);
 			}else{
-//				HashSet<Integer> removeType = new HashSet<Integer>(Arrays.asList(171,172,99,100,101,102));
-//				boolean b = gumTreeResults.stream().anyMatch(p -> removeType.contains(p.getNode().getType()));
-//				if(b){
-//					return actionSets;
-//				}
+				HashSet<Integer> removeType = new HashSet<Integer>(Arrays.asList(131,132,133,134,135,136,137));
+				boolean b = gumTreeResults.stream().anyMatch(p -> removeType.contains(p.getNode().getType()));
+				if(b){
+					return actionSets;
+				}
 				allActionSets = new HierarchicalRegrouperForC().regroupGumTreeResults(gumTreeResults);
 			}
 
diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java
index dfc2c40..9c8bd92 100755
--- a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java
+++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java
@@ -31,6 +31,11 @@ public class HierarchicalRegrouper {
 		 */
 		List<HierarchicalActionSet> actionSets = new ArrayList<>();
 		HierarchicalActionSet actionSet = null;
+
+		if(actions == null){
+			return actionSets;
+		}
+
 		for(Action act : actions){
 			Action parentAct = findParentAction(act, actions);
 			if (parentAct == null) {
diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java
index affdb4a..a283b26 100644
--- a/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java
+++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java
@@ -63,7 +63,7 @@ public class HierarchicalRegrouperForC {
 				}
 			}
 		}
-		
+
 		/*
 		 * Third, add the subActionSet to its parent ActionSet.
 		 */
@@ -79,23 +79,58 @@ public class HierarchicalRegrouperForC {
 //				if (astNodeType.endsWith("TypeDeclaration") || astNodeType.endsWith("FieldDeclaration")  || astNodeType.endsWith("EnumDeclaration") ||
 //						astNodeType.endsWith("MethodDeclaration") || astNodeType.endsWith("Statement") ||
 //						astNodeType.endsWith("ConstructorInvocation") || astNodeType.endsWith("CatchClause") || astNodeType.endsWith("SwitchCase")) {
-				if (isStatement(actSet.getNode())) {
+				if (isStatement(actSet.getNode()) || actSet.getAstNodeType().equals("block")) {
 					reActionSets.add(actSet);
 				}
 //				}
 			}
 		}
-
+		List<ITree> movDelNodes = new ArrayList<>();
 		List<HierarchicalActionSet> reActionSets1 = new ArrayList<>();
-		for(HierarchicalActionSet a:reActionSets){
-			HierarchicalActionSet hierarchicalActionSet = purifyActionSet(a);
-			List<HierarchicalActionSet> hierarchicalActionSets = divideBlocks(hierarchicalActionSet);
-			if(hierarchicalActionSets != null){
-				reActionSets1.addAll(hierarchicalActionSets);
-			}else{
-				reActionSets1.add(hierarchicalActionSet);
-			}
 
+		if (reActionSets.size() == 0 && actionSets.size()==1 && actionSets.get(0).getAstNodeType().equals("block")){
+			reActionSets.add(actionSets.get(0));
+		}
+
+		for(HierarchicalActionSet a:reActionSets) {
+			a = purifyActionSet(a);
+			List<HierarchicalActionSet> hierarchicalActionSets = divideBlocks(a);
+			if (hierarchicalActionSets != null) {
+				reActionSets1.addAll(hierarchicalActionSets);
+			} else {
+				reActionSets1.add(a);
+			}
+		}
+		if(reActionSets1.size() > 1 && reActionSets1.stream().anyMatch(p->p.getAction() instanceof Delete)) {
+			List<HierarchicalActionSet> reActionSets2 = new ArrayList<>();
+			for (HierarchicalActionSet a : reActionSets1) {
+				Predicate<HierarchicalActionSet> predicate = x -> x.getAction() instanceof Move;
+				List<HierarchicalActionSet> collect = postOrder(a).stream().filter(predicate).collect(Collectors.toList());
+				if (collect.size() > 0) {
+					for (HierarchicalActionSet c : collect) {
+
+						ITree movDelNode = c.getNode().getParent();
+						movDelNodes.add(movDelNode);
+
+					}
+					reActionSets2.add(a);
+					continue;
+				}else if(a.getAction() instanceof Update){
+						reActionSets2.add(a);
+				}
+
+
+				if (movDelNodes != null) {
+					if (movDelNodes.contains(a.getNode())) {
+//				if(a.getNode().equals(movDelNode)){
+						continue;
+					}
+				}
+//			reActionSets1.add(a);
+
+
+			}
+			return reActionSets2;
 		}
 
 
@@ -113,7 +148,7 @@ public class HierarchicalRegrouperForC {
 	}
 
 	private List<HierarchicalActionSet> divideBlocks(HierarchicalActionSet actionSet){
-		if (actionSet.getAstNodeType().equals("block") || actionSet.getAstNodeType().equals("function")){
+		if (actionSet.getAstNodeType().equals("block_content") ){ // || actionSet.getAstNodeType().equals("function")){
 			List<HierarchicalActionSet> subActions = actionSet.getSubActions();
 			if (subActions.size() > 1) {
 				boolean b = subActions.stream().allMatch(p -> NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, p.getAstNodeType()).size() == 1 && p.getAstNodeType().equals(subActions.get(0).getAstNodeType()) && p.getAction().getName().equals(subActions.get(0).getAction().getName()));
@@ -149,11 +184,10 @@ public class HierarchicalRegrouperForC {
 //		return b;
 	}
 
-
+//	Predicate<HierarchicalActionSet> predicate = x-> isStatement(x);
 	Predicate<HierarchicalActionSet> predicate = x->NodeMap_new.getKeysByValue(NodeMap_new.StatementMap,x.getAstNodeType()).size() == 1 ;
 	Predicate<HierarchicalActionSet> predicate1 = x->!x.getAstNodeType().equals("block");
 	Predicate<HierarchicalActionSet> predicate2 = x->!x.getAstNodeType().equals("block_content");
-//	Predicate<HierarchicalActionSet> predicate3 = p->p.getAction().getName().equals(subActions.get(0).getAction().getName()));
 	private HierarchicalActionSet removeBlocks(HierarchicalActionSet actionSet){
 		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
 
@@ -162,135 +196,167 @@ public class HierarchicalRegrouperForC {
 		Action action = actionSet.getAction();
 		if (subActions.size() == 1){
 			HierarchicalActionSet subaction = subActions.get(0);
-//			if(!postOrder(subaction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
-//				return actionSet;
-//			}
+
 			List<HierarchicalActionSet> collect = postOrder(subaction).stream().filter(predicate.and(predicate1.and(predicate2))).collect(Collectors.toList());
 			if(collect.size() == 0){
 				return actionSet;
 			}
 			boolean b = collect.stream().anyMatch(p -> p.getAction().getName().equals(subActions.get(0).getAction().getName()));
-			if(!b){
+
+			if(!b ){
 				return actionSet;
 			}
 			Action action1 = subaction.getAction();
-			//else,then,block
 			if(action.getClass().equals(action1.getClass()) && action.getName().equals("UPD")) {
+				subaction.setParent(null);
+				return removeBlocks(subaction);
 
+			}
+		}
+		return actionSet;
+
+	}
+//	Predicate<HierarchicalActionSet> predicate = x->NodeMap_new.getKeysByValue(NodeMap_new.StatementMap,x.getAstNodeType()).size() == 1 ;
+//	Predicate<HierarchicalActionSet> predicate1 = x->!x.getAstNodeType().equals("block");
+//	Predicate<HierarchicalActionSet> predicate2 = x->!x.getAstNodeType().equals("block_content");
+////	Predicate<HierarchicalActionSet> predicate3 = p->p.getAction().getName().equals(subActions.get(0).getAction().getName()));
+//	private HierarchicalActionSet removeBlocks(HierarchicalActionSet actionSet){
+//		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
+//
+//
+//
+//		Action action = actionSet.getAction();
+//		if (subActions.size() == 1){
+//			HierarchicalActionSet subaction = subActions.get(0);
+////			if(!postOrder(subaction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
+////				return actionSet;
+////			}
+//			List<HierarchicalActionSet> collect = postOrder(subaction).stream().filter(predicate.and(predicate1.and(predicate2))).collect(Collectors.toList());
+//			if(collect.size() == 0){
+//				return actionSet;
+//			}
+//			boolean b = collect.stream().anyMatch(p -> p.getAction().getName().equals(subActions.get(0).getAction().getName()));
+//			if(!b){
+//				return actionSet;
+//			}
+//			Action action1 = subaction.getAction();
+//			//else,then,block
+//			if(action.getClass().equals(action1.getClass()) && action.getName().equals("UPD")) {
+//
+////				List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, subaction.getAstNodeType());
+////				if (keysByValue != null && keysByValue.size() == 1) {
+//
+//					subaction.setParent(null);
+//					return removeBlocks(subaction);
+//
+////				}
+////			if(areRelatedActions(action,action1)) {
+////				if (subaction.getAstNodeType().equals("block")) {//|| subaction.getAstNodeType().equals("then") || subaction.getAstNodeType().equals("else")){
+////					List<HierarchicalActionSet> subSubActions = subaction.getSubActions();
+////					if (subSubActions.size() == 1) {
+////
+////						HierarchicalActionSet subsubsubAction = subSubActions.get(0);
+////						List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, subsubsubAction.getAstNodeType());
+////						if (keysByValue != null && keysByValue.size() == 1) {
+////
+////							subsubsubAction.setParent(null);
+////							return removeBlocks(subsubsubAction);
+////
+////						}
+////					}
+////				}
+//			}
+//		}
+//		return actionSet;
+//
+//	}
+
+//	private HierarchicalActionSet removeParentNode(HierarchicalActionSet actionSet){
+//		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
+//		Action action = actionSet.getAction();
+//		if (subActions.size() == 1) {
+//			HierarchicalActionSet subaction = subActions.get(0);
+//			if(!postOrder(subaction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
+//				return actionSet;
+//			}
+//			Action action1 = subaction.getAction();
+//			if (!action.getClass().equals(action1.getClass())) {
 //				List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, subaction.getAstNodeType());
 //				if (keysByValue != null && keysByValue.size() == 1) {
-
-					subaction.setParent(null);
-					return removeBlocks(subaction);
-
+//					subaction.setParent(null);
+//					return removeParentNode(subaction);
+//
 //				}
-//			if(areRelatedActions(action,action1)) {
-//				if (subaction.getAstNodeType().equals("block")) {//|| subaction.getAstNodeType().equals("then") || subaction.getAstNodeType().equals("else")){
+//			}
+//
+//		}
+//		return actionSet;
+//	}
+//
+//	private HierarchicalActionSet removeParentForSingle(HierarchicalActionSet actionSet){
+//		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
+//		Action action = actionSet.getAction();
+//		if (subActions.size() == 1){
+//			HierarchicalActionSet subaction = subActions.get(0);
+//			if(!postOrder(subaction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
+//				return actionSet;
+//			}
+//			//else,then,block
+//			Action action1 = subaction.getAction();
+//			//else,then,block
+//			if(action.getClass().equals(action1.getClass()) && action.getName().equals("UPD")) {
+//
+////			if(areRelatedActions(action,action1)) {
+//				if(!(subaction.getAstNodeType().equals("condition") || subaction.getAstNodeType().equals("init"))){
+//				List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, subaction.getAstNodeType());
+//					if(keysByValue != null && keysByValue.size() ==1){
+//							subaction.setParent(null);
+//							return removeParentForSingle(subaction);
+//					}
+//				}
+//			}
+//		}
+//		return actionSet;
+//
+//	}
+//	private HierarchicalActionSet removeIFthenBlocks(HierarchicalActionSet actionSet){
+//		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
+//		Action action = actionSet.getAction();
+//		if (subActions.size() == 1){
+//			HierarchicalActionSet subaction = subActions.get(0);
+//			//else,then,block
+//			Action action1 = subaction.getAction();
+//			//else,then,block
+//			if(action.getClass().equals(action1.getClass())) {
+////			if(areRelatedActions(action,action1)) {
+//				if (subaction.getAstNodeType().equals("then") || subaction.getAstNodeType().equals("else")) {//|| subaction.getAstNodeType().equals("then") || subaction.getAstNodeType().equals("else")){
 //					List<HierarchicalActionSet> subSubActions = subaction.getSubActions();
 //					if (subSubActions.size() == 1) {
 //
 //						HierarchicalActionSet subsubsubAction = subSubActions.get(0);
-//						List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, subsubsubAction.getAstNodeType());
-//						if (keysByValue != null && keysByValue.size() == 1) {
-//
-//							subsubsubAction.setParent(null);
-//							return removeBlocks(subsubsubAction);
-//
+//						if(!postOrder(subsubsubAction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
+//							return actionSet;
 //						}
+//						if (subsubsubAction.getAstNodeType().equals("block")) {
+//							List<HierarchicalActionSet> subActions1 = subsubsubAction.getSubActions();
+//							if (subActions1.size() == 1) {
+//								HierarchicalActionSet hierarchicalActionSet = subActions1.get(0);
+//								List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, hierarchicalActionSet.getAstNodeType());
+//								if (keysByValue != null && keysByValue.size() == 1) {
+//									hierarchicalActionSet.setParent(null);
+//									return removeBlocks(hierarchicalActionSet);
+//
+//								}
+//							}
+//						}
+//
 //					}
 //				}
-			}
-		}
-		return actionSet;
-
-	}
-
-	private HierarchicalActionSet removeParentNode(HierarchicalActionSet actionSet){
-		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
-		Action action = actionSet.getAction();
-		if (subActions.size() == 1) {
-			HierarchicalActionSet subaction = subActions.get(0);
-			if(!postOrder(subaction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
-				return actionSet;
-			}
-			Action action1 = subaction.getAction();
-			if (!action.getClass().equals(action1.getClass())) {
-				List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, subaction.getAstNodeType());
-				if (keysByValue != null && keysByValue.size() == 1) {
-					subaction.setParent(null);
-					return removeParentNode(subaction);
-
-				}
-			}
-
-		}
-		return actionSet;
-	}
-
-	private HierarchicalActionSet removeParentForSingle(HierarchicalActionSet actionSet){
-		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
-		Action action = actionSet.getAction();
-		if (subActions.size() == 1){
-			HierarchicalActionSet subaction = subActions.get(0);
-			if(!postOrder(subaction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
-				return actionSet;
-			}
-			//else,then,block
-			Action action1 = subaction.getAction();
-			//else,then,block
-			if(action.getClass().equals(action1.getClass()) && action.getName().equals("UPD")) {
-
-//			if(areRelatedActions(action,action1)) {
-				if(!(subaction.getAstNodeType().equals("condition") || subaction.getAstNodeType().equals("init"))){
-				List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, subaction.getAstNodeType());
-					if(keysByValue != null && keysByValue.size() ==1){
-							subaction.setParent(null);
-							return removeParentForSingle(subaction);
-					}
-				}
-			}
-		}
-		return actionSet;
-
-	}
-	private HierarchicalActionSet removeIFthenBlocks(HierarchicalActionSet actionSet){
-		List<HierarchicalActionSet> subActions = actionSet.getSubActions();
-		Action action = actionSet.getAction();
-		if (subActions.size() == 1){
-			HierarchicalActionSet subaction = subActions.get(0);
-			//else,then,block
-			Action action1 = subaction.getAction();
-			//else,then,block
-			if(action.getClass().equals(action1.getClass())) {
-//			if(areRelatedActions(action,action1)) {
-				if (subaction.getAstNodeType().equals("then") || subaction.getAstNodeType().equals("else")) {//|| subaction.getAstNodeType().equals("then") || subaction.getAstNodeType().equals("else")){
-					List<HierarchicalActionSet> subSubActions = subaction.getSubActions();
-					if (subSubActions.size() == 1) {
-
-						HierarchicalActionSet subsubsubAction = subSubActions.get(0);
-						if(!postOrder(subsubsubAction).stream().anyMatch(predicate.and(predicate1.and(predicate2)))){
-							return actionSet;
-						}
-						if (subsubsubAction.getAstNodeType().equals("block")) {
-							List<HierarchicalActionSet> subActions1 = subsubsubAction.getSubActions();
-							if (subActions1.size() == 1) {
-								HierarchicalActionSet hierarchicalActionSet = subActions1.get(0);
-								List<Integer> keysByValue = NodeMap_new.getKeysByValue(NodeMap_new.StatementMap, hierarchicalActionSet.getAstNodeType());
-								if (keysByValue != null && keysByValue.size() == 1) {
-									hierarchicalActionSet.setParent(null);
-									return removeBlocks(hierarchicalActionSet);
-
-								}
-							}
-						}
-
-					}
-				}
-			}
-		}
-		return actionSet;
-
-	}
+//			}
+//		}
+//		return actionSet;
+//
+//	}
 
 	private HierarchicalActionSet createActionSet(Action act, Action parentAct, HierarchicalActionSet parent) {
 		HierarchicalActionSet actionSet = new HierarchicalActionSet();
diff --git a/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java b/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java
index 74e44ca..486fcf3 100755
--- a/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java
+++ b/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java
@@ -52,7 +52,7 @@ public class EnhancedASTDiff {
 		}
 		Stream<File> stream = Arrays.stream(listOfFiles);
 		List<File> folders;
-		if (projectList.length == 1 && projectList[0].equals("")) {
+		if (projectList.length == 1 && projectList[0].equals("ALL")){
 			folders = stream
 					.filter(x -> !x.getName().startsWith("."))
 					.filter(x -> !x.getName().startsWith("cocci"))
@@ -99,24 +99,24 @@ public class EnhancedASTDiff {
 			log.info("{} files to process ...", allMessageFiles.size());
 		}
 		boolean finalIsJava = isJava;
-//		ProgressBar.wrap(allMessageFiles.stream().
-//				parallel(),"Task").
-//				forEach(m ->
-//						{
-//							EDiffHunkParser parser =  new EDiffHunkParser();
-//							parser.parseFixPatterns(m.getPrevFile(),m.getRevFile(), m.getDiffEntryFile(),project,innerPool,srcMLPath,hunkLimit, finalIsJava);
-//						}
-//				);
-//
-//        }
-		allMessageFiles.stream().
-				parallel().
+		ProgressBar.wrap(allMessageFiles.stream().
+				parallel(),"Task").
 				forEach(m ->
 						{
-							EDiffHunkParser parser = new EDiffHunkParser();
-							parser.parseFixPatterns(m.getPrevFile(), m.getRevFile(), m.getDiffEntryFile(), project, innerPool, srcMLPath, hunkLimit, finalIsJava);
+							EDiffHunkParser parser =  new EDiffHunkParser();
+							parser.parseFixPatterns(m.getPrevFile(),m.getRevFile(), m.getDiffEntryFile(),project,innerPool,srcMLPath,hunkLimit, finalIsJava);
 						}
 				);
+
+
+//		allMessageFiles.stream().
+//				parallel().
+//				forEach(m ->
+//						{
+//							EDiffHunkParser parser = new EDiffHunkParser();
+//							parser.parseFixPatterns(m.getPrevFile(), m.getRevFile(), m.getDiffEntryFile(), project, innerPool, srcMLPath, hunkLimit, finalIsJava);
+//						}
+//				);
 	}
 
 	
diff --git a/richedit/src/test/java/edu/lu/uni/serval/TestInputCases.java b/richedit/src/test/java/edu/lu/uni/serval/TestInputCases.java
index f6dd1c1..19d28f6 100644
--- a/richedit/src/test/java/edu/lu/uni/serval/TestInputCases.java
+++ b/richedit/src/test/java/edu/lu/uni/serval/TestInputCases.java
@@ -17,97 +17,41 @@ public class TestInputCases {
 
 
     @Test
-    @Ignore
+
     //libtiff_3ecb08_53fc4b_libtiff#tif_jpeg.c
     public void test_libtiff_3ecb08_53fc4b() throws IOException {
-        //cpython_b3a601_63d5c1_Objects#unicodeobject.c
-        //linux_659d8c_fd2a50a_tools#perf#builtin-kmem.c
-        //openssl_6a14fe7_0ff368_crypto#LPdir_win.c
-        //linux_d1dc69_cc2115c_sound#soc#codecs#wm8776.c
-        //linux_ff244c6_a0917e0_drivers#net#tun.c .
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("libtiff_3ecb08_53fc4b_libtiff#tif_jpeg.c");
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("gmp_bdba4d_c2ebf1_tests#devel#addmul_1.c");
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_92f011_647dac_Python#fileutils.c");
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_0b5faa_596f48_ext#phar#phar_object.c");
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_3d733c_85fcab_ext#curl#streams.c");
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_177c1f_a1a124_ext#pdo#pdo_stmt.c");
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_c4ee76_2a1218_ext#ftp#ftp.c");//write test
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_bb5faa_c5152b_TSRM#tsrm_virtual_cwd.c");//write test
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_d4f9cf_1005c8_Modules#_pickle.c");
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_ec042f_9cfc55_ext#libxml#libxml.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_f989a8_8f8576_ext#zlib#zlib.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("lighttpd1.4_b6b6ed_0c6a56_src#md5.c");//
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_1ac8e9_072650_tools#lemon#lemon.c");//good
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_1a3f7f_1aa32a_ext#pdo#pdo_dbh.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_039f42_968952_ext#pdo#pdo_dbh.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_171fd9_75d681_ext#ereg#ereg.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_85e8f3_fe9485_ext#dom#php_dom.c");//good
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_9979ac_895e79_ext#pdo#pdo_dbh.c");//good
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_7af331_b7311e_ext#date#php_date.c");//
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_6819ee_555ca8_main#main.c");//
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_18c0b6_5e4b47_ext#pdo#pdo_dbh.c");//wrong //todo
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_0f9a03_3531b3_ext#standard#array.c");//
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_020e25_522036_epan#dissectors#packet-gtp.c");//
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_0c11675_b8c5cd_ext#sqlite#sqlite.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_050f94_11c47d_ext#bcmath#bcmath.c");//write test case
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_050f94_11c47d_ext#mhash#mhash.c");//write test case
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_99b31a_6d9788_ext#date#php_date.c");//write test case
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_99e69d_4d2998_Python#pystate.c");//write test case
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_fc0e59_6700a2_Zend#zend_ini.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_2e5820_511112_Objects#capsule.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_c410d6_1a494b_Modules#_sqlite#cursor.c");//can write test case
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_320a5c_59b359_Objects#xxobject.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_8d7807_539418_epan#dissectors#packet-btrfcomm.c");//wrong partially correct
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_4af5c8c_ef1701_Modules#arraymodule.c");//wrong
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_5a2a68_52c1f5_Python#import.c");//entersan
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_8c14dd_f3470d_packet-portmap.c");//can write test
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_49e175b_1e06c7_win32#glob.c");//ifdef
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_aba9a5_f1c697_epan#dissectors#packet-isup.c");//
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_1143d3_b34e50_Optimizer#block_pass.c");//
-
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_bf5d29_fa0a17_ext#opcache#Optimizer#pass3.c");//ok
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_287ac2_9efa1d_ext#oci8#oci8_interface.c");//maybe wrong
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_f4a70fa_7f527d_Zend#zend_object_handlers.c");// wrong
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_26f28b_84f7a0_plugins#profinet#packet-pn-dcp.c");//ok
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_a9e926_877728_epan#dissectors#packet-ndps.c");//wrong
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_041867_5d66c3_ext#pdo#pdo_dbh.c");//wrong
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_d810cf_2d8fd4_Zend#zend_builtin_functions.c");//wrong
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_c56492_008fb2_sapi#phpdbg#phpdbg.c");//wrong
           List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_96ba09_755c08_epan#dissectors#packet-gsm_a_rr.c");//wrong
-//php-src_acd809_1d3d39_ext#standard#scanf.c
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_67a100_505f61_TSRM#tsrm_virtual_cwd.c");//
-//          List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_2cf5d3_9a0d7a_Objects#object.c");//
 
-//        List<HierarchicalActionSet> hierarchicalActionSets1 = getHierarchicalActionSets("php-src_fc0349_0ed538_Zend#zend.c");//
-//        List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_477e2b3_98599a_main#fopen_wrappers.c");//
-//        // good
-//        String s = EDiffHelper.getShapeTree(hierarchicalActionSets.get(0), false).toStaticHashString();
-//        String s1 = EDiffHelper.getShapeTree(hierarchicalActionSets1.get(0), false).toStaticHashString();
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" @TO@ if gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157870 @LENGTH@ 92\n" +
-                "---UPD then@@ @TO@ item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ -1 @LENGTH@ 0\n" +
-                "------MOV block@@item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @TO@ then@@ @AT@ 157973 @LENGTH@ 152\n");
-
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" @TO@ gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157867 @LENGTH@ 89\n" +
+                "---UPD if@@gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" @TO@ gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157867 @LENGTH@ 89\n" +
+                "------UPD block@@ @TO@ item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157967 @LENGTH@ 0\n" +
+                "---------MOV block_content@@item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @TO@ block@@ @AT@ 157983 @LENGTH@ 152\n");
     }
+
+
     @Test
     public void test_wireshark_96ba09_755c08() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_96ba09_755c08_epan#dissectors#packet-gsm_a_rr.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" @TO@ if gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157870 @LENGTH@ 92\n" +
-                "---UPD then@@ @TO@ item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ -1 @LENGTH@ 0\n" +
-                "------MOV block@@item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @TO@ then@@ @AT@ 157973 @LENGTH@ 152\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" @TO@ gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157867 @LENGTH@ 89\n" +
+                "---UPD if@@gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" @TO@ gsm_rr_csn_HL_flag tvb subtree tvb_len bit_offset ++ \"Priority 2\" \"Present\" \"Not present\" item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157867 @LENGTH@ 89\n" +
+                "------UPD block@@ @TO@ item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157967 @LENGTH@ 0\n" +
+                "---------UPD block_content@@ @TO@ item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE bit_offset += 3 proto_item_append_text item2 \" for Mobile Identity 2\" @AT@ 157967 @LENGTH@ 0\n" +
+                "------------MOV expr_stmt@@item2 = proto_tree_add_bits_item subtree hf_gsm_a_call_prio tvb bit_offset 3 FALSE @TO@ block_content@@ @AT@ 157983 @LENGTH@ 82\n" +
+                "------------MOV expr_stmt@@bit_offset += 3 @TO@ block_content@@ @AT@ 158081 @LENGTH@ 15\n" +
+                "------------MOV expr_stmt@@proto_item_append_text item2 \" for Mobile Identity 2\" @TO@ block_content@@ @AT@ 158106 @LENGTH@ 53\n");
 
     }
     @Test
     public void test_php_src_cf4a29_40becd() throws IOException {//todo upd mov with delete (get rid of delete
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_cf4a29_40becd_main#safe_mode.c");//wrong
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename return 0 elseif if mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename @TO@ if mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename return 0 elseif if mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename return 1 @AT@ 2519 @LENGTH@ 204\n" +
-                "---UPD elseif@@elseif if mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename @TO@ elseif if mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename return 1 @AT@ 2651 @LENGTH@ 99\n" +
-                "------UPD if@@if mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename @TO@ if mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename return 1 @AT@ 2651 @LENGTH@ 92\n" +
-                "---------UPD then@@php_error E_WARNING \"Unable to access %s\" filename @TO@ php_error E_WARNING \"Unable to access %s\" filename return 1 @AT@ 2696 @LENGTH@ 50\n" +
-                "------------UPD block@@php_error E_WARNING \"Unable to access %s\" filename @TO@ php_error E_WARNING \"Unable to access %s\" filename return 1 @AT@ 2696 @LENGTH@ 50\n" +
-                "---------------MOV return@@return 1 @TO@ block@@php_error E_WARNING \"Unable to access %s\" filename @AT@ 2756 @LENGTH@ 8\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename 0 mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename @TO@ mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename 0 mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename 1 @AT@ 2516 @LENGTH@ 184\n" +
+                "---UPD if:elseif@@mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename @TO@ mode == CHECKUID_ALLOW_FILE_NOT_EXISTS php_error E_WARNING \"Unable to access %s\" filename 1 @AT@ 2643 @LENGTH@ 89\n" +
+                "------UPD block@@php_error E_WARNING \"Unable to access %s\" filename @TO@ php_error E_WARNING \"Unable to access %s\" filename 1 @AT@ 2696 @LENGTH@ 50\n" +
+                "---------UPD block_content@@php_error E_WARNING \"Unable to access %s\" filename @TO@ php_error E_WARNING \"Unable to access %s\" filename 1 @AT@ 2696 @LENGTH@ 50\n" +
+                "------------MOV return@@1 @TO@ block_content@@php_error E_WARNING \"Unable to access %s\" filename @AT@ 2756 @LENGTH@ 1\n");
     }
     @Test
     public void test_cpython_1a8501_c47253() throws IOException {//todo wrong
@@ -126,38 +70,43 @@ public class TestInputCases {
     public void test_cpython_1c76b7_d6056b() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_1c76b7_d6056b_Modules#faulthandler.c");//wrong
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD function@@static void faulthandler_thread void * unused PyLockStatus st const char * errmsg PyThreadState * current int ok do  thread . running = 0 PyThread_release_lock thread . join_event PyThread_release_lock thread . cancel_event @TO@ static void faulthandler_thread void * unused PyLockStatus st const char * errmsg PyThreadState * current int ok do  thread . running = 0 PyThread_release_lock thread . join_event @AT@ 10367 @LENGTH@ 223\n" +
-                "---UPD block@@PyLockStatus st const char * errmsg PyThreadState * current int ok do  thread . running = 0 PyThread_release_lock thread . join_event PyThread_release_lock thread . cancel_event @TO@ PyLockStatus st const char * errmsg PyThreadState * current int ok do  thread . running = 0 PyThread_release_lock thread . join_event @AT@ 10413 @LENGTH@ 177\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"MOV expr_stmt@@PyThread_release_lock thread . cancel_event @TO@ block@@break; @AT@ 11259 @LENGTH@ 43\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@st == PY_LOCK_ACQUIRED break; @TO@ st == PY_LOCK_ACQUIRED PyThread_release_lock thread . cancel_event break; @AT@ 10644 @LENGTH@ 29\n" +
+                "---UPD if@@st == PY_LOCK_ACQUIRED break; @TO@ st == PY_LOCK_ACQUIRED PyThread_release_lock thread . cancel_event break; @AT@ 10644 @LENGTH@ 29\n" +
+                "------UPD block@@break; @TO@ PyThread_release_lock thread . cancel_event break; @AT@ 10672 @LENGTH@ 6\n" +
+                "---------UPD block_content@@break; @TO@ PyThread_release_lock thread . cancel_event break; @AT@ 10722 @LENGTH@ 6\n" +
+                "------------MOV expr_stmt@@PyThread_release_lock thread . cancel_event @TO@ block_content@@break; @AT@ 11259 @LENGTH@ 43\n");
     }
     @Test
     public void test_php_src_acd809_1d3d39() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_acd809_1d3d39_ext#standard#scanf.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD switch@@* ch 'n' if ! ( flags & SCAN_SUPPRESS ) if numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current long string - baseString ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 else add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP if 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @TO@ * ch 'n' if ! ( flags & SCAN_SUPPRESS ) if numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current long string - baseString ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 else add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' 'X' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP if 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @AT@ 19173 @LENGTH@ 807\n" +
-                "---UPD block@@'n' if ! ( flags & SCAN_SUPPRESS ) if numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current long string - baseString ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 else add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP if 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @TO@ 'n' if ! ( flags & SCAN_SUPPRESS ) if numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current long string - baseString ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 else add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' 'X' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP if 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @AT@ 19179 @LENGTH@ 802\n" +
-                "------INS case@@'X' @TO@ block@@'n' if ! ( flags & SCAN_SUPPRESS ) if numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current long string - baseString ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 else add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP if 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @AT@ 19912 @LENGTH@ 3\n" +
-                "---------INS expr@@'X' @TO@ case@@'X' @AT@ 19917 @LENGTH@ 3\n" +
-                "------------INS literal:char@@'X' @TO@ expr@@'X' @AT@ 19917 @LENGTH@ 3\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD switch@@* ch 'n' ! ( flags & SCAN_SUPPRESS ) numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current ( long ) ( string - baseString ) ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @TO@ * ch 'n' ! ( flags & SCAN_SUPPRESS ) numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current ( long ) ( string - baseString ) ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' 'X' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @AT@ 19166 @LENGTH@ 801\n" +
+                "---UPD block@@'n' ! ( flags & SCAN_SUPPRESS ) numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current ( long ) ( string - baseString ) ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @TO@ 'n' ! ( flags & SCAN_SUPPRESS ) numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current ( long ) ( string - baseString ) ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' 'X' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @AT@ 19179 @LENGTH@ 796\n" +
+                "------UPD block_content@@'n' ! ( flags & SCAN_SUPPRESS ) numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current ( long ) ( string - baseString ) ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @TO@ 'n' ! ( flags & SCAN_SUPPRESS ) numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current ( long ) ( string - baseString ) ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' 'X' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @AT@ 19184 @LENGTH@ 796\n" +
+                "---------INS case@@'X' @TO@ block_content@@'n' ! ( flags & SCAN_SUPPRESS ) numVars zend_uint refcount current = args ][objIndex ++ refcount = ( * current ) -> refcount zval_dtor * current ZVAL_LONG * current ( long ) ( string - baseString ) ( * current ) -> refcount = refcount ( * current ) -> is_ref = 1 add_index_long * return_value objIndex ++ string - baseString nconversions ++ continue; 'd' 'D' op = 'i' base = 10 fn = ( long * ) strtol break; 'i' op = 'i' base = 0 fn = ( long * ) strtol break; 'o' op = 'i' base = 8 fn = ( long * ) strtol break; 'x' op = 'i' base = 16 fn = ( long * ) strtol break; 'u' op = 'i' base = 10 flags |= SCAN_UNSIGNED fn = ( long * ) strtoul break; 'f' 'e' 'E' 'g' op = 'f' break; 's' op = 's' break; 'c' op = 's' flags |= SCAN_NOSKIP 0 == width width = 1 break; '[' op = '[' flags |= SCAN_NOSKIP break; @AT@ 19912 @LENGTH@ 3\n" +
+                "------------INS expr@@'X' @TO@ case@@'X' @AT@ 19917 @LENGTH@ 3\n" +
+                "---------------INS literal:char@@'X' @TO@ expr@@'X' @AT@ 19917 @LENGTH@ 3\n");
     }
     @Test
     public void test_lighttpd14_f27b8d_4a86d3() throws IOException {//TODO not sure
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("lighttpd1.4_f27b8d_4a86d3_src#connections.c");//wrong
         Assert.assertEquals(hierarchicalActionSets.size(),3);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@400 505 207 break; default: con -> http_status = 501 break; @TO@ 400 414 505 207 break; default: con -> http_status = 501 break; @AT@ 8385 @LENGTH@ 59\n" +
-                "---INS case@@414 @TO@ block@@400 505 207 break; default: con -> http_status = 501 break; @AT@ 8421 @LENGTH@ 3\n" +
-                "------INS expr@@414 @TO@ case@@414 @AT@ 8426 @LENGTH@ 3\n" +
-                "---------INS literal@@414 @TO@ expr@@414 @AT@ 8426 @LENGTH@ 3\n");
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD expr_stmt@@log_error_write srv __FILE__ __LINE__ \"sd\" \"http-header larger then 64k -> disconnected\" chunkqueue_length cq @TO@ log_error_write srv __FILE__ __LINE__ \"s\" \"oversized request-header -> sending Status 414\" @AT@ 23540 @LENGTH@ 109\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD switch@@con -> http_status 400 505 207 break; default: con -> http_status = 501 break; @TO@ con -> http_status 400 414 505 207 break; default: con -> http_status = 501 break; @AT@ 8360 @LENGTH@ 78\n" +
+                "---UPD block@@400 505 207 break; default: con -> http_status = 501 break; @TO@ 400 414 505 207 break; default: con -> http_status = 501 break; @AT@ 8385 @LENGTH@ 59\n" +
+                "------UPD block_content@@400 505 207 break; default: con -> http_status = 501 break; @TO@ 400 414 505 207 break; default: con -> http_status = 501 break; @AT@ 8390 @LENGTH@ 59\n" +
+                "---------INS case@@414 @TO@ block_content@@400 505 207 break; default: con -> http_status = 501 break; @AT@ 8421 @LENGTH@ 3\n" +
+                "------------INS expr@@414 @TO@ case@@414 @AT@ 8426 @LENGTH@ 3\n" +
+                "---------------INS literal:number@@414 @TO@ expr@@414 @AT@ 8426 @LENGTH@ 3\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD expr_stmt@@log_error_write srv __FILE__ __LINE__ \"sd\" \"http-header larger then 64k -> disconnected\" chunkqueue_length cq @TO@ log_error_write srv __FILE__ __LINE__ \"s\" \"oversized request-header -> sending Status 414\" @AT@ 23540 @LENGTH@ 109\n" +
                 "---UPD expr@@log_error_write srv __FILE__ __LINE__ \"sd\" \"http-header larger then 64k -> disconnected\" chunkqueue_length cq @TO@ log_error_write srv __FILE__ __LINE__ \"s\" \"oversized request-header -> sending Status 414\" @AT@ 23540 @LENGTH@ 109\n" +
                 "------UPD call@@log_error_write srv __FILE__ __LINE__ \"sd\" \"http-header larger then 64k -> disconnected\" chunkqueue_length cq @TO@ log_error_write srv __FILE__ __LINE__ \"s\" \"oversized request-header -> sending Status 414\" @AT@ 23540 @LENGTH@ 109\n" +
                 "---------UPD argument_list@@srv __FILE__ __LINE__ \"sd\" \"http-header larger then 64k -> disconnected\" chunkqueue_length cq @TO@ srv __FILE__ __LINE__ \"s\" \"oversized request-header -> sending Status 414\" @AT@ 23555 @LENGTH@ 93\n" +
                 "------------UPD argument@@\"sd\" @TO@ \"s\" @AT@ 23581 @LENGTH@ 4\n" +
                 "---------------UPD expr@@\"sd\" @TO@ \"s\" @AT@ 23581 @LENGTH@ 4\n" +
-                "------------------UPD literal@@\"sd\" @TO@ \"s\" @AT@ 23581 @LENGTH@ 4\n" +
+                "------------------UPD literal:string@@\"sd\" @TO@ \"s\" @AT@ 23581 @LENGTH@ 4\n" +
                 "------------UPD argument@@\"http-header larger then 64k -> disconnected\" @TO@ \"oversized request-header -> sending Status 414\" @AT@ 23587 @LENGTH@ 45\n" +
                 "---------------UPD expr@@\"http-header larger then 64k -> disconnected\" @TO@ \"oversized request-header -> sending Status 414\" @AT@ 23587 @LENGTH@ 45\n" +
-                "------------------UPD literal@@\"http-header larger then 64k -> disconnected\" @TO@ \"oversized request-header -> sending Status 414\" @AT@ 23587 @LENGTH@ 45\n" +
+                "------------------UPD literal:string@@\"http-header larger then 64k -> disconnected\" @TO@ \"oversized request-header -> sending Status 414\" @AT@ 23587 @LENGTH@ 45\n" +
                 "------------DEL argument@@chunkqueue_length cq @AT@ 23634 @LENGTH@ 20\n" +
                 "---------------DEL expr@@chunkqueue_length cq @AT@ 23634 @LENGTH@ 20\n" +
                 "------------------DEL call@@chunkqueue_length cq @AT@ 23634 @LENGTH@ 20\n" +
@@ -166,7 +115,7 @@ public class TestInputCases {
                 "------------------------DEL argument@@cq @AT@ 23652 @LENGTH@ 2\n" +
                 "---------------------------DEL expr@@cq @AT@ 23652 @LENGTH@ 2\n" +
                 "------------------------------DEL name@@cq @AT@ 23652 @LENGTH@ 2\n");
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD expr_stmt@@connection_set_state srv con CON_STATE_REQUEST_END @TO@ connection_set_state srv con CON_STATE_HANDLE_REQUEST @AT@ 23741 @LENGTH@ 50\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD expr_stmt@@connection_set_state srv con CON_STATE_REQUEST_END @TO@ connection_set_state srv con CON_STATE_HANDLE_REQUEST @AT@ 23741 @LENGTH@ 50\n" +
                 "---UPD expr@@connection_set_state srv con CON_STATE_REQUEST_END @TO@ connection_set_state srv con CON_STATE_HANDLE_REQUEST @AT@ 23741 @LENGTH@ 50\n" +
                 "------UPD call@@connection_set_state srv con CON_STATE_REQUEST_END @TO@ connection_set_state srv con CON_STATE_HANDLE_REQUEST @AT@ 23741 @LENGTH@ 50\n" +
                 "---------UPD argument_list@@srv con CON_STATE_REQUEST_END @TO@ srv con CON_STATE_HANDLE_REQUEST @AT@ 23761 @LENGTH@ 29\n" +
@@ -183,68 +132,74 @@ public class TestInputCases {
     public void test_php_src_a0a56e_7afbb7() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_a0a56e_7afbb7_ext#com_dotnet#com_extension.c");//ok
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD expr_stmt@@( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE return SUCCESS @TO@ ( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get REGISTER_INI_ENTRIES COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE return SUCCESS @AT@ 4914 @LENGTH@ 3385\n" +
-                "---UPD expr@@( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE return SUCCESS @TO@ ( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get REGISTER_INI_ENTRIES COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE return SUCCESS @AT@ 4914 @LENGTH@ 3385\n" +
-                "------UPD block@@zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE return SUCCESS @TO@ zend_class_entry ce * tmp php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get REGISTER_INI_ENTRIES COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE return SUCCESS @AT@ 5962 @LENGTH@ 2498\n" +
-                "---------MOV expr@@REGISTER_INI_ENTRIES @TO@ block@@zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE return SUCCESS @AT@ 5994 @LENGTH@ 20\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD expr_stmt@@( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE SUCCESS @TO@ ( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get REGISTER_INI_ENTRIES COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE SUCCESS @AT@ 4914 @LENGTH@ 3378\n" +
+                "---UPD expr@@( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE SUCCESS @TO@ ( ) STD_PHP_INI_ENTRY \"com.allow_dcom\" \"0\" PHP_INI_SYSTEM OnUpdateBool allow_dcom zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_verbose\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_verbose zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_typelib\" \"0\" PHP_INI_ALL OnUpdateBool autoreg_on zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.autoregister_casesensitive\" \"1\" PHP_INI_ALL OnUpdateBool autoreg_case_sensitive zend_com_dotnet_globals com_dotnet_globals STD_PHP_INI_ENTRY \"com.code_page\" \"\" PHP_INI_ALL OnUpdateLong code_page zend_com_dotnet_globals com_dotnet_globals PHP_INI_ENTRY \"com.typelib_file\" \"\" PHP_INI_SYSTEM OnTypeLibFileUpdate PHP_INI_END static PHP_GINIT_FUNCTION com_dotnet memset com_dotnet_globals 0 * com_dotnet_globals com_dotnet_globals -> code_page = CP_ACP PHP_MINIT_FUNCTION com_dotnet zend_class_entry ce * tmp php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get REGISTER_INI_ENTRIES COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE SUCCESS @AT@ 4914 @LENGTH@ 3378\n" +
+                "------UPD block@@zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE SUCCESS @TO@ zend_class_entry ce * tmp php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get REGISTER_INI_ENTRIES COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE SUCCESS @AT@ 5962 @LENGTH@ 2491\n" +
+                "---------MOV expr@@REGISTER_INI_ENTRIES @TO@ block@@zend_class_entry ce * tmp REGISTER_INI_ENTRIES php_com_wrapper_minit INIT_FUNC_ARGS_PASSTHRU php_com_persist_minit INIT_FUNC_ARGS_PASSTHRU INIT_CLASS_ENTRY ce \"com_exception\" NULL php_com_exception_class_entry = zend_register_internal_class_ex &ce zend_exception_get_default(TSRMLS_C) NULL TSRMLS_CC php_com_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL INIT_CLASS_ENTRY ce \"com_safearray_proxy\" NULL php_com_saproxy_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_saproxy_class_entry -> ce_flags |= ZEND_ACC_FINAL php_com_saproxy_class_entry -> get_iterator = php_com_saproxy_iter_get INIT_CLASS_ENTRY ce \"variant\" NULL ce . create_object = php_com_object_new php_com_variant_class_entry = zend_register_internal_class &ce TSRMLS_CC php_com_variant_class_entry -> get_iterator = php_com_iter_get INIT_CLASS_ENTRY ce \"com\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get zend_ts_hash_init & php_com_typelibraries 0 NULL php_com_typelibrary_dtor 1 HAVE_MSCOREE_H INIT_CLASS_ENTRY ce \"dotnet\" NULL ce . create_object = php_com_object_new tmp = zend_register_internal_class_ex & ce php_com_variant_class_entry \"variant\" TSRMLS_CC tmp -> get_iterator = php_com_iter_get COM_CONST x REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT) COM_CONST CLSCTX_INPROC_SERVER COM_CONST CLSCTX_INPROC_HANDLER COM_CONST CLSCTX_LOCAL_SERVER COM_CONST CLSCTX_REMOTE_SERVER COM_CONST CLSCTX_SERVER COM_CONST CLSCTX_ALL 0 COM_CONST VT_NULL COM_CONST VT_EMPTY COM_CONST VT_UI1 COM_CONST VT_I1 COM_CONST VT_UI2 COM_CONST VT_I2 COM_CONST VT_UI4 COM_CONST VT_I4 COM_CONST VT_R4 COM_CONST VT_R8 COM_CONST VT_BOOL COM_CONST VT_ERROR COM_CONST VT_CY COM_CONST VT_DATE COM_CONST VT_BSTR COM_CONST VT_DECIMAL COM_CONST VT_UNKNOWN COM_CONST VT_DISPATCH COM_CONST VT_VARIANT COM_CONST VT_INT COM_CONST VT_UINT COM_CONST VT_ARRAY COM_CONST VT_BYREF COM_CONST CP_ACP COM_CONST CP_MACCP COM_CONST CP_OEMCP COM_CONST CP_UTF7 COM_CONST CP_UTF8 COM_CONST CP_SYMBOL COM_CONST CP_THREAD_ACP COM_CONST VARCMP_LT COM_CONST VARCMP_EQ COM_CONST VARCMP_GT COM_CONST VARCMP_NULL COM_CONST NORM_IGNORECASE COM_CONST NORM_IGNORENONSPACE COM_CONST NORM_IGNORESYMBOLS COM_CONST NORM_IGNOREWIDTH COM_CONST NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA COM_CONST NORM_IGNOREKASHIDA COM_CONST DISP_E_DIVBYZERO COM_CONST DISP_E_OVERFLOW COM_CONST DISP_E_BADINDEX COM_CONST MK_E_UNAVAILABLE SUCCESS @AT@ 5994 @LENGTH@ 20\n");
     }
     @Test
     public void test_php_src_a29791_796ff1() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_a29791_796ff1_Zend#zend_API.c");//ok
         Assert.assertEquals(hierarchicalActionSets.size(),4);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD while@@while param_count > 0 param = va_arg ptr zval * * param_ptr = * ( p - param_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr param_count -- @TO@ while param_count -- > 0 param = va_arg ptr zval * * param_ptr = * ( p - arg_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr arg_count -- @AT@ 1892 @LENGTH@ 381\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD while@@param_count > 0 param = va_arg ptr zval * * param_ptr = * ( p - param_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr param_count -- @TO@ param_count -- > 0 param = va_arg ptr zval * * param_ptr = * ( p - arg_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr arg_count -- @AT@ 1886 @LENGTH@ 372\n" +
                 "---UPD condition@@param_count > 0 @TO@ param_count -- > 0 @AT@ 1892 @LENGTH@ 15\n" +
                 "------UPD expr@@param_count > 0 @TO@ param_count -- > 0 @AT@ 1893 @LENGTH@ 15\n" +
                 "---------INS operator@@-- @TO@ expr@@param_count > 0 @AT@ 1904 @LENGTH@ 2\n" +
-                "---UPD block@@param = va_arg ptr zval * * param_ptr = * ( p - param_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr param_count -- @TO@ param = va_arg ptr zval * * param_ptr = * ( p - arg_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr arg_count -- @AT@ 1908 @LENGTH@ 359\n" +
-                "------UPD expr_stmt@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 1944 @LENGTH@ 33\n" +
-                "---------UPD expr@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 1944 @LENGTH@ 33\n" +
-                "------------UPD name@@param_count @TO@ arg_count @AT@ 1960 @LENGTH@ 11\n" +
-                "------UPD if@@if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @AT@ 1979 @LENGTH@ 262\n" +
-                "---------UPD then@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @AT@ 2031 @LENGTH@ 205\n" +
-                "------------UPD block@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @AT@ 2031 @LENGTH@ 205\n" +
-                "---------------UPD expr_stmt@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2181 @LENGTH@ 51\n" +
-                "------------------UPD expr@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2181 @LENGTH@ 51\n" +
-                "---------------------UPD name@@param_count @TO@ arg_count @AT@ 2195 @LENGTH@ 11\n" +
-                "------UPD expr_stmt@@param_count -- @TO@ arg_count -- @AT@ 2283 @LENGTH@ 14\n" +
-                "---------UPD expr@@param_count -- @TO@ arg_count -- @AT@ 2283 @LENGTH@ 14\n" +
-                "------------UPD name@@param_count @TO@ arg_count @AT@ 2283 @LENGTH@ 11\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD while@@while param_count > 0 param_ptr = * ( p - param_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * ( argument_array ++ ) = param_ptr param_count -- @TO@ while param_count -- > 0 param_ptr = * ( p - arg_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr * ( argument_array ++ ) = param_ptr arg_count -- @AT@ 2611 @LENGTH@ 369\n" +
+                "---UPD block@@param = va_arg ptr zval * * param_ptr = * ( p - param_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr param_count -- @TO@ param = va_arg ptr zval * * param_ptr = * ( p - arg_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr arg_count -- @AT@ 1908 @LENGTH@ 356\n" +
+                "------UPD block_content@@param = va_arg ptr zval * * param_ptr = * ( p - param_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr param_count -- @TO@ param = va_arg ptr zval * * param_ptr = * ( p - arg_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * param = param_ptr arg_count -- @AT@ 1912 @LENGTH@ 356\n" +
+                "---------UPD expr_stmt@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 1944 @LENGTH@ 33\n" +
+                "------------UPD expr@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 1944 @LENGTH@ 33\n" +
+                "---------------UPD name@@param_count @TO@ arg_count @AT@ 1960 @LENGTH@ 11\n" +
+                "---------UPD if_stmt@@! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @AT@ 1976 @LENGTH@ 259\n" +
+                "------------UPD if@@! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @AT@ 1976 @LENGTH@ 259\n" +
+                "---------------UPD block@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @AT@ 2031 @LENGTH@ 205\n" +
+                "------------------UPD block_content@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @AT@ 2036 @LENGTH@ 205\n" +
+                "---------------------UPD expr_stmt@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2181 @LENGTH@ 51\n" +
+                "------------------------UPD expr@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2181 @LENGTH@ 51\n" +
+                "---------------------------UPD name@@param_count @TO@ arg_count @AT@ 2195 @LENGTH@ 11\n" +
+                "---------UPD expr_stmt@@param_count -- @TO@ arg_count -- @AT@ 2283 @LENGTH@ 14\n" +
+                "------------UPD expr@@param_count -- @TO@ arg_count -- @AT@ 2283 @LENGTH@ 14\n" +
+                "---------------UPD name@@param_count @TO@ arg_count @AT@ 2283 @LENGTH@ 11\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD while@@param_count > 0 param_ptr = * ( p - param_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * ( argument_array ++ ) = param_ptr param_count -- @TO@ param_count -- > 0 param_ptr = * ( p - arg_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr * ( argument_array ++ ) = param_ptr arg_count -- @AT@ 2605 @LENGTH@ 360\n" +
                 "---UPD condition@@param_count > 0 @TO@ param_count -- > 0 @AT@ 2611 @LENGTH@ 15\n" +
                 "------UPD expr@@param_count > 0 @TO@ param_count -- > 0 @AT@ 2612 @LENGTH@ 15\n" +
                 "---------INS operator@@-- @TO@ expr@@param_count > 0 @AT@ 2619 @LENGTH@ 2\n" +
-                "---UPD block@@param_ptr = * ( p - param_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * ( argument_array ++ ) = param_ptr param_count -- @TO@ param_ptr = * ( p - arg_count ) if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr * ( argument_array ++ ) = param_ptr arg_count -- @AT@ 2627 @LENGTH@ 347\n" +
-                "------UPD expr_stmt@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 2631 @LENGTH@ 33\n" +
-                "---------UPD expr@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 2631 @LENGTH@ 33\n" +
-                "------------UPD name@@param_count @TO@ arg_count @AT@ 2647 @LENGTH@ 11\n" +
-                "------UPD if@@if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ if ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr @AT@ 2666 @LENGTH@ 262\n" +
-                "---------UPD then@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr @AT@ 2718 @LENGTH@ 205\n" +
-                "------------UPD block@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr @AT@ 2718 @LENGTH@ 205\n" +
-                "---------------UPD expr_stmt@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2868 @LENGTH@ 51\n" +
-                "------------------UPD expr@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2868 @LENGTH@ 51\n" +
-                "---------------------UPD name@@param_count @TO@ arg_count @AT@ 2882 @LENGTH@ 11\n" +
-                "---------------UPD expr_stmt@@* ( p - param_count ) = param_ptr @TO@ * ( p - arg_count ) = param_ptr @AT@ 2912 @LENGTH@ 33\n" +
-                "------------------UPD expr@@* ( p - param_count ) = param_ptr @TO@ * ( p - arg_count ) = param_ptr @AT@ 2912 @LENGTH@ 33\n" +
-                "---------------------UPD name@@param_count @TO@ arg_count @AT@ 2916 @LENGTH@ 11\n" +
-                "------UPD expr_stmt@@param_count -- @TO@ arg_count -- @AT@ 2983 @LENGTH@ 14\n" +
-                "---------UPD expr@@param_count -- @TO@ arg_count -- @AT@ 2983 @LENGTH@ 14\n" +
-                "------------UPD name@@param_count @TO@ arg_count @AT@ 2983 @LENGTH@ 11\n");
-        Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD while@@while param_count > 0 param = va_arg ptr zval * * * * param = ( zval * * ) p - ( param_count -- ) @TO@ while param_count -- > 0 param = va_arg ptr zval * * * * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3408 @LENGTH@ 97\n" +
+                "---UPD block@@param_ptr = * ( p - param_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * ( argument_array ++ ) = param_ptr param_count -- @TO@ param_ptr = * ( p - arg_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr * ( argument_array ++ ) = param_ptr arg_count -- @AT@ 2627 @LENGTH@ 344\n" +
+                "------UPD block_content@@param_ptr = * ( p - param_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr * ( argument_array ++ ) = param_ptr param_count -- @TO@ param_ptr = * ( p - arg_count ) ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr * ( argument_array ++ ) = param_ptr arg_count -- @AT@ 2631 @LENGTH@ 344\n" +
+                "---------UPD expr_stmt@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 2631 @LENGTH@ 33\n" +
+                "------------UPD expr@@param_ptr = * ( p - param_count ) @TO@ param_ptr = * ( p - arg_count ) @AT@ 2631 @LENGTH@ 33\n" +
+                "---------------UPD name@@param_count @TO@ arg_count @AT@ 2647 @LENGTH@ 11\n" +
+                "---------UPD if_stmt@@! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr @AT@ 2663 @LENGTH@ 259\n" +
+                "------------UPD if@@! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ ! PZVAL_IS_REF param_ptr && param_ptr -> refcount > 1 zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr @AT@ 2663 @LENGTH@ 259\n" +
+                "---------------UPD block@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr @AT@ 2718 @LENGTH@ 205\n" +
+                "------------------UPD block_content@@zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - param_count ) ) -> refcount -- * ( p - param_count ) = param_ptr @TO@ zval * new_tmp ALLOC_ZVAL new_tmp * new_tmp = * param_ptr zval_copy_ctor new_tmp INIT_PZVAL new_tmp param_ptr = new_tmp ( ( zval * ) * ( p - arg_count ) ) -> refcount -- * ( p - arg_count ) = param_ptr @AT@ 2723 @LENGTH@ 205\n" +
+                "---------------------UPD expr_stmt@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2868 @LENGTH@ 51\n" +
+                "------------------------UPD expr@@( ( zval * ) * ( p - param_count ) ) -> refcount -- @TO@ ( ( zval * ) * ( p - arg_count ) ) -> refcount -- @AT@ 2868 @LENGTH@ 51\n" +
+                "---------------------------UPD name@@param_count @TO@ arg_count @AT@ 2882 @LENGTH@ 11\n" +
+                "---------------------UPD expr_stmt@@* ( p - param_count ) = param_ptr @TO@ * ( p - arg_count ) = param_ptr @AT@ 2912 @LENGTH@ 33\n" +
+                "------------------------UPD expr@@* ( p - param_count ) = param_ptr @TO@ * ( p - arg_count ) = param_ptr @AT@ 2912 @LENGTH@ 33\n" +
+                "---------------------------UPD name@@param_count @TO@ arg_count @AT@ 2916 @LENGTH@ 11\n" +
+                "---------UPD expr_stmt@@param_count -- @TO@ arg_count -- @AT@ 2983 @LENGTH@ 14\n" +
+                "------------UPD expr@@param_count -- @TO@ arg_count -- @AT@ 2983 @LENGTH@ 14\n" +
+                "---------------UPD name@@param_count @TO@ arg_count @AT@ 2983 @LENGTH@ 11\n");
+        Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD while@@param_count > 0 param = va_arg ptr zval * * * * param = ( zval * * ) p - ( param_count -- ) @TO@ param_count -- > 0 param = va_arg ptr zval * * * * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3402 @LENGTH@ 91\n" +
                 "---UPD condition@@param_count > 0 @TO@ param_count -- > 0 @AT@ 3408 @LENGTH@ 15\n" +
                 "------UPD expr@@param_count > 0 @TO@ param_count -- > 0 @AT@ 3409 @LENGTH@ 15\n" +
                 "---------INS operator@@-- @TO@ expr@@param_count > 0 @AT@ 3410 @LENGTH@ 2\n" +
                 "---UPD block@@param = va_arg ptr zval * * * * param = ( zval * * ) p - ( param_count -- ) @TO@ param = va_arg ptr zval * * * * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3424 @LENGTH@ 75\n" +
-                "------UPD expr_stmt@@* param = ( zval * * ) p - ( param_count -- ) @TO@ * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3461 @LENGTH@ 45\n" +
-                "---------UPD expr@@* param = ( zval * * ) p - ( param_count -- ) @TO@ * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3461 @LENGTH@ 45\n" +
-                "------------UPD name@@param_count @TO@ arg_count @AT@ 3483 @LENGTH@ 11\n");
-        Assert.assertEquals(hierarchicalActionSets.get(3).toString(),"UPD while@@while param_count > 0 * ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ while param_count -- > 0 * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3789 @LENGTH@ 83\n" +
+                "------UPD block_content@@param = va_arg ptr zval * * * * param = ( zval * * ) p - ( param_count -- ) @TO@ param = va_arg ptr zval * * * * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3428 @LENGTH@ 75\n" +
+                "---------UPD expr_stmt@@* param = ( zval * * ) p - ( param_count -- ) @TO@ * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3461 @LENGTH@ 45\n" +
+                "------------UPD expr@@* param = ( zval * * ) p - ( param_count -- ) @TO@ * param = ( zval * * ) p - ( arg_count -- ) @AT@ 3461 @LENGTH@ 45\n" +
+                "---------------UPD name@@param_count @TO@ arg_count @AT@ 3483 @LENGTH@ 11\n");
+        Assert.assertEquals(hierarchicalActionSets.get(3).toString(),"UPD while@@param_count > 0 * ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ param_count -- > 0 * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3783 @LENGTH@ 77\n" +
                 "---UPD condition@@param_count > 0 @TO@ param_count -- > 0 @AT@ 3789 @LENGTH@ 15\n" +
                 "------UPD expr@@param_count > 0 @TO@ param_count -- > 0 @AT@ 3790 @LENGTH@ 15\n" +
                 "---------INS operator@@-- @TO@ expr@@param_count > 0 @AT@ 3791 @LENGTH@ 2\n" +
                 "---UPD block@@* ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3805 @LENGTH@ 61\n" +
-                "------UPD expr_stmt@@* ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3809 @LENGTH@ 61\n" +
-                "---------UPD expr@@* ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3809 @LENGTH@ 61\n" +
-                "------------UPD name@@param_count @TO@ arg_count @AT@ 3844 @LENGTH@ 11\n");
+                "------UPD block_content@@* ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3809 @LENGTH@ 61\n" +
+                "---------UPD expr_stmt@@* ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3809 @LENGTH@ 61\n" +
+                "------------UPD expr@@* ( argument_array ++ ) = ( zval * * ) p - ( param_count -- ) @TO@ * ( argument_array ++ ) = ( zval * * ) p - ( arg_count -- ) @AT@ 3809 @LENGTH@ 61\n" +
+                "---------------UPD name@@param_count @TO@ arg_count @AT@ 3844 @LENGTH@ 11\n");
     }
     @Test
     public void test_wireshark_2cc860_12fddb() throws IOException {
@@ -275,12 +230,18 @@ public class TestInputCases {
     public void test_wireshark_3f2283_9e184d() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_3f2283_9e184d_epan#dissectors#packet-bacapp.c");//ok
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"DEL return@@return offset @AT@ 79332 @LENGTH@ 13\n" +
-                "---DEL expr@@offset @AT@ 79339 @LENGTH@ 6\n" +
-                "------DEL name@@offset @AT@ 79339 @LENGTH@ 6\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"DEL return@@return offset @AT@ 84806 @LENGTH@ 13\n" +
-                "---DEL expr@@offset @AT@ 84813 @LENGTH@ 6\n" +
-                "------DEL name@@offset @AT@ 84813 @LENGTH@ 6\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD switch@@fTagNo tvb offset 0 offset = fBitStringTag tvb subtree offset \"referenced-bitstring: \" break; 1 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags break; default: offset break; @TO@ fTagNo tvb offset 0 offset = fBitStringTag tvb subtree offset \"referenced-bitstring: \" break; 1 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags break; default: break; @AT@ 79064 @LENGTH@ 204\n" +
+                "---UPD block@@0 offset = fBitStringTag tvb subtree offset \"referenced-bitstring: \" break; 1 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags break; default: offset break; @TO@ 0 offset = fBitStringTag tvb subtree offset \"referenced-bitstring: \" break; 1 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags break; default: break; @AT@ 79093 @LENGTH@ 186\n" +
+                "------UPD block_content@@0 offset = fBitStringTag tvb subtree offset \"referenced-bitstring: \" break; 1 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags break; default: offset break; @TO@ 0 offset = fBitStringTag tvb subtree offset \"referenced-bitstring: \" break; 1 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags break; default: break; @AT@ 79098 @LENGTH@ 186\n" +
+                "---------DEL return@@offset @AT@ 79332 @LENGTH@ 6\n" +
+                "------------DEL expr@@offset @AT@ 79339 @LENGTH@ 6\n" +
+                "---------------DEL name@@offset @AT@ 79339 @LENGTH@ 6\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD switch@@fTagNo tvb offset 0 offset = fEnumeratedTagSplit tvb subtree offset \"new-state: \" BACnetLifeSafetyState 256 break; 1 offset = fEnumeratedTagSplit tvb subtree offset \"new-mode: \" BACnetLifeSafetyState 256 break; 2 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags 3 offset = fEnumeratedTagSplit tvb subtree offset \"operation-expected: \" BACnetLifeSafetyOperation 64 default: offset break; @TO@ fTagNo tvb offset 0 offset = fEnumeratedTagSplit tvb subtree offset \"new-state: \" BACnetLifeSafetyState 256 break; 1 offset = fEnumeratedTagSplit tvb subtree offset \"new-mode: \" BACnetLifeSafetyState 256 break; 2 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags 3 offset = fEnumeratedTagSplit tvb subtree offset \"operation-expected: \" BACnetLifeSafetyOperation 64 default: break; @AT@ 84272 @LENGTH@ 416\n" +
+                "---UPD block@@0 offset = fEnumeratedTagSplit tvb subtree offset \"new-state: \" BACnetLifeSafetyState 256 break; 1 offset = fEnumeratedTagSplit tvb subtree offset \"new-mode: \" BACnetLifeSafetyState 256 break; 2 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags 3 offset = fEnumeratedTagSplit tvb subtree offset \"operation-expected: \" BACnetLifeSafetyOperation 64 default: offset break; @TO@ 0 offset = fEnumeratedTagSplit tvb subtree offset \"new-state: \" BACnetLifeSafetyState 256 break; 1 offset = fEnumeratedTagSplit tvb subtree offset \"new-mode: \" BACnetLifeSafetyState 256 break; 2 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags 3 offset = fEnumeratedTagSplit tvb subtree offset \"operation-expected: \" BACnetLifeSafetyOperation 64 default: break; @AT@ 84301 @LENGTH@ 398\n" +
+                "------UPD block_content@@0 offset = fEnumeratedTagSplit tvb subtree offset \"new-state: \" BACnetLifeSafetyState 256 break; 1 offset = fEnumeratedTagSplit tvb subtree offset \"new-mode: \" BACnetLifeSafetyState 256 break; 2 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags 3 offset = fEnumeratedTagSplit tvb subtree offset \"operation-expected: \" BACnetLifeSafetyOperation 64 default: offset break; @TO@ 0 offset = fEnumeratedTagSplit tvb subtree offset \"new-state: \" BACnetLifeSafetyState 256 break; 1 offset = fEnumeratedTagSplit tvb subtree offset \"new-mode: \" BACnetLifeSafetyState 256 break; 2 offset = fBitStringTagVS tvb subtree offset \"status-flags: \" BACnetStatusFlags 3 offset = fEnumeratedTagSplit tvb subtree offset \"operation-expected: \" BACnetLifeSafetyOperation 64 default: break; @AT@ 84306 @LENGTH@ 398\n" +
+                "---------DEL return@@offset @AT@ 84806 @LENGTH@ 6\n" +
+                "------------DEL expr@@offset @AT@ 84813 @LENGTH@ 6\n" +
+                "---------------DEL name@@offset @AT@ 84813 @LENGTH@ 6\n");
     }
     @Test
     public void test_wireshark_1a76dd_1d1a48() throws IOException {
@@ -345,199 +306,189 @@ public class TestInputCases {
     @Test
     public void test_php_src_a347ed_d2b435() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_a347ed_d2b435_ext#ereg#ereg.c");//removeParentForSingle?? and others maybe
-        Assert.fail(); //todo wrong
+//        Assert.fail(); //todo wrong
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 else new_l ++ walk ++ @TO@ if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 else new_l ++ walk ++ @AT@ 8933 @LENGTH@ 236\n" +
-                "---UPD condition@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8933 @LENGTH@ 130\n" +
-                "------UPD expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8934 @LENGTH@ 130\n" +
-                "---------INS name@@walk ][1 @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8997 @LENGTH@ 8\n" +
-                "------------INS name@@walk @TO@ name@@walk ][1 @AT@ 8997 @LENGTH@ 4\n" +
-                "------------INS index@@][1 @TO@ name@@walk ][1 @AT@ 9002 @LENGTH@ 3\n" +
-                "---------------INS expr@@[1 @TO@ index@@][1 @AT@ 9002 @LENGTH@ 2\n" +
-                "------------------INS literal:number@@[1 @TO@ expr@@[1 @AT@ 9002 @LENGTH@ 2\n" +
-                "---------INS operator@@- @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9005 @LENGTH@ 1\n" +
-                "---------INS literal:char@@'0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9007 @LENGTH@ 3\n" +
-                "---------INS operator@@<= @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9011 @LENGTH@ 2\n" +
-                "---------INS name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9014 @LENGTH@ 12\n" +
-                "------------INS name@@re @TO@ name@@re . re_nsub @AT@ 9014 @LENGTH@ 2\n" +
-                "------------INS operator@@. @TO@ name@@re . re_nsub @AT@ 9016 @LENGTH@ 1\n" +
-                "------------INS name@@re_nsub @TO@ name@@re . re_nsub @AT@ 9017 @LENGTH@ 7\n" +
-                "---------DEL operator@@. @AT@ 9016 @LENGTH@ 1\n" +
-                "---------INS operator@@&& @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9030 @LENGTH@ 2\n" +
-                "---------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9036 @LENGTH@ 21\n" +
-                "---------INS operator@@. @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9052 @LENGTH@ 1\n" +
-                "---------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9675 @LENGTH@ 21\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 else * walkbuf ++ = * walk ++ @TO@ if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 else * walkbuf ++ = * walk ++ @AT@ 9611 @LENGTH@ 388\n" +
-                "---UPD condition@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9611 @LENGTH@ 196\n" +
-                "------UPD expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9612 @LENGTH@ 196\n" +
-                "---------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 8997 @LENGTH@ 21\n" +
-                "---------MOV name@@[walk ][1 @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9680 @LENGTH@ 9\n" +
-                "---------MOV operator@@- @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9688 @LENGTH@ 1\n" +
-                "---------MOV literal:char@@'0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9690 @LENGTH@ 3\n" +
-                "---------DEL operator@@. @AT@ 9694 @LENGTH@ 1\n" +
-                "---------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9714 @LENGTH@ 21\n" +
-                "---------INS operator@@<= @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9725 @LENGTH@ 2\n" +
-                "---------INS name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9728 @LENGTH@ 12\n" +
-                "------------INS name@@re @TO@ name@@re . re_nsub @AT@ 9728 @LENGTH@ 2\n" +
-                "------------INS operator@@. @TO@ name@@re . re_nsub @AT@ 9730 @LENGTH@ 1\n" +
-                "------------INS name@@re_nsub @TO@ name@@re . re_nsub @AT@ 9731 @LENGTH@ 7\n" +
-                "---------INS operator@@&& @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9744 @LENGTH@ 2\n" +
-                "---------INS operator@@. @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9766 @LENGTH@ 1\n" +
-                "---------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9806 @LENGTH@ 21\n" +
-                "---------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9835 @LENGTH@ 21\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 new_l ++ walk ++ @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 new_l ++ walk ++ @AT@ 8930 @LENGTH@ 228\n" +
+                "---UPD if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 8930 @LENGTH@ 211\n" +
+                "------UPD condition@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8933 @LENGTH@ 130\n" +
+                "---------UPD expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8934 @LENGTH@ 130\n" +
+                "------------INS name@@walk ][1 @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8997 @LENGTH@ 8\n" +
+                "---------------INS name@@walk @TO@ name@@walk ][1 @AT@ 8997 @LENGTH@ 4\n" +
+                "---------------INS index@@][1 @TO@ name@@walk ][1 @AT@ 9001 @LENGTH@ 3\n" +
+                "------------------INS expr@@[1 @TO@ index@@][1 @AT@ 9002 @LENGTH@ 2\n" +
+                "---------------------INS literal:number@@[1 @TO@ expr@@[1 @AT@ 9002 @LENGTH@ 2\n" +
+                "------------INS operator@@- @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9005 @LENGTH@ 1\n" +
+                "------------INS literal:char@@'0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9007 @LENGTH@ 3\n" +
+                "------------INS operator@@<= @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9011 @LENGTH@ 2\n" +
+                "------------INS name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9014 @LENGTH@ 12\n" +
+                "---------------INS name@@re @TO@ name@@re . re_nsub @AT@ 9014 @LENGTH@ 2\n" +
+                "---------------INS operator@@. @TO@ name@@re . re_nsub @AT@ 9016 @LENGTH@ 1\n" +
+                "---------------INS name@@re_nsub @TO@ name@@re . re_nsub @AT@ 9017 @LENGTH@ 7\n" +
+                "------------DEL operator@@. @AT@ 9016 @LENGTH@ 1\n" +
+                "------------INS operator@@&& @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9030 @LENGTH@ 2\n" +
+                "------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9036 @LENGTH@ 21\n" +
+                "------------INS operator@@. @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9052 @LENGTH@ 1\n" +
+                "------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9675 @LENGTH@ 21\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if_stmt@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 * walkbuf ++ = * walk ++ @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 * walkbuf ++ = * walk ++ @AT@ 9608 @LENGTH@ 380\n" +
+                "---UPD if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9608 @LENGTH@ 355\n" +
+                "------UPD condition@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9611 @LENGTH@ 196\n" +
+                "---------UPD expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9612 @LENGTH@ 196\n" +
+                "------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 8997 @LENGTH@ 21\n" +
+                "------------MOV name@@[walk ][1 @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9680 @LENGTH@ 9\n" +
+                "---------------UPD name@@[walk ][1 @TO@ walk ][1 @AT@ 9680 @LENGTH@ 9\n" +
+                "------------------UPD name@@[walk @TO@ walk @AT@ 9680 @LENGTH@ 5\n" +
+                "------------MOV operator@@- @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9688 @LENGTH@ 1\n" +
+                "------------MOV literal:char@@'0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9690 @LENGTH@ 3\n" +
+                "------------DEL operator@@. @AT@ 9694 @LENGTH@ 1\n" +
+                "------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9714 @LENGTH@ 21\n" +
+                "------------INS operator@@<= @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9725 @LENGTH@ 2\n" +
+                "------------INS name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9728 @LENGTH@ 12\n" +
+                "---------------INS name@@re @TO@ name@@re . re_nsub @AT@ 9728 @LENGTH@ 2\n" +
+                "---------------INS operator@@. @TO@ name@@re . re_nsub @AT@ 9730 @LENGTH@ 1\n" +
+                "---------------INS name@@re_nsub @TO@ name@@re . re_nsub @AT@ 9731 @LENGTH@ 7\n" +
+                "------------INS operator@@&& @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9744 @LENGTH@ 2\n" +
+                "------------INS operator@@. @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9766 @LENGTH@ 1\n" +
+                "------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9806 @LENGTH@ 21\n" +
+                "------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9835 @LENGTH@ 21\n");
     }
     @Test//TODO
     public void test_php_src_f91b3d_5f1bff() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_f91b3d_5f1bff_ext#ereg#ereg.c");//removeParentForSingle?? and others maybe
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 else new_l ++ walk ++ @TO@ if '\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 else new_l ++ walk ++ @AT@ 8933 @LENGTH@ 283\n" +
-                "---DEL condition@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8933 @LENGTH@ 177\n" +
-                "------DEL expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8934 @LENGTH@ 177\n" +
-                "---------DEL literal@@'0' @AT@ 8956 @LENGTH@ 3\n" +
-                "---------DEL operator@@<= @AT@ 8960 @LENGTH@ 2\n" +
-                "---------DEL operator@@&& @AT@ 8971 @LENGTH@ 2\n" +
-                "---------DEL literal@@'9' @AT@ 8974 @LENGTH@ 3\n" +
-                "---------DEL operator@@>= @AT@ 8978 @LENGTH@ 2\n" +
-                "---------DEL operator@@&& @AT@ 8994 @LENGTH@ 2\n" +
-                "---------DEL name@@walk ][1 @AT@ 8997 @LENGTH@ 8\n" +
-                "------------DEL name@@walk @AT@ 8997 @LENGTH@ 4\n" +
-                "------------DEL index@@][1 @AT@ 9002 @LENGTH@ 3\n" +
-                "---------------DEL expr@@[1 @AT@ 9002 @LENGTH@ 2\n" +
-                "------------------DEL literal@@[1 @AT@ 9002 @LENGTH@ 2\n" +
-                "---INS condition@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @TO@ if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 else new_l ++ walk ++ @AT@ 8952 @LENGTH@ 81\n" +
-                "------INS expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @TO@ condition@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8953 @LENGTH@ 81\n" +
-                "---------MOV literal@@'\\\\' @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8934 @LENGTH@ 4\n" +
-                "---------MOV operator@@== @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8939 @LENGTH@ 2\n" +
-                "---------MOV operator@@* @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8942 @LENGTH@ 1\n" +
-                "---------MOV name@@walk @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8943 @LENGTH@ 4\n" +
-                "---------MOV operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8953 @LENGTH@ 2\n" +
-                "---------MOV name@@walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8963 @LENGTH@ 8\n" +
-                "---------INS call@@isdigit walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8970 @LENGTH@ 16\n" +
-                "------------INS name@@isdigit @TO@ call@@isdigit walk ][1 @AT@ 8970 @LENGTH@ 7\n" +
-                "------------INS argument_list@@walk ][1 @TO@ call@@isdigit walk ][1 @AT@ 8977 @LENGTH@ 8\n" +
-                "---------------INS argument@@walk ][1 @TO@ argument_list@@walk ][1 @AT@ 8978 @LENGTH@ 8\n" +
-                "------------------INS expr@@walk ][1 @TO@ argument@@walk ][1 @AT@ 8978 @LENGTH@ 8\n" +
-                "---------------------MOV name@@walk ][1 @TO@ expr@@walk ][1 @AT@ 8981 @LENGTH@ 8\n" +
-                "---------INS operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8987 @LENGTH@ 2\n" +
-                "---------MOV operator@@- @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9005 @LENGTH@ 1\n" +
-                "---------MOV literal@@'0' @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9007 @LENGTH@ 3\n" +
-                "---------MOV operator@@<= @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9011 @LENGTH@ 2\n" +
-                "---------MOV operator@@( @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9014 @LENGTH@ 1\n" +
-                "---------MOV operator@@( @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9015 @LENGTH@ 1\n" +
-                "---------MOV name@@char @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9016 @LENGTH@ 4\n" +
-                "---------MOV operator@@) @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9020 @LENGTH@ 1\n" +
-                "---------MOV name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9022 @LENGTH@ 12\n" +
-                "---------MOV operator@@) @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9032 @LENGTH@ 1\n" +
-                "---INS then@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 else new_l ++ walk ++ @AT@ 9028 @LENGTH@ 158\n" +
-                "------INS block@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ then@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 9028 @LENGTH@ 158\n" +
-                "---------INS if@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @TO@ block@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 9038 @LENGTH@ 148\n" +
-                "------------INS condition@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ if@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9038 @LENGTH@ 74\n" +
-                "---------------INS expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ condition@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9039 @LENGTH@ 74\n" +
-                "------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9061 @LENGTH@ 1\n" +
-                "------------------MOV name@@rm_so @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9062 @LENGTH@ 5\n" +
-                "------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9068 @LENGTH@ 1\n" +
-                "------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9070 @LENGTH@ 1\n" +
-                "------------------MOV literal@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9071 @LENGTH@ 1\n" +
-                "------------------MOV operator@@&& @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9078 @LENGTH@ 2\n" +
-                "------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9081 @LENGTH@ 21\n" +
-                "------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9100 @LENGTH@ 1\n" +
-                "------------------MOV name@@rm_eo @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9101 @LENGTH@ 5\n" +
-                "------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9107 @LENGTH@ 1\n" +
-                "------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9109 @LENGTH@ 1\n" +
-                "------------------MOV literal@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9110 @LENGTH@ 1\n" +
-                "------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9916 @LENGTH@ 21\n" +
-                "------------MOV then@@new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ if@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9113 @LENGTH@ 80\n" +
-                "---------MOV expr_stmt@@walk += 2 @TO@ block@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 9195 @LENGTH@ 9\n" +
-                "---UPD then@@new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9113 @LENGTH@ 80\n" +
-                "------UPD block@@new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9113 @LENGTH@ 80\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 else * walkbuf ++ = * walk ++ @TO@ if '\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub  if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 else  * walkbuf ++ = * walk ++ @AT@ 9656 @LENGTH@ 424\n" +
-                "---INS condition@@ '\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @TO@ if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 else * walkbuf ++ = * walk ++ @AT@ 9654 @LENGTH@ 67\n" +
-                "------INS expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @TO@ condition@@ '\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9655 @LENGTH@ 69\n" +
-                "---------MOV literal@@'\\\\' @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9657 @LENGTH@ 4\n" +
-                "---------MOV operator@@== @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9662 @LENGTH@ 2\n" +
-                "---------MOV operator@@* @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9665 @LENGTH@ 1\n" +
-                "---------MOV name@@walk @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9666 @LENGTH@ 4\n" +
-                "---------INS call@@isdigit  walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9672 @LENGTH@ 17\n" +
-                "------------INS name@@isdigit @TO@ call@@isdigit  walk ][1 @AT@ 9672 @LENGTH@ 7\n" +
-                "------------INS argument_list@@ walk ][1 @TO@ call@@isdigit  walk ][1 @AT@ 9679 @LENGTH@ 10\n" +
-                "---------------INS argument@@walk ][1 @TO@ argument_list@@ walk ][1 @AT@ 9680 @LENGTH@ 8\n" +
-                "------------------INS expr@@walk ][1 @TO@ argument@@walk ][1 @AT@ 9680 @LENGTH@ 8\n" +
-                "---------------------MOV name@@walk ][1 @TO@ expr@@walk ][1 @AT@ 9704 @LENGTH@ 8\n" +
-                "---------MOV operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9676 @LENGTH@ 2\n" +
-                "---------MOV name@@walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9686 @LENGTH@ 8\n" +
-                "---------INS operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9689 @LENGTH@ 2\n" +
-                "---------MOV operator@@- @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9728 @LENGTH@ 1\n" +
-                "---------MOV literal@@'0' @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9730 @LENGTH@ 3\n" +
-                "---------MOV operator@@<= @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9734 @LENGTH@ 2\n" +
-                "---------MOV name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && isdigit  walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9737 @LENGTH@ 12\n" +
-                "---DEL condition@@ '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9656 @LENGTH@ 287\n" +
-                "------DEL expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9657 @LENGTH@ 230\n" +
-                "---------DEL literal@@'0' @AT@ 9679 @LENGTH@ 3\n" +
-                "---------DEL operator@@<= @AT@ 9683 @LENGTH@ 2\n" +
-                "---------DEL operator@@&& @AT@ 9694 @LENGTH@ 2\n" +
-                "---------DEL literal@@'9' @AT@ 9697 @LENGTH@ 3\n" +
-                "---------DEL operator@@>= @AT@ 9701 @LENGTH@ 2\n" +
-                "---------DEL operator@@&& @AT@ 9717 @LENGTH@ 2\n" +
-                "---------DEL name@@walk ][1 @AT@ 9720 @LENGTH@ 8\n" +
-                "------------DEL name@@walk @AT@ 9720 @LENGTH@ 4\n" +
-                "------------DEL index@@][1 @AT@ 9725 @LENGTH@ 3\n" +
-                "---------------DEL expr@@[1 @AT@ 9725 @LENGTH@ 2\n" +
-                "------------------DEL literal@@[1 @AT@ 9725 @LENGTH@ 2\n" +
-                "---------DEL operator@@&& @AT@ 9753 @LENGTH@ 2\n" +
-                "---INS then@@ if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ if@@if '\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 else * walkbuf ++ = * walk ++ @AT@ 9721 @LENGTH@ 305\n" +
-                "------INS block@@ if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ then@@ if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9721 @LENGTH@ 393\n" +
-                "---------INS if@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @TO@ block@@ if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9731 @LENGTH@ 294\n" +
-                "------------INS condition@@ subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ if@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9731 @LENGTH@ 185\n" +
-                "---------------INS expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ condition@@ subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9732 @LENGTH@ 140\n" +
-                "------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9042 @LENGTH@ 21\n" +
-                "------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9756 @LENGTH@ 21\n" +
-                "------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9775 @LENGTH@ 1\n" +
-                "------------------MOV name@@rm_so @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9776 @LENGTH@ 5\n" +
-                "------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9782 @LENGTH@ 1\n" +
-                "------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9784 @LENGTH@ 1\n" +
-                "------------------MOV literal@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9785 @LENGTH@ 1\n" +
-                "------------------MOV operator@@&& @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9792 @LENGTH@ 2\n" +
-                "------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9795 @LENGTH@ 21\n" +
-                "------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9814 @LENGTH@ 1\n" +
-                "------------------MOV name@@rm_eo @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9815 @LENGTH@ 5\n" +
-                "------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9821 @LENGTH@ 1\n" +
-                "------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9823 @LENGTH@ 1\n" +
-                "------------------MOV literal@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9824 @LENGTH@ 1\n" +
-                "------------------MOV operator@@&& @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9884 @LENGTH@ 2\n" +
-                "------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9887 @LENGTH@ 21\n" +
-                "------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9906 @LENGTH@ 1\n" +
-                "------------------MOV name@@rm_so @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9907 @LENGTH@ 5\n" +
-                "------------------MOV operator@@<= @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9913 @LENGTH@ 2\n" +
-                "------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9935 @LENGTH@ 1\n" +
-                "------------------MOV name@@rm_eo @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9936 @LENGTH@ 5\n" +
-                "------------MOV then@@ tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ if@@if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9943 @LENGTH@ 160\n" +
-                "---------MOV expr_stmt@@walk += 2 @TO@ block@@ if subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 10127 @LENGTH@ 9\n" +
-                "---UPD then@@ tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9943 @LENGTH@ 160\n" +
-                "------UPD block@@ tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@  tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy  walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9943 @LENGTH@ 201\n" +
-                "---UPD else@@else * walkbuf ++ = * walk ++ @TO@ else  * walkbuf ++ = * walk ++ @AT@ 10154 @LENGTH@ 29\n" +
-                "------UPD block@@* walkbuf ++ = * walk ++ @TO@  * walkbuf ++ = * walk ++ @AT@ 10154 @LENGTH@ 24\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 new_l ++ walk ++ @TO@ '\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 new_l ++ walk ++ @AT@ 8930 @LENGTH@ 275\n" +
+                "---UPD if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ '\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 8930 @LENGTH@ 258\n" +
+                "------DEL condition@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8933 @LENGTH@ 177\n" +
+                "---------DEL expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 8934 @LENGTH@ 177\n" +
+                "------------DEL literal:char@@'0' @AT@ 8956 @LENGTH@ 3\n" +
+                "------------DEL operator@@<= @AT@ 8960 @LENGTH@ 2\n" +
+                "------------DEL operator@@&& @AT@ 8971 @LENGTH@ 2\n" +
+                "------------DEL literal:char@@'9' @AT@ 8974 @LENGTH@ 3\n" +
+                "------------DEL operator@@>= @AT@ 8978 @LENGTH@ 2\n" +
+                "------------DEL operator@@&& @AT@ 8994 @LENGTH@ 2\n" +
+                "------------DEL name@@walk ][1 @AT@ 8997 @LENGTH@ 8\n" +
+                "---------------DEL name@@walk @AT@ 8997 @LENGTH@ 4\n" +
+                "---------------DEL index@@][1 @AT@ 9001 @LENGTH@ 3\n" +
+                "------------------DEL expr@@[1 @AT@ 9002 @LENGTH@ 2\n" +
+                "---------------------DEL literal:number@@[1 @AT@ 9002 @LENGTH@ 2\n" +
+                "------INS condition@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @TO@ if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 8952 @LENGTH@ 81\n" +
+                "---------INS expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @TO@ condition@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8953 @LENGTH@ 81\n" +
+                "------------MOV literal:char@@'\\\\' @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8934 @LENGTH@ 4\n" +
+                "------------MOV operator@@== @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8939 @LENGTH@ 2\n" +
+                "------------MOV operator@@* @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8942 @LENGTH@ 1\n" +
+                "------------MOV name@@walk @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8943 @LENGTH@ 4\n" +
+                "------------MOV operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8953 @LENGTH@ 2\n" +
+                "------------MOV name@@walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8963 @LENGTH@ 8\n" +
+                "------------INS call@@isdigit walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8970 @LENGTH@ 16\n" +
+                "---------------INS name@@isdigit @TO@ call@@isdigit walk ][1 @AT@ 8970 @LENGTH@ 7\n" +
+                "---------------INS argument_list@@walk ][1 @TO@ call@@isdigit walk ][1 @AT@ 8977 @LENGTH@ 8\n" +
+                "------------------INS argument@@walk ][1 @TO@ argument_list@@walk ][1 @AT@ 8978 @LENGTH@ 8\n" +
+                "---------------------INS expr@@walk ][1 @TO@ argument@@walk ][1 @AT@ 8978 @LENGTH@ 8\n" +
+                "------------------------MOV name@@walk ][1 @TO@ expr@@walk ][1 @AT@ 8981 @LENGTH@ 8\n" +
+                "------------INS operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 8987 @LENGTH@ 2\n" +
+                "------------MOV operator@@- @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9005 @LENGTH@ 1\n" +
+                "------------MOV literal:char@@'0' @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9007 @LENGTH@ 3\n" +
+                "------------MOV operator@@<= @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9011 @LENGTH@ 2\n" +
+                "------------MOV operator@@( @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9014 @LENGTH@ 1\n" +
+                "------------MOV operator@@( @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9015 @LENGTH@ 1\n" +
+                "------------MOV name@@char @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9016 @LENGTH@ 4\n" +
+                "------------MOV operator@@) @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9020 @LENGTH@ 1\n" +
+                "------------MOV name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9022 @LENGTH@ 12\n" +
+                "------------MOV operator@@) @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) @AT@ 9032 @LENGTH@ 1\n" +
+                "------INS block@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= ( ( char ) re . re_nsub ) && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 9028 @LENGTH@ 155\n" +
+                "---------INS block_content@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ block@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 9035 @LENGTH@ 155\n" +
+                "------------INS if_stmt@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @TO@ block_content@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 9035 @LENGTH@ 145\n" +
+                "---------------INS if@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @TO@ if_stmt@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9035 @LENGTH@ 145\n" +
+                "------------------INS condition@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ if@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9038 @LENGTH@ 74\n" +
+                "---------------------INS expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @TO@ condition@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9039 @LENGTH@ 74\n" +
+                "------------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9061 @LENGTH@ 1\n" +
+                "------------------------MOV name@@rm_so @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9062 @LENGTH@ 5\n" +
+                "------------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9068 @LENGTH@ 1\n" +
+                "------------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9070 @LENGTH@ 1\n" +
+                "------------------------MOV literal:number@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9071 @LENGTH@ 1\n" +
+                "------------------------MOV operator@@&& @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9078 @LENGTH@ 2\n" +
+                "------------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9081 @LENGTH@ 21\n" +
+                "------------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9100 @LENGTH@ 1\n" +
+                "------------------------MOV name@@rm_eo @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9101 @LENGTH@ 5\n" +
+                "------------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9107 @LENGTH@ 1\n" +
+                "------------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9109 @LENGTH@ 1\n" +
+                "------------------------MOV literal:number@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9110 @LENGTH@ 1\n" +
+                "------------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 @AT@ 9916 @LENGTH@ 21\n" +
+                "------------------MOV block@@new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ if@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9113 @LENGTH@ 80\n" +
+                "------------MOV expr_stmt@@walk += 2 @TO@ block_content@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @AT@ 9195 @LENGTH@ 9\n" +
+                "------UPD block@@new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9113 @LENGTH@ 80\n" +
+                "---------UPD block_content@@new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so walk += 2 @TO@ new_l += subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so @AT@ 9120 @LENGTH@ 80\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if_stmt@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 * walkbuf ++ = * walk ++ @TO@ '\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 * walkbuf ++ = * walk ++ @AT@ 9653 @LENGTH@ 414\n" +
+                "---UPD if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ '\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9653 @LENGTH@ 389\n" +
+                "------INS condition@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @TO@ if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9654 @LENGTH@ 68\n" +
+                "---------INS expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @TO@ condition@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9655 @LENGTH@ 68\n" +
+                "------------MOV literal:char@@'\\\\' @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9657 @LENGTH@ 4\n" +
+                "------------MOV operator@@== @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9662 @LENGTH@ 2\n" +
+                "------------MOV operator@@* @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9665 @LENGTH@ 1\n" +
+                "------------MOV name@@walk @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9666 @LENGTH@ 4\n" +
+                "------------INS call@@isdigit walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9672 @LENGTH@ 16\n" +
+                "---------------INS name@@isdigit @TO@ call@@isdigit walk ][1 @AT@ 9672 @LENGTH@ 7\n" +
+                "---------------INS argument_list@@walk ][1 @TO@ call@@isdigit walk ][1 @AT@ 9679 @LENGTH@ 8\n" +
+                "------------------INS argument@@walk ][1 @TO@ argument_list@@walk ][1 @AT@ 9680 @LENGTH@ 8\n" +
+                "---------------------INS expr@@walk ][1 @TO@ argument@@walk ][1 @AT@ 9680 @LENGTH@ 8\n" +
+                "------------------------MOV name@@walk ][1 @TO@ expr@@walk ][1 @AT@ 9704 @LENGTH@ 8\n" +
+                "------------MOV operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9676 @LENGTH@ 2\n" +
+                "------------MOV name@@walk ][1 @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9686 @LENGTH@ 8\n" +
+                "------------INS operator@@&& @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9689 @LENGTH@ 2\n" +
+                "------------MOV operator@@- @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9728 @LENGTH@ 1\n" +
+                "------------MOV literal:char@@'0' @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9730 @LENGTH@ 3\n" +
+                "------------MOV operator@@<= @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9734 @LENGTH@ 2\n" +
+                "------------MOV name@@re . re_nsub @TO@ expr@@'\\\\' == * walk && isdigit walk ][1 && walk ][1 - '0' <= re . re_nsub @AT@ 9737 @LENGTH@ 12\n" +
+                "------DEL condition@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9656 @LENGTH@ 230\n" +
+                "---------DEL expr@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9657 @LENGTH@ 230\n" +
+                "------------DEL literal:char@@'0' @AT@ 9679 @LENGTH@ 3\n" +
+                "------------DEL operator@@<= @AT@ 9683 @LENGTH@ 2\n" +
+                "------------DEL operator@@&& @AT@ 9694 @LENGTH@ 2\n" +
+                "------------DEL literal:char@@'9' @AT@ 9697 @LENGTH@ 3\n" +
+                "------------DEL operator@@>= @AT@ 9701 @LENGTH@ 2\n" +
+                "------------DEL operator@@&& @AT@ 9717 @LENGTH@ 2\n" +
+                "------------DEL name@@walk ][1 @AT@ 9720 @LENGTH@ 8\n" +
+                "---------------DEL name@@walk @AT@ 9720 @LENGTH@ 4\n" +
+                "---------------DEL index@@][1 @AT@ 9724 @LENGTH@ 3\n" +
+                "------------------DEL expr@@[1 @AT@ 9725 @LENGTH@ 2\n" +
+                "---------------------DEL literal:number@@[1 @AT@ 9725 @LENGTH@ 2\n" +
+                "------------DEL operator@@&& @AT@ 9753 @LENGTH@ 2\n" +
+                "------INS block@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ if@@'\\\\' == * walk && '0' <= walk ][1 && '9' >= walk ][1 && walk ][1 - '0' <= re . re_nsub && subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9721 @LENGTH@ 299\n" +
+                "---------INS block_content@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ block@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9728 @LENGTH@ 299\n" +
+                "------------INS if_stmt@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @TO@ block_content@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 9728 @LENGTH@ 289\n" +
+                "---------------INS if@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @TO@ if_stmt@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9728 @LENGTH@ 289\n" +
+                "------------------INS condition@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ if@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9731 @LENGTH@ 140\n" +
+                "---------------------INS expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @TO@ condition@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9732 @LENGTH@ 140\n" +
+                "------------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9042 @LENGTH@ 21\n" +
+                "------------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9756 @LENGTH@ 21\n" +
+                "------------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9775 @LENGTH@ 1\n" +
+                "------------------------MOV name@@rm_so @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9776 @LENGTH@ 5\n" +
+                "------------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9782 @LENGTH@ 1\n" +
+                "------------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9784 @LENGTH@ 1\n" +
+                "------------------------MOV literal:number@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9785 @LENGTH@ 1\n" +
+                "------------------------MOV operator@@&& @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9792 @LENGTH@ 2\n" +
+                "------------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9795 @LENGTH@ 21\n" +
+                "------------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9814 @LENGTH@ 1\n" +
+                "------------------------MOV name@@rm_eo @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9815 @LENGTH@ 5\n" +
+                "------------------------MOV operator@@> @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9821 @LENGTH@ 1\n" +
+                "------------------------MOV operator@@- @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9823 @LENGTH@ 1\n" +
+                "------------------------MOV literal:number@@1 @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9824 @LENGTH@ 1\n" +
+                "------------------------MOV operator@@&& @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9884 @LENGTH@ 2\n" +
+                "------------------------MOV name@@subs ][walk ][1 - '0' @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9887 @LENGTH@ 21\n" +
+                "------------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9906 @LENGTH@ 1\n" +
+                "------------------------MOV name@@rm_so @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9907 @LENGTH@ 5\n" +
+                "------------------------MOV operator@@<= @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9913 @LENGTH@ 2\n" +
+                "------------------------MOV operator@@. @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9935 @LENGTH@ 1\n" +
+                "------------------------MOV name@@rm_eo @TO@ expr@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo @AT@ 9936 @LENGTH@ 5\n" +
+                "------------------MOV block@@tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ if@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9943 @LENGTH@ 158\n" +
+                "------------MOV expr_stmt@@walk += 2 @TO@ block_content@@subs ][walk ][1 - '0' . rm_so > - 1 && subs ][walk ][1 - '0' . rm_eo > - 1 && subs ][walk ][1 - '0' . rm_so <= subs ][walk ][1 - '0' . rm_eo tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @AT@ 10127 @LENGTH@ 9\n" +
+                "------UPD block@@tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9943 @LENGTH@ 158\n" +
+                "---------UPD block_content@@tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp walk += 2 @TO@ tmp = subs ][walk ][1 - '0' . rm_eo - subs ][walk ][1 - '0' . rm_so memcpy walkbuf & string ][pos + subs ][walk ][1 - '0' . rm_so tmp walkbuf += tmp @AT@ 9950 @LENGTH@ 158\n");
     }
     @Test
     public void test_wireshark_606866_c79cf4() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_606866_c79cf4_epan#dissectors#packet-atalk.c");//
         Assert.assertEquals(hierarchicalActionSets.size(),3);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for i = 1 i <= count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @TO@ for i = 0 i < count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @AT@ 47203 @LENGTH@ 140\n" +
-                "---UPD control@@i = 1 i <= count i ++ @TO@ i = 0 i < count i ++ @AT@ 47203 @LENGTH@ 21\n" +
-                "------UPD init@@i = 1 @TO@ i = 0 @AT@ 47204 @LENGTH@ 5\n" +
-                "---------UPD expr@@i = 1 @TO@ i = 0 @AT@ 47204 @LENGTH@ 5\n" +
-                "------------UPD literal:number@@1 @TO@ 0 @AT@ 47207 @LENGTH@ 1\n" +
-                "------UPD condition@@i <= count @TO@ i < count @AT@ 47210 @LENGTH@ 10\n" +
-                "---------UPD expr@@i <= count @TO@ i < count @AT@ 47210 @LENGTH@ 10\n" +
-                "------------UPD operator@@<= @TO@ < @AT@ 47212 @LENGTH@ 2\n");
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for i = 1 i <= count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @TO@ for i = 0 i < count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @AT@ 47203 @LENGTH@ 140\n" +
-                "---UPD control@@i = 1 i <= count i ++ @TO@ i = 0 i < count i ++ @AT@ 47203 @LENGTH@ 21\n" +
-                "------UPD init@@i = 1 @TO@ i = 0 @AT@ 47204 @LENGTH@ 5\n" +
-                "---------UPD expr@@i = 1 @TO@ i = 0 @AT@ 47204 @LENGTH@ 5\n" +
-                "------------UPD literal:number@@1 @TO@ 0 @AT@ 47207 @LENGTH@ 1\n" +
-                "------UPD condition@@i <= count @TO@ i < count @AT@ 47210 @LENGTH@ 10\n" +
-                "---------UPD expr@@i <= count @TO@ i < count @AT@ 47210 @LENGTH@ 10\n" +
-                "------------UPD operator@@<= @TO@ < @AT@ 47212 @LENGTH@ 2\n");
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for i = 1 i <= count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @TO@ for i = 0 i < count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @AT@ 47203 @LENGTH@ 140\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 1 i <= count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @TO@ i = 0 i < count i ++ len = tvb_get_guint8 tvb offset proto_tree_add_item sub_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @AT@ 47199 @LENGTH@ 136\n" +
                 "---UPD control@@i = 1 i <= count i ++ @TO@ i = 0 i < count i ++ @AT@ 47203 @LENGTH@ 21\n" +
                 "------UPD init@@i = 1 @TO@ i = 0 @AT@ 47204 @LENGTH@ 5\n" +
                 "---------UPD expr@@i = 1 @TO@ i = 0 @AT@ 47204 @LENGTH@ 5\n" +
@@ -545,18 +496,38 @@ public class TestInputCases {
                 "------UPD condition@@i <= count @TO@ i < count @AT@ 47210 @LENGTH@ 10\n" +
                 "---------UPD expr@@i <= count @TO@ i < count @AT@ 47210 @LENGTH@ 10\n" +
                 "------------UPD operator@@<= @TO@ < @AT@ 47212 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD for@@i = 1 i <= count i ++ proto_tree_add_item sub_tree hf_zip_network tvb offset 2 FALSE offset += 2 @TO@ i = 0 i < count i ++ proto_tree_add_item sub_tree hf_zip_network tvb offset 2 FALSE offset += 2 @AT@ 48615 @LENGTH@ 96\n" +
+                "---UPD control@@i = 1 i <= count i ++ @TO@ i = 0 i < count i ++ @AT@ 48619 @LENGTH@ 21\n" +
+                "------UPD init@@i = 1 @TO@ i = 0 @AT@ 48620 @LENGTH@ 5\n" +
+                "---------UPD expr@@i = 1 @TO@ i = 0 @AT@ 48620 @LENGTH@ 5\n" +
+                "------------UPD literal:number@@1 @TO@ 0 @AT@ 48623 @LENGTH@ 1\n" +
+                "------UPD condition@@i <= count @TO@ i < count @AT@ 48626 @LENGTH@ 10\n" +
+                "---------UPD expr@@i <= count @TO@ i < count @AT@ 48626 @LENGTH@ 10\n" +
+                "------------UPD operator@@<= @TO@ < @AT@ 48628 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD for@@i = 1 i <= count i ++ net = tvb_get_ntohs tvb offset ti = proto_tree_add_text zip_tree tvb offset 2 \"Zone for network : %u\" net net_tree = proto_item_add_subtree ti ett_zip_network_list proto_tree_add_item net_tree hf_zip_network tvb offset 2 FALSE offset += 2 len = tvb_get_guint8 tvb offset proto_tree_add_item net_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @TO@ i = 0 i < count i ++ net = tvb_get_ntohs tvb offset ti = proto_tree_add_text zip_tree tvb offset 2 \"Zone for network : %u\" net net_tree = proto_item_add_subtree ti ett_zip_network_list proto_tree_add_item net_tree hf_zip_network tvb offset 2 FALSE offset += 2 len = tvb_get_guint8 tvb offset proto_tree_add_item net_tree hf_zip_zone_name tvb offset 1 FALSE offset += len + 1 @AT@ 50108 @LENGTH@ 375\n" +
+                "---UPD control@@i = 1 i <= count i ++ @TO@ i = 0 i < count i ++ @AT@ 50112 @LENGTH@ 21\n" +
+                "------UPD init@@i = 1 @TO@ i = 0 @AT@ 50113 @LENGTH@ 5\n" +
+                "---------UPD expr@@i = 1 @TO@ i = 0 @AT@ 50113 @LENGTH@ 5\n" +
+                "------------UPD literal:number@@1 @TO@ 0 @AT@ 50116 @LENGTH@ 1\n" +
+                "------UPD condition@@i <= count @TO@ i < count @AT@ 50119 @LENGTH@ 10\n" +
+                "---------UPD expr@@i <= count @TO@ i < count @AT@ 50119 @LENGTH@ 10\n" +
+                "------------UPD operator@@<= @TO@ < @AT@ 50121 @LENGTH@ 2\n");
     }
     @Test
     public void test_php_src_72da689_cba426() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_72da689_cba426_ext#dom#document.c");//
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @TO@ DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; default: @AT@ 38060 @LENGTH@ 298\n" +
-                "---INS default@@default: @TO@ block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @AT@ 38554 @LENGTH@ 8\n" +
-                "---INS return@@ @TO@ block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @AT@ 38565 @LENGTH@ 0\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @TO@ DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; default: @AT@ 40374 @LENGTH@ 301\n" +
-                "---INS default@@default: @TO@ block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @AT@ 40891 @LENGTH@ 8\n" +
-                "---INS return@@ @TO@ block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC if ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @AT@ 40902 @LENGTH@ 0\n");
-    }
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD switch@@type DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @TO@ type DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; default: @AT@ 38046 @LENGTH@ 300\n" +
+                "---UPD block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @TO@ DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; default: @AT@ 38060 @LENGTH@ 295\n" +
+                "------UPD block_content@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @TO@ DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; default: @AT@ 38063 @LENGTH@ 295\n" +
+                "---------INS default@@default: @TO@ block_content@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @AT@ 38554 @LENGTH@ 8\n" +
+                "---------INS return@@ @TO@ block_content@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid Schema file source\" RETURN_FALSE parser = xmlSchemaNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlSchemaNewMemParserCtxt source source_len break; @AT@ 38565 @LENGTH@ 0\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD switch@@type DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @TO@ type DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; default: @AT@ 40360 @LENGTH@ 303\n" +
+                "---UPD block@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @TO@ DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; default: @AT@ 40374 @LENGTH@ 298\n" +
+                "------UPD block_content@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @TO@ DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; default: @AT@ 40377 @LENGTH@ 298\n" +
+                "---------INS default@@default: @TO@ block_content@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @AT@ 40891 @LENGTH@ 8\n" +
+                "---------INS return@@ @TO@ block_content@@DOM_LOAD_FILE valid_file = _dom_get_valid_file_path source resolved_path MAXPATHLEN  TSRMLS_CC ! valid_file php_error E_WARNING \"Invalid RelaxNG file source\" RETURN_FALSE parser = xmlRelaxNGNewParserCtxt valid_file break; DOM_LOAD_STRING parser = xmlRelaxNGNewMemParserCtxt source source_len break; @AT@ 40902 @LENGTH@ 0\n");
+}
     @Test
     public void test_php_src_81f05c1_b1d8f1() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_81f05c1_b1d8f1_ext#mysqli#mysqli_nonapi.c");//can write test
@@ -573,20 +544,24 @@ public class TestInputCases {
         Assert.assertEquals(hierarchicalActionSets.size(),1);
         Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD decl_stmt@@static value_string_ext usb_langid_vals_ext VALUE_STRING_EXT_INIT usb_langid_vals @TO@ value_string_ext usb_langid_vals_ext VALUE_STRING_EXT_INIT usb_langid_vals @AT@ 11326 @LENGTH@ 81\n" +
                 "---UPD decl@@static value_string_ext usb_langid_vals_ext VALUE_STRING_EXT_INIT usb_langid_vals @TO@ value_string_ext usb_langid_vals_ext VALUE_STRING_EXT_INIT usb_langid_vals @AT@ 11326 @LENGTH@ 81\n" +
-                "------DEL specifier@@static @AT@ 11326 @LENGTH@ 6\n");
+                "------UPD type@@static value_string_ext @TO@ value_string_ext @AT@ 11326 @LENGTH@ 23\n" +
+                "---------DEL specifier@@static @AT@ 11326 @LENGTH@ 6\n");
     }
     @Test
     public void test_php_src_5317e8_9068c2() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_5317e8_9068c2_main#php_variables.c");//wrong
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@is_array = 0 @TO@ plain_var @AT@ 10177 @LENGTH@ 12\n" +
-                "---INS goto@@plain_var @TO@ block@@is_array = 0 @AT@ 10183 @LENGTH@ 9\n" +
-                "------INS name@@plain_var @TO@ goto@@plain_var @AT@ 10188 @LENGTH@ 9\n" +
-                "---DEL expr_stmt@@is_array = 0 @AT@ 10183 @LENGTH@ 12\n" +
-                "------DEL expr@@is_array = 0 @AT@ 10183 @LENGTH@ 12\n" +
-                "---------DEL name@@is_array @AT@ 10183 @LENGTH@ 8\n" +
-                "---------DEL operator@@= @AT@ 10192 @LENGTH@ 1\n" +
-                "---------DEL literal:number@@0 @AT@ 10194 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@* ip == 0x5b is_array = 1 * ip = 0 is_array = 0 @TO@ * ip == 0x5b is_array = 1 * ip = 0 plain_var @AT@ 10111 @LENGTH@ 47\n" +
+                "---UPD else@@is_array = 0 @TO@ plain_var @AT@ 10172 @LENGTH@ 12\n" +
+                "------UPD block@@is_array = 0 @TO@ plain_var @AT@ 10177 @LENGTH@ 12\n" +
+                "---------UPD block_content@@is_array = 0 @TO@ plain_var @AT@ 10183 @LENGTH@ 12\n" +
+                "------------INS goto@@plain_var @TO@ block_content@@is_array = 0 @AT@ 10183 @LENGTH@ 9\n" +
+                "---------------INS name@@plain_var @TO@ goto@@plain_var @AT@ 10188 @LENGTH@ 9\n" +
+                "------------DEL expr_stmt@@is_array = 0 @AT@ 10183 @LENGTH@ 12\n" +
+                "---------------DEL expr@@is_array = 0 @AT@ 10183 @LENGTH@ 12\n" +
+                "------------------DEL name@@is_array @AT@ 10183 @LENGTH@ 8\n" +
+                "------------------DEL operator@@= @AT@ 10192 @LENGTH@ 1\n" +
+                "------------------DEL literal:number@@0 @AT@ 10194 @LENGTH@ 1\n");
     }
     @Test
     public void test_cpython_09705f_db2a0f() throws IOException {
@@ -594,10 +569,10 @@ public class TestInputCases {
         Assert.assertEquals(hierarchicalActionSets.size(),2);
         Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD decl_stmt@@static char copyright [] \" SRE 2.2.1 Copyright (c) 1997-2001 by Secret Labs AB \" @TO@ static char copyright [] \" SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB \" @AT@ 2421 @LENGTH@ 80\n" +
                 "---UPD decl@@static char copyright [] \" SRE 2.2.1 Copyright (c) 1997-2001 by Secret Labs AB \" @TO@ static char copyright [] \" SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB \" @AT@ 2421 @LENGTH@ 80\n" +
-                "------UPD init@@\" SRE 2.2.1 Copyright (c) 1997-2001 by Secret Labs AB \" @TO@ \" SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB \" @AT@ 2451 @LENGTH@ 55\n" +
+                "------UPD init@@\" SRE 2.2.1 Copyright (c) 1997-2001 by Secret Labs AB \" @TO@ \" SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB \" @AT@ 2445 @LENGTH@ 55\n" +
                 "---------UPD expr@@\" SRE 2.2.1 Copyright (c) 1997-2001 by Secret Labs AB \" @TO@ \" SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB \" @AT@ 2451 @LENGTH@ 55\n" +
                 "------------UPD literal:string@@\" SRE 2.2.1 Copyright (c) 1997-2001 by Secret Labs AB \" @TO@ \" SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB \" @AT@ 2451 @LENGTH@ 55\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@return PyString_FromString \"\" @TO@ return PySequence_GetSlice pattern 0 0 @AT@ 52066 @LENGTH@ 29\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@PyString_FromString \"\" @TO@ PySequence_GetSlice pattern 0 0 @AT@ 52066 @LENGTH@ 22\n" +
                 "---UPD expr@@PyString_FromString \"\" @TO@ PySequence_GetSlice pattern 0 0 @AT@ 52073 @LENGTH@ 22\n" +
                 "------UPD call@@PyString_FromString \"\" @TO@ PySequence_GetSlice pattern 0 0 @AT@ 52073 @LENGTH@ 22\n" +
                 "---------UPD name@@PyString_FromString @TO@ PySequence_GetSlice @AT@ 52073 @LENGTH@ 19\n" +
@@ -646,14 +621,14 @@ public class TestInputCases {
         Assert.assertEquals(hierarchicalActionSets.size(),1);
         Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD decl_stmt@@chtype cch @TO@ chtype cch 0 @AT@ 20374 @LENGTH@ 10\n" +
                 "---UPD decl@@chtype cch @TO@ chtype cch 0 @AT@ 20374 @LENGTH@ 10\n" +
-                "------INS init@@0 @TO@ decl@@chtype cch @AT@ 20387 @LENGTH@ 1\n" +
+                "------INS init@@0 @TO@ decl@@chtype cch @AT@ 20385 @LENGTH@ 1\n" +
                 "---------INS expr@@0 @TO@ init@@0 @AT@ 20387 @LENGTH@ 1\n" +
                 "------------INS literal:number@@0 @TO@ expr@@0 @AT@ 20387 @LENGTH@ 1\n");
     }
     @Test
     public void test_cpython_516999_437567() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_516999_437567_Modules#posixmodule.c");//wrong
-        Assert.assertEquals(hierarchicalActionSets.size(),3);
+        Assert.assertEquals(hierarchicalActionSets.size(),1);
         Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD decl_stmt@@BOOL result @TO@ BOOL result FALSE @AT@ 42461 @LENGTH@ 11\n" +
                 "---UPD decl@@BOOL result @TO@ BOOL result FALSE @AT@ 42461 @LENGTH@ 11\n" +
                 "------INS init@@FALSE @TO@ decl@@BOOL result @AT@ 42475 @LENGTH@ 5\n" +
@@ -684,40 +659,41 @@ public class TestInputCases {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_499b55_595741_Zend#zend_execute_API.c");//wrong
 
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@const char * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val if function_name return function_name else return \"main\" @TO@ zend_string * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name if function_name return function_name -> val else return \"main\" @AT@ 11770 @LENGTH@ 184\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block_content@@const char * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val function_name function_name \"main\" @TO@ zend_string * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name function_name function_name -> val \"main\" @AT@ 11776 @LENGTH@ 162\n" +
                 "---UPD decl_stmt@@const char * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val @TO@ zend_string * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name @AT@ 11776 @LENGTH@ 127\n" +
                 "------UPD decl@@const char * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val @TO@ zend_string * function_name ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name @AT@ 11776 @LENGTH@ 127\n" +
                 "---------UPD type@@const char * @TO@ zend_string * @AT@ 11776 @LENGTH@ 12\n" +
                 "------------DEL specifier@@const @AT@ 11776 @LENGTH@ 5\n" +
                 "------------UPD name@@char @TO@ zend_string @AT@ 11782 @LENGTH@ 4\n" +
-                "---------UPD init@@( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val @TO@ ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name @AT@ 11804 @LENGTH@ 100\n" +
+                "---------UPD init@@( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val @TO@ ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name @AT@ 11802 @LENGTH@ 100\n" +
                 "------------UPD expr@@( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val @TO@ ( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name @AT@ 11804 @LENGTH@ 100\n" +
                 "---------------DEL name@@function_name -> val @AT@ 11875 @LENGTH@ 20\n" +
                 "------------------DEL name@@function_name @AT@ 11875 @LENGTH@ 13\n" +
                 "------------------DEL operator@@-> @AT@ 11888 @LENGTH@ 2\n" +
                 "------------------DEL name@@val @AT@ 11890 @LENGTH@ 3\n" +
                 "---------------INS name@@function_name @TO@ expr@@( ( zend_op_array * ) EG current_execute_data -> function_state . function ) -> function_name -> val @AT@ 11876 @LENGTH@ 13\n" +
-                "---UPD if@@if function_name return function_name else return \"main\" @TO@ if function_name return function_name -> val else return \"main\" @AT@ 11903 @LENGTH@ 56\n" +
-                "------UPD then@@return function_name @TO@ return function_name -> val @AT@ 11919 @LENGTH@ 20\n" +
-                "---------UPD block@@return function_name @TO@ return function_name -> val @AT@ 11919 @LENGTH@ 20\n" +
-                "------------UPD return@@return function_name @TO@ return function_name -> val @AT@ 11926 @LENGTH@ 20\n" +
-                "---------------UPD expr@@function_name @TO@ function_name -> val @AT@ 11933 @LENGTH@ 13\n" +
-                "------------------INS name@@function_name -> val @TO@ expr@@function_name @AT@ 11929 @LENGTH@ 20\n" +
-                "---------------------INS name@@function_name @TO@ name@@function_name -> val @AT@ 11929 @LENGTH@ 13\n" +
-                "---------------------INS operator@@-> @TO@ name@@function_name -> val @AT@ 11942 @LENGTH@ 2\n" +
-                "---------------------INS name@@val @TO@ name@@function_name -> val @AT@ 11944 @LENGTH@ 3\n" +
-                "------------------DEL name@@function_name @AT@ 11933 @LENGTH@ 13\n");
+                "---UPD if_stmt@@function_name function_name \"main\" @TO@ function_name function_name -> val \"main\" @AT@ 11900 @LENGTH@ 34\n" +
+                "------UPD if@@function_name function_name @TO@ function_name function_name -> val @AT@ 11900 @LENGTH@ 27\n" +
+                "---------UPD block@@function_name @TO@ function_name -> val @AT@ 11919 @LENGTH@ 13\n" +
+                "------------UPD block_content@@function_name @TO@ function_name -> val @AT@ 11926 @LENGTH@ 13\n" +
+                "---------------UPD return@@function_name @TO@ function_name -> val @AT@ 11926 @LENGTH@ 13\n" +
+                "------------------UPD expr@@function_name @TO@ function_name -> val @AT@ 11933 @LENGTH@ 13\n" +
+                "---------------------INS name@@function_name -> val @TO@ expr@@function_name @AT@ 11929 @LENGTH@ 20\n" +
+                "------------------------INS name@@function_name @TO@ name@@function_name -> val @AT@ 11929 @LENGTH@ 13\n" +
+                "------------------------INS operator@@-> @TO@ name@@function_name -> val @AT@ 11942 @LENGTH@ 2\n" +
+                "------------------------INS name@@val @TO@ name@@function_name -> val @AT@ 11944 @LENGTH@ 3\n" +
+                "---------------------DEL name@@function_name @AT@ 11933 @LENGTH@ 13\n");
     }
     @Test
     public void test_php_src_52ffe2_9b50cf() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_52ffe2_9b50cf_ext#fileinfo#libmagic#cdf.c");//can write test case
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@return ( size_t ) - 1 @TO@ return - 1 @AT@ 10242 @LENGTH@ 21\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@( size_t ) - 1 @TO@ - 1 @AT@ 10242 @LENGTH@ 14\n" +
                 "---UPD expr@@( size_t ) - 1 @TO@ - 1 @AT@ 10249 @LENGTH@ 14\n" +
                 "------DEL operator@@( @AT@ 10249 @LENGTH@ 1\n" +
                 "------DEL name@@size_t @AT@ 10250 @LENGTH@ 6\n" +
                 "------DEL operator@@) @AT@ 10256 @LENGTH@ 1\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@return ( size_t ) - 1 @TO@ return - 1 @AT@ 11065 @LENGTH@ 21\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@( size_t ) - 1 @TO@ - 1 @AT@ 11065 @LENGTH@ 14\n" +
                 "---UPD expr@@( size_t ) - 1 @TO@ - 1 @AT@ 11072 @LENGTH@ 14\n" +
                 "------DEL operator@@( @AT@ 11072 @LENGTH@ 1\n" +
                 "------DEL name@@size_t @AT@ 11073 @LENGTH@ 6\n" +
@@ -727,12 +703,12 @@ public class TestInputCases {
     public void test_cpython_1fc238a_a33099() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_1fc238a_a33099_Objects#dictobject.c");//can write test case
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@return NULL @TO@ return - 1 @AT@ 17150 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@NULL @TO@ - 1 @AT@ 17150 @LENGTH@ 4\n" +
                 "---UPD expr@@NULL @TO@ - 1 @AT@ 17157 @LENGTH@ 4\n" +
                 "------INS operator@@- @TO@ expr@@NULL @AT@ 17157 @LENGTH@ 1\n" +
                 "------DEL name@@NULL @AT@ 17157 @LENGTH@ 4\n" +
                 "------INS literal:number@@1 @TO@ expr@@NULL @AT@ 17158 @LENGTH@ 1\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@return NULL @TO@ return - 1 @AT@ 17461 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@NULL @TO@ - 1 @AT@ 17461 @LENGTH@ 4\n" +
                 "---UPD expr@@NULL @TO@ - 1 @AT@ 17468 @LENGTH@ 4\n" +
                 "------INS operator@@- @TO@ expr@@NULL @AT@ 17466 @LENGTH@ 1\n" +
                 "------INS literal:number@@1 @TO@ expr@@NULL @AT@ 17467 @LENGTH@ 1\n" +
@@ -742,12 +718,12 @@ public class TestInputCases {
     public void test_php_src_ea27fd_5645de() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_ea27fd_5645de_ext#fileinfo#libmagic#cdf.c");//can write test case
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@return ( size_t ) - 1 @TO@ return - 1 @AT@ 10242 @LENGTH@ 21\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@( size_t ) - 1 @TO@ - 1 @AT@ 10242 @LENGTH@ 14\n" +
                 "---UPD expr@@( size_t ) - 1 @TO@ - 1 @AT@ 10249 @LENGTH@ 14\n" +
                 "------DEL operator@@( @AT@ 10249 @LENGTH@ 1\n" +
                 "------DEL name@@size_t @AT@ 10250 @LENGTH@ 6\n" +
                 "------DEL operator@@) @AT@ 10256 @LENGTH@ 1\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@return ( size_t ) - 1 @TO@ return - 1 @AT@ 11065 @LENGTH@ 21\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@( size_t ) - 1 @TO@ - 1 @AT@ 11065 @LENGTH@ 14\n" +
                 "---UPD expr@@( size_t ) - 1 @TO@ - 1 @AT@ 11072 @LENGTH@ 14\n" +
                 "------DEL operator@@( @AT@ 11072 @LENGTH@ 1\n" +
                 "------DEL name@@size_t @AT@ 11073 @LENGTH@ 6\n" +
@@ -757,27 +733,27 @@ public class TestInputCases {
     public void test_cpython_ed6219_939667() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_ed6219_939667_Objects#abstract.c");//can write test case
         Assert.assertEquals(hierarchicalActionSets.size(),5);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@return NULL @TO@ return - 1 @AT@ 18828 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@NULL @TO@ - 1 @AT@ 18828 @LENGTH@ 4\n" +
                 "---UPD expr@@NULL @TO@ - 1 @AT@ 18835 @LENGTH@ 4\n" +
                 "------INS operator@@- @TO@ expr@@NULL @AT@ 18835 @LENGTH@ 1\n" +
                 "------DEL name@@NULL @AT@ 18835 @LENGTH@ 4\n" +
                 "------INS literal:number@@1 @TO@ expr@@NULL @AT@ 18836 @LENGTH@ 1\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@return NULL @TO@ return - 1 @AT@ 19249 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD return@@NULL @TO@ - 1 @AT@ 19249 @LENGTH@ 4\n" +
                 "---UPD expr@@NULL @TO@ - 1 @AT@ 19256 @LENGTH@ 4\n" +
                 "------INS operator@@- @TO@ expr@@NULL @AT@ 19254 @LENGTH@ 1\n" +
                 "------INS literal:number@@1 @TO@ expr@@NULL @AT@ 19255 @LENGTH@ 1\n" +
                 "------DEL name@@NULL @AT@ 19256 @LENGTH@ 4\n");
-        Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD return@@return NULL @TO@ return - 1 @AT@ 19728 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD return@@NULL @TO@ - 1 @AT@ 19728 @LENGTH@ 4\n" +
                 "---UPD expr@@NULL @TO@ - 1 @AT@ 19735 @LENGTH@ 4\n" +
                 "------INS operator@@- @TO@ expr@@NULL @AT@ 19731 @LENGTH@ 1\n" +
                 "------INS literal:number@@1 @TO@ expr@@NULL @AT@ 19732 @LENGTH@ 1\n" +
                 "------DEL name@@NULL @AT@ 19735 @LENGTH@ 4\n");
-        Assert.assertEquals(hierarchicalActionSets.get(3).toString(),"UPD return@@return NULL @TO@ return - 1 @AT@ 20231 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(3).toString(),"UPD return@@NULL @TO@ - 1 @AT@ 20231 @LENGTH@ 4\n" +
                 "---UPD expr@@NULL @TO@ - 1 @AT@ 20238 @LENGTH@ 4\n" +
                 "------INS operator@@- @TO@ expr@@NULL @AT@ 20232 @LENGTH@ 1\n" +
                 "------INS literal:number@@1 @TO@ expr@@NULL @AT@ 20233 @LENGTH@ 1\n" +
                 "------DEL name@@NULL @AT@ 20238 @LENGTH@ 4\n");
-        Assert.assertEquals(hierarchicalActionSets.get(4).toString(),"UPD return@@return NULL @TO@ return - 1 @AT@ 25175 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(4).toString(),"UPD return@@NULL @TO@ - 1 @AT@ 25175 @LENGTH@ 4\n" +
                 "---UPD expr@@NULL @TO@ - 1 @AT@ 25182 @LENGTH@ 4\n" +
                 "------INS operator@@- @TO@ expr@@NULL @AT@ 25174 @LENGTH@ 1\n" +
                 "------INS literal:number@@1 @TO@ expr@@NULL @AT@ 25175 @LENGTH@ 1\n" +
@@ -840,43 +816,44 @@ public class TestInputCases {
     @Test
     public void test_php_src_9baa92_f9c232() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_9baa92_f9c232_sapi#apache2handler#sapi_apache2.c");//wrong
-        Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD function@@static void php_apache_request_ctor request_rec * r php_struct * ctx TSRMLS_DC char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK else r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length else 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" if ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user else SG request_info . auth_user = NULL SG request_info . auth_password = NULL php_request_startup TSRMLS_C @TO@ static int php_apache_request_ctor request_rec * r php_struct * ctx TSRMLS_DC char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK else r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length else 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" if ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user else SG request_info . auth_user = NULL SG request_info . auth_password = NULL return php_request_startup TSRMLS_C @AT@ 11008 @LENGTH@ 1363\n" +
-                "---UPD type@@void @TO@ int @AT@ 11015 @LENGTH@ 4\n" +
-                "------UPD name@@void @TO@ int @AT@ 11015 @LENGTH@ 4\n" +
-                "---UPD block@@char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK else r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length else 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" if ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user else SG request_info . auth_user = NULL SG request_info . auth_password = NULL php_request_startup TSRMLS_C @TO@ char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK else r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length else 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" if ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user else SG request_info . auth_user = NULL SG request_info . auth_password = NULL return php_request_startup TSRMLS_C @AT@ 11087 @LENGTH@ 1284\n" +
-                "------INS return@@return php_request_startup TSRMLS_C @TO@ block@@char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK else r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length else 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" if ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user else SG request_info . auth_user = NULL SG request_info . auth_password = NULL php_request_startup TSRMLS_C @AT@ 12380 @LENGTH@ 35\n" +
-                "---------MOV expr@@php_request_startup TSRMLS_C @TO@ return@@return php_request_startup TSRMLS_C @AT@ 12381 @LENGTH@ 28\n" +
-                "------DEL expr_stmt@@php_request_startup TSRMLS_C @AT@ 12381 @LENGTH@ 28\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"INS if@@if php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @TO@ block@@ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC @AT@ 14608 @LENGTH@ 66\n" +
-                "---INS condition@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @TO@ if@@if php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14608 @LENGTH@ 50\n" +
-                "------MOV macro@@php_apache_request_ctor r ctx TSRMLS_CC @TO@ condition@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @AT@ 14599 @LENGTH@ 39\n" +
-                "------INS expr@@!= SUCCESS @TO@ condition@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @AT@ 14650 @LENGTH@ 10\n" +
-                "---------INS operator@@!= @TO@ expr@@!= SUCCESS @AT@ 14650 @LENGTH@ 2\n" +
-                "---------INS name@@SUCCESS @TO@ expr@@!= SUCCESS @AT@ 14652 @LENGTH@ 7\n" +
-                "---INS then@@zend_bailout @TO@ if@@if php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14661 @LENGTH@ 12\n" +
-                "------INS block@@zend_bailout @TO@ then@@zend_bailout @AT@ 14661 @LENGTH@ 12\n" +
-                "---------INS expr_stmt@@zend_bailout @TO@ block@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
-                "------------INS expr@@zend_bailout @TO@ expr_stmt@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
-                "---------------INS call@@zend_bailout @TO@ expr@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
-                "------------------INS name@@zend_bailout @TO@ call@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
-                "------------------INS argument_list@@ @TO@ call@@zend_bailout @AT@ 14678 @LENGTH@ 0\n");
+        Assert.assertEquals(hierarchicalActionSets.size(),3);
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD function@@static void php_apache_request_ctor request_rec * r php_struct * ctx TSRMLS_DC char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user SG request_info . auth_user = NULL SG request_info . auth_password = NULL php_request_startup TSRMLS_C @TO@ static int php_apache_request_ctor request_rec * r php_struct * ctx TSRMLS_DC char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user SG request_info . auth_user = NULL SG request_info . auth_password = NULL php_request_startup TSRMLS_C @AT@ 11008 @LENGTH@ 1345\n" +
+                "---UPD type@@static void @TO@ static int @AT@ 11008 @LENGTH@ 11\n" +
+                "------UPD name@@void @TO@ int @AT@ 11015 @LENGTH@ 4\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"INS return@@php_request_startup TSRMLS_C @TO@ block_content@@char * content_type char * content_length const char * auth SG sapi_headers . http_response_code = ! r -> status HTTP_OK r -> status SG request_info . content_type = apr_table_get r -> headers_in \"Content-Type\" SG request_info . query_string = apr_pstrdup r -> pool r -> args SG request_info . request_method = r -> method SG request_info . request_uri = apr_pstrdup r -> pool r -> uri SG request_info . path_translated = apr_pstrdup r -> pool r -> filename r -> no_local_copy = 1 content_type = sapi_get_default_content_type TSRMLS_C ap_set_content_type r apr_pstrdup r -> pool content_type efree content_type content_length = ( char * ) apr_table_get r -> headers_in \"Content-Length\" SG request_info . content_length = ( content_length atoi content_length 0 ) apr_table_unset r -> headers_out \"Content-Length\" apr_table_unset r -> headers_out \"Last-Modified\" apr_table_unset r -> headers_out \"Expires\" apr_table_unset r -> headers_out \"ETag\" ! PG safe_mode || ( PG safe_mode && ! ap_auth_type r ) auth = apr_table_get r -> headers_in \"Authorization\" php_handle_auth_data auth TSRMLS_CC ctx -> r -> user = apr_pstrdup ctx -> r -> pool SG request_info . auth_user SG request_info . auth_user = NULL SG request_info . auth_password = NULL php_request_startup TSRMLS_C @AT@ 12380 @LENGTH@ 28\n" +
+                "---MOV expr@@php_request_startup TSRMLS_C @TO@ return@@php_request_startup TSRMLS_C @AT@ 12381 @LENGTH@ 28\n");
+        Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD if_stmt@@ctx == NULL ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC parent_req = ctx -> r ctx -> r = r brigade = ctx -> brigade @TO@ ctx == NULL ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout parent_req = ctx -> r ctx -> r = r brigade = ctx -> brigade @AT@ 14086 @LENGTH@ 390\n" +
+                "---UPD if@@ctx == NULL ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC @TO@ ctx == NULL ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14086 @LENGTH@ 330\n" +
+                "------UPD block@@ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC @TO@ ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14103 @LENGTH@ 318\n" +
+                "---------UPD block_content@@ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC @TO@ ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14107 @LENGTH@ 318\n" +
+                "------------INS if_stmt@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @TO@ block_content@@ctx = SG server_context = apr_pcalloc r -> pool * ctx apr_pool_cleanup_register r -> pool ( void * ) & SG server_context php_server_context_cleanup apr_pool_cleanup_null ctx -> r = r brigade = apr_brigade_create r -> pool r -> connection -> bucket_alloc ctx -> brigade = brigade php_apache_request_ctor r ctx TSRMLS_CC @AT@ 14605 @LENGTH@ 63\n" +
+                "---------------INS if@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @TO@ if_stmt@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14605 @LENGTH@ 63\n" +
+                "------------------INS condition@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @TO@ if@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14608 @LENGTH@ 50\n" +
+                "---------------------INS expr@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @TO@ condition@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @AT@ 14609 @LENGTH@ 50\n" +
+                "------------------------MOV macro@@php_apache_request_ctor r ctx TSRMLS_CC @TO@ expr@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @AT@ 14599 @LENGTH@ 39\n" +
+                "------------------------INS operator@@!= @TO@ expr@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @AT@ 14650 @LENGTH@ 2\n" +
+                "------------------------INS name@@SUCCESS @TO@ expr@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS @AT@ 14652 @LENGTH@ 7\n" +
+                "------------------INS block@@zend_bailout @TO@ if@@php_apache_request_ctor r ctx TSRMLS_CC != SUCCESS zend_bailout @AT@ 14661 @LENGTH@ 12\n" +
+                "---------------------INS block_content@@zend_bailout @TO@ block@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
+                "------------------------INS expr_stmt@@zend_bailout @TO@ block_content@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
+                "---------------------------INS expr@@zend_bailout @TO@ expr_stmt@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
+                "------------------------------INS call@@zend_bailout @TO@ expr@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
+                "---------------------------------INS name@@zend_bailout @TO@ call@@zend_bailout @AT@ 14666 @LENGTH@ 12\n" +
+                "---------------------------------INS argument_list@@ @TO@ call@@zend_bailout @AT@ 14678 @LENGTH@ 0\n");
     }
     @Test
     public void test_cpython_719f5f_dcc6ef() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_719f5f_dcc6ef_Objects#intobject.c");//wrong
 
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@long d long m if i_divmod x y & d & m < 0 return NULL newintobject m @TO@ long d long m if i_divmod x y & d & m < 0 return NULL return newintobject m @AT@ 4993 @LENGTH@ 68\n" +
-                "---DEL expr_stmt@@newintobject m @AT@ 5056 @LENGTH@ 14\n" +
-                "---INS return@@return newintobject m @TO@ block@@long d long m if i_divmod x y & d & m < 0 return NULL newintobject m @AT@ 5112 @LENGTH@ 21\n" +
-                "------MOV expr@@newintobject m @TO@ return@@return newintobject m @AT@ 5056 @LENGTH@ 14\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS return@@newintobject m @TO@ block_content@@long d m i_divmod x y & d & m < 0 NULL newintobject m @AT@ 5112 @LENGTH@ 14\n" +
+                "---MOV expr@@newintobject m @TO@ return@@newintobject m @AT@ 5056 @LENGTH@ 14\n");
     }
     @Test
     public void test_php_src_b88698_34b3dc() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_b88698_34b3dc_ext#standard#reg.c");//wrong
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@return ( char * ) string @TO@ return estrndup \"\" 0 @AT@ 9219 @LENGTH@ 24\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@( char * ) string @TO@ estrndup \"\" 0 @AT@ 9219 @LENGTH@ 17\n" +
                 "---UPD expr@@( char * ) string @TO@ estrndup \"\" 0 @AT@ 9226 @LENGTH@ 17\n" +
                 "------INS call@@estrndup \"\" 0 @TO@ expr@@( char * ) string @AT@ 9226 @LENGTH@ 13\n" +
                 "---------INS name@@estrndup @TO@ call@@estrndup \"\" 0 @AT@ 9226 @LENGTH@ 8\n" +
@@ -898,7 +875,7 @@ public class TestInputCases {
     public void test_php_src_395434_d3a0db() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_395434_d3a0db_ext#date#lib#parse_tz.c");//write test case
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@return t -> z * 60 @TO@ return ( t -> z + t -> dst ) * - 60 @AT@ 10151 @LENGTH@ 18\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD return@@t -> z * 60 @TO@ ( t -> z + t -> dst ) * - 60 @AT@ 10151 @LENGTH@ 11\n" +
                 "---UPD expr@@t -> z * 60 @TO@ ( t -> z + t -> dst ) * - 60 @AT@ 10158 @LENGTH@ 11\n" +
                 "------INS operator@@( @TO@ expr@@t -> z * 60 @AT@ 10158 @LENGTH@ 1\n" +
                 "------INS operator@@+ @TO@ expr@@t -> z * 60 @AT@ 10164 @LENGTH@ 1\n" +
@@ -913,10 +890,8 @@ public class TestInputCases {
     public void test_cpython_0aed3a4_404cdc() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_0aed3a4_404cdc_Objects#obmalloc.c");//write test case
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@_PyMem_DebugCheckGIL return _PyMem_DebugRawFree ctx ptr @TO@ _PyMem_DebugCheckGIL _PyMem_DebugRawFree ctx ptr @AT@ 70812 @LENGTH@ 55\n" +
-                "---INS expr_stmt@@_PyMem_DebugRawFree ctx ptr @TO@ block@@_PyMem_DebugCheckGIL return _PyMem_DebugRawFree ctx ptr @AT@ 70846 @LENGTH@ 27\n" +
-                "------MOV expr@@_PyMem_DebugRawFree ctx ptr @TO@ expr_stmt@@_PyMem_DebugRawFree ctx ptr @AT@ 70853 @LENGTH@ 27\n" +
-                "---DEL return@@return _PyMem_DebugRawFree ctx ptr @AT@ 70846 @LENGTH@ 34\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS expr_stmt@@_PyMem_DebugRawFree ctx ptr @TO@ block_content@@_PyMem_DebugCheckGIL _PyMem_DebugRawFree ctx ptr @AT@ 70846 @LENGTH@ 27\n" +
+                "---MOV expr@@_PyMem_DebugRawFree ctx ptr @TO@ expr_stmt@@_PyMem_DebugRawFree ctx ptr @AT@ 70853 @LENGTH@ 27\n");
     }
 
     @Test
@@ -925,7 +900,7 @@ public class TestInputCases {
         Assert.assertEquals(hierarchicalActionSets.size(), 4);
         Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD decl_stmt@@UINT result ( UINT ) _read hf memory cb @TO@ UINT result ( UINT ) _read ( int ) hf memory cb @AT@ 1430 @LENGTH@ 39\n" +
                 "---UPD decl@@UINT result ( UINT ) _read hf memory cb @TO@ UINT result ( UINT ) _read ( int ) hf memory cb @AT@ 1430 @LENGTH@ 39\n" +
-                "------UPD init@@( UINT ) _read hf memory cb @TO@ ( UINT ) _read ( int ) hf memory cb @AT@ 1444 @LENGTH@ 27\n" +
+                "------UPD init@@( UINT ) _read hf memory cb @TO@ ( UINT ) _read ( int ) hf memory cb @AT@ 1442 @LENGTH@ 27\n" +
                 "---------UPD expr@@( UINT ) _read hf memory cb @TO@ ( UINT ) _read ( int ) hf memory cb @AT@ 1444 @LENGTH@ 27\n" +
                 "------------UPD call@@_read hf memory cb @TO@ _read ( int ) hf memory cb @AT@ 1450 @LENGTH@ 18\n" +
                 "---------------UPD argument_list@@hf memory cb @TO@ ( int ) hf memory cb @AT@ 1455 @LENGTH@ 12\n" +
@@ -934,9 +909,9 @@ public class TestInputCases {
                 "------------------------INS operator@@( @TO@ expr@@hf @AT@ 1456 @LENGTH@ 1\n" +
                 "------------------------INS name@@int @TO@ expr@@hf @AT@ 1457 @LENGTH@ 3\n" +
                 "------------------------INS operator@@) @TO@ expr@@hf @AT@ 1460 @LENGTH@ 1\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD expr_stmt@@static FNFCIWRITE cb_write UINT result = ( UINT ) _write hf memory cb if result != cb * err = errno @TO@ static FNFCIWRITE cb_write UINT result = ( UINT ) _write ( int ) hf memory cb if result != cb * err = errno @AT@ 1539 @LENGTH@ 99\n" +
-                "---UPD expr@@static FNFCIWRITE cb_write UINT result = ( UINT ) _write hf memory cb if result != cb * err = errno @TO@ static FNFCIWRITE cb_write UINT result = ( UINT ) _write ( int ) hf memory cb if result != cb * err = errno @AT@ 1539 @LENGTH@ 99\n" +
-                "------UPD block@@UINT result = ( UINT ) _write hf memory cb if result != cb * err = errno @TO@ UINT result = ( UINT ) _write ( int ) hf memory cb if result != cb * err = errno @AT@ 1573 @LENGTH@ 72\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD expr_stmt@@static FNFCIWRITE cb_write UINT result = ( UINT ) _write hf memory cb result != cb * err = errno @TO@ static FNFCIWRITE cb_write UINT result = ( UINT ) _write ( int ) hf memory cb result != cb * err = errno @AT@ 1539 @LENGTH@ 96\n" +
+                "---UPD expr@@static FNFCIWRITE cb_write UINT result = ( UINT ) _write hf memory cb result != cb * err = errno @TO@ static FNFCIWRITE cb_write UINT result = ( UINT ) _write ( int ) hf memory cb result != cb * err = errno @AT@ 1539 @LENGTH@ 96\n" +
+                "------UPD block@@UINT result = ( UINT ) _write hf memory cb result != cb * err = errno @TO@ UINT result = ( UINT ) _write ( int ) hf memory cb result != cb * err = errno @AT@ 1567 @LENGTH@ 69\n" +
                 "---------UPD expr@@UINT result = ( UINT ) _write hf memory cb @TO@ UINT result = ( UINT ) _write ( int ) hf memory cb @AT@ 1573 @LENGTH@ 42\n" +
                 "------------UPD call@@_write hf memory cb @TO@ _write ( int ) hf memory cb @AT@ 1593 @LENGTH@ 19\n" +
                 "---------------UPD argument_list@@hf memory cb @TO@ ( int ) hf memory cb @AT@ 1599 @LENGTH@ 12\n" +
@@ -947,7 +922,7 @@ public class TestInputCases {
                 "------------------------INS operator@@) @TO@ expr@@hf @AT@ 1609 @LENGTH@ 1\n");
         Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"UPD decl_stmt@@int result _close hf @TO@ int result _close ( int ) hf @AT@ 1717 @LENGTH@ 20\n" +
                 "---UPD decl@@int result _close hf @TO@ int result _close ( int ) hf @AT@ 1717 @LENGTH@ 20\n" +
-                "------UPD init@@_close hf @TO@ _close ( int ) hf @AT@ 1730 @LENGTH@ 9\n" +
+                "------UPD init@@_close hf @TO@ _close ( int ) hf @AT@ 1728 @LENGTH@ 9\n" +
                 "---------UPD expr@@_close hf @TO@ _close ( int ) hf @AT@ 1730 @LENGTH@ 9\n" +
                 "------------UPD call@@_close hf @TO@ _close ( int ) hf @AT@ 1730 @LENGTH@ 9\n" +
                 "---------------UPD argument_list@@hf @TO@ ( int ) hf @AT@ 1736 @LENGTH@ 2\n" +
@@ -956,9 +931,9 @@ public class TestInputCases {
                 "------------------------INS operator@@( @TO@ expr@@hf @AT@ 1747 @LENGTH@ 1\n" +
                 "------------------------INS name@@int @TO@ expr@@hf @AT@ 1748 @LENGTH@ 3\n" +
                 "------------------------INS operator@@) @TO@ expr@@hf @AT@ 1751 @LENGTH@ 1\n");
-        Assert.assertEquals(hierarchicalActionSets.get(3).toString(),"UPD expr_stmt@@static FNFCISEEK cb_seek long result = ( long ) _lseek hf dist seektype if result == - 1 * err = errno @TO@ static FNFCISEEK cb_seek long result = ( long ) _lseek ( int ) hf dist seektype if result == - 1 * err = errno @AT@ 1807 @LENGTH@ 102\n" +
-                "---UPD expr@@static FNFCISEEK cb_seek long result = ( long ) _lseek hf dist seektype if result == - 1 * err = errno @TO@ static FNFCISEEK cb_seek long result = ( long ) _lseek ( int ) hf dist seektype if result == - 1 * err = errno @AT@ 1807 @LENGTH@ 102\n" +
-                "------UPD block@@long result = ( long ) _lseek hf dist seektype if result == - 1 * err = errno @TO@ long result = ( long ) _lseek ( int ) hf dist seektype if result == - 1 * err = errno @AT@ 1839 @LENGTH@ 77\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(3).toString(),"UPD expr_stmt@@static FNFCISEEK cb_seek long result = ( long ) _lseek hf dist seektype result == - 1 * err = errno @TO@ static FNFCISEEK cb_seek long result = ( long ) _lseek ( int ) hf dist seektype result == - 1 * err = errno @AT@ 1807 @LENGTH@ 99\n" +
+                "---UPD expr@@static FNFCISEEK cb_seek long result = ( long ) _lseek hf dist seektype result == - 1 * err = errno @TO@ static FNFCISEEK cb_seek long result = ( long ) _lseek ( int ) hf dist seektype result == - 1 * err = errno @AT@ 1807 @LENGTH@ 99\n" +
+                "------UPD block@@long result = ( long ) _lseek hf dist seektype result == - 1 * err = errno @TO@ long result = ( long ) _lseek ( int ) hf dist seektype result == - 1 * err = errno @AT@ 1833 @LENGTH@ 74\n" +
                 "---------UPD expr@@long result = ( long ) _lseek hf dist seektype @TO@ long result = ( long ) _lseek ( int ) hf dist seektype @AT@ 1839 @LENGTH@ 46\n" +
                 "------------UPD call@@_lseek hf dist seektype @TO@ _lseek ( int ) hf dist seektype @AT@ 1859 @LENGTH@ 23\n" +
                 "---------------UPD argument_list@@hf dist seektype @TO@ ( int ) hf dist seektype @AT@ 1865 @LENGTH@ 16\n" +
@@ -974,138 +949,149 @@ public class TestInputCases {
     public void test_php_src_820983_90ee88() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_820983_90ee88_ext#standard#html.c");//
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS else@@else if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @TO@ if@@if ( code >= 0x80 && code < 0xa0 ) || code > 0xff invalid_code = 1 else * ( q ++ ) = code @AT@ 31567 @LENGTH@ 75\n" +
-                "---INS block@@if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @TO@ else@@else if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @AT@ 31567 @LENGTH@ 70\n" +
-                "------INS if@@if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @TO@ block@@if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @AT@ 31581 @LENGTH@ 70\n" +
-                "---------MOV else@@else * ( q ++ ) = code @TO@ if@@if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @AT@ 31567 @LENGTH@ 22\n" +
-                "---------INS condition@@code == 39 || ! quote_style @TO@ if@@if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @AT@ 31581 @LENGTH@ 27\n" +
-                "------------INS expr@@code == 39 || ! quote_style @TO@ condition@@code == 39 || ! quote_style @AT@ 31582 @LENGTH@ 27\n" +
-                "---------------INS name@@code @TO@ expr@@code == 39 || ! quote_style @AT@ 31582 @LENGTH@ 4\n" +
-                "---------------INS operator@@== @TO@ expr@@code == 39 || ! quote_style @AT@ 31587 @LENGTH@ 2\n" +
-                "---------------INS literal:number@@39 @TO@ expr@@code == 39 || ! quote_style @AT@ 31590 @LENGTH@ 2\n" +
-                "---------------INS operator@@|| @TO@ expr@@code == 39 || ! quote_style @AT@ 31593 @LENGTH@ 2\n" +
-                "---------------INS operator@@! @TO@ expr@@code == 39 || ! quote_style @AT@ 31596 @LENGTH@ 1\n" +
-                "---------------INS name@@quote_style @TO@ expr@@code == 39 || ! quote_style @AT@ 31597 @LENGTH@ 11\n" +
-                "---------INS then@@invalid_code = 1 @TO@ if@@if code == 39 || ! quote_style invalid_code = 1 else * ( q ++ ) = code @AT@ 31610 @LENGTH@ 16\n" +
-                "------------INS block@@invalid_code = 1 @TO@ then@@invalid_code = 1 @AT@ 31610 @LENGTH@ 16\n" +
-                "---------------INS expr_stmt@@invalid_code = 1 @TO@ block@@invalid_code = 1 @AT@ 31622 @LENGTH@ 16\n" +
-                "------------------INS expr@@invalid_code = 1 @TO@ expr_stmt@@invalid_code = 1 @AT@ 31622 @LENGTH@ 16\n" +
-                "---------------------INS name@@invalid_code @TO@ expr@@invalid_code = 1 @AT@ 31622 @LENGTH@ 12\n" +
-                "---------------------INS operator@@= @TO@ expr@@invalid_code = 1 @AT@ 31635 @LENGTH@ 1\n" +
-                "---------------------INS literal:number@@1 @TO@ expr@@invalid_code = 1 @AT@ 31637 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@( code >= 0x80 && code < 0xa0 ) || code > 0xff invalid_code = 1 * ( q ++ ) = code @TO@ ( code >= 0x80 && code < 0xa0 ) || code > 0xff invalid_code = 1 code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @AT@ 31473 @LENGTH@ 81\n" +
+                "---INS else@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @TO@ if_stmt@@( code >= 0x80 && code < 0xa0 ) || code > 0xff invalid_code = 1 * ( q ++ ) = code @AT@ 31562 @LENGTH@ 62\n" +
+                "------INS block@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @TO@ else@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @AT@ 31567 @LENGTH@ 62\n" +
+                "---------INS block_content@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @TO@ block@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @AT@ 31578 @LENGTH@ 62\n" +
+                "------------INS if_stmt@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @TO@ block_content@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @AT@ 31578 @LENGTH@ 62\n" +
+                "---------------MOV else@@* ( q ++ ) = code @TO@ if_stmt@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @AT@ 31562 @LENGTH@ 17\n" +
+                "---------------INS if@@code == 39 || ! quote_style invalid_code = 1 @TO@ if_stmt@@code == 39 || ! quote_style invalid_code = 1 * ( q ++ ) = code @AT@ 31578 @LENGTH@ 44\n" +
+                "------------------INS condition@@code == 39 || ! quote_style @TO@ if@@code == 39 || ! quote_style invalid_code = 1 @AT@ 31581 @LENGTH@ 27\n" +
+                "---------------------INS expr@@code == 39 || ! quote_style @TO@ condition@@code == 39 || ! quote_style @AT@ 31582 @LENGTH@ 27\n" +
+                "------------------------INS name@@code @TO@ expr@@code == 39 || ! quote_style @AT@ 31582 @LENGTH@ 4\n" +
+                "------------------------INS operator@@== @TO@ expr@@code == 39 || ! quote_style @AT@ 31587 @LENGTH@ 2\n" +
+                "------------------------INS literal:number@@39 @TO@ expr@@code == 39 || ! quote_style @AT@ 31590 @LENGTH@ 2\n" +
+                "------------------------INS operator@@|| @TO@ expr@@code == 39 || ! quote_style @AT@ 31593 @LENGTH@ 2\n" +
+                "------------------------INS operator@@! @TO@ expr@@code == 39 || ! quote_style @AT@ 31596 @LENGTH@ 1\n" +
+                "------------------------INS name@@quote_style @TO@ expr@@code == 39 || ! quote_style @AT@ 31597 @LENGTH@ 11\n" +
+                "------------------INS block@@invalid_code = 1 @TO@ if@@code == 39 || ! quote_style invalid_code = 1 @AT@ 31610 @LENGTH@ 16\n" +
+                "---------------------INS block_content@@invalid_code = 1 @TO@ block@@invalid_code = 1 @AT@ 31622 @LENGTH@ 16\n" +
+                "------------------------INS expr_stmt@@invalid_code = 1 @TO@ block_content@@invalid_code = 1 @AT@ 31622 @LENGTH@ 16\n" +
+                "---------------------------INS expr@@invalid_code = 1 @TO@ expr_stmt@@invalid_code = 1 @AT@ 31622 @LENGTH@ 16\n" +
+                "------------------------------INS name@@invalid_code @TO@ expr@@invalid_code = 1 @AT@ 31622 @LENGTH@ 12\n" +
+                "------------------------------INS operator@@= @TO@ expr@@invalid_code = 1 @AT@ 31635 @LENGTH@ 1\n" +
+                "------------------------------INS literal:number@@1 @TO@ expr@@invalid_code = 1 @AT@ 31637 @LENGTH@ 1\n");
     }
     @Test
     public void test_wireshark_c3a535_1153ff() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("wireshark_c3a535_1153ff_print.c");//
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS else@@else fputs \"</field>\\n\" pdata -> fh @TO@ if@@if fi -> hfinfo -> id != proto_data if fi -> hfinfo -> type == FT_PROTOCOL fputs \"</proto>\\n\" pdata -> fh else fputs \"</field>\\n\" pdata -> fh @AT@ 13991 @LENGTH@ 35\n" +
-                "---INS block@@fputs \"</field>\\n\" pdata -> fh @TO@ else@@else fputs \"</field>\\n\" pdata -> fh @AT@ 13991 @LENGTH@ 30\n" +
-                "------INS expr_stmt@@fputs \"</field>\\n\" pdata -> fh @TO@ block@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 30\n" +
-                "---------INS expr@@fputs \"</field>\\n\" pdata -> fh @TO@ expr_stmt@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 30\n" +
-                "------------INS call@@fputs \"</field>\\n\" pdata -> fh @TO@ expr@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 30\n" +
-                "---------------INS name@@fputs @TO@ call@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 5\n" +
-                "---------------INS argument_list@@\"</field>\\n\" pdata -> fh @TO@ call@@fputs \"</field>\\n\" pdata -> fh @AT@ 14001 @LENGTH@ 24\n" +
-                "------------------INS argument@@\"</field>\\n\" @TO@ argument_list@@\"</field>\\n\" pdata -> fh @AT@ 14002 @LENGTH@ 12\n" +
-                "---------------------INS expr@@\"</field>\\n\" @TO@ argument@@\"</field>\\n\" @AT@ 14002 @LENGTH@ 12\n" +
-                "------------------------INS literal:string@@\"</field>\\n\" @TO@ expr@@\"</field>\\n\" @AT@ 14002 @LENGTH@ 12\n" +
-                "------------------INS argument@@pdata -> fh @TO@ argument_list@@\"</field>\\n\" pdata -> fh @AT@ 14016 @LENGTH@ 11\n" +
-                "---------------------INS expr@@pdata -> fh @TO@ argument@@pdata -> fh @AT@ 14016 @LENGTH@ 11\n" +
-                "------------------------INS name@@pdata -> fh @TO@ expr@@pdata -> fh @AT@ 14016 @LENGTH@ 11\n" +
-                "---------------------------INS name@@pdata @TO@ name@@pdata -> fh @AT@ 14016 @LENGTH@ 5\n" +
-                "---------------------------INS operator@@-> @TO@ name@@pdata -> fh @AT@ 14021 @LENGTH@ 2\n" +
-                "---------------------------INS name@@fh @TO@ name@@pdata -> fh @AT@ 14023 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@fi -> hfinfo -> id != proto_data fi -> hfinfo -> type == FT_PROTOCOL fputs \"</proto>\\n\" pdata -> fh fputs \"</field>\\n\" pdata -> fh @TO@ fi -> hfinfo -> id != proto_data fi -> hfinfo -> type == FT_PROTOCOL fputs \"</proto>\\n\" pdata -> fh fputs \"</field>\\n\" pdata -> fh fputs \"</field>\\n\" pdata -> fh @AT@ 13773 @LENGTH@ 130\n" +
+                "---INS else@@fputs \"</field>\\n\" pdata -> fh @TO@ if_stmt@@fi -> hfinfo -> id != proto_data fi -> hfinfo -> type == FT_PROTOCOL fputs \"</proto>\\n\" pdata -> fh fputs \"</field>\\n\" pdata -> fh @AT@ 13986 @LENGTH@ 30\n" +
+                "------INS block@@fputs \"</field>\\n\" pdata -> fh @TO@ else@@fputs \"</field>\\n\" pdata -> fh @AT@ 13991 @LENGTH@ 30\n" +
+                "---------INS block_content@@fputs \"</field>\\n\" pdata -> fh @TO@ block@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 30\n" +
+                "------------INS expr_stmt@@fputs \"</field>\\n\" pdata -> fh @TO@ block_content@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 30\n" +
+                "---------------INS expr@@fputs \"</field>\\n\" pdata -> fh @TO@ expr_stmt@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 30\n" +
+                "------------------INS call@@fputs \"</field>\\n\" pdata -> fh @TO@ expr@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 30\n" +
+                "---------------------INS name@@fputs @TO@ call@@fputs \"</field>\\n\" pdata -> fh @AT@ 13996 @LENGTH@ 5\n" +
+                "---------------------INS argument_list@@\"</field>\\n\" pdata -> fh @TO@ call@@fputs \"</field>\\n\" pdata -> fh @AT@ 14001 @LENGTH@ 24\n" +
+                "------------------------INS argument@@\"</field>\\n\" @TO@ argument_list@@\"</field>\\n\" pdata -> fh @AT@ 14002 @LENGTH@ 12\n" +
+                "---------------------------INS expr@@\"</field>\\n\" @TO@ argument@@\"</field>\\n\" @AT@ 14002 @LENGTH@ 12\n" +
+                "------------------------------INS literal:string@@\"</field>\\n\" @TO@ expr@@\"</field>\\n\" @AT@ 14002 @LENGTH@ 12\n" +
+                "------------------------INS argument@@pdata -> fh @TO@ argument_list@@\"</field>\\n\" pdata -> fh @AT@ 14016 @LENGTH@ 11\n" +
+                "---------------------------INS expr@@pdata -> fh @TO@ argument@@pdata -> fh @AT@ 14016 @LENGTH@ 11\n" +
+                "------------------------------INS name@@pdata -> fh @TO@ expr@@pdata -> fh @AT@ 14016 @LENGTH@ 11\n" +
+                "---------------------------------INS name@@pdata @TO@ name@@pdata -> fh @AT@ 14016 @LENGTH@ 5\n" +
+                "---------------------------------INS operator@@-> @TO@ name@@pdata -> fh @AT@ 14021 @LENGTH@ 2\n" +
+                "---------------------------------INS name@@fh @TO@ name@@pdata -> fh @AT@ 14023 @LENGTH@ 2\n");
     }
     @Test
     public void test_php_src_a10e77_634012() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_a10e77_634012_ext#phar#tar.c");//
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS if@@if entry . filename_len == UINT_MAX if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @TO@ block@@last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len if read != entry . filename_len efree entry . filename if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR if ( uint ) php_stream_tell fp > totalsize efree entry . filename if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE read = php_stream_read fp buf sizeof buf if read != sizeof buf efree entry . filename if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE continue; @AT@ 11511 @LENGTH@ 211\n" +
-                "---INS condition@@entry . filename_len == UINT_MAX @TO@ if@@if entry . filename_len == UINT_MAX if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @AT@ 11511 @LENGTH@ 32\n" +
-                "------INS expr@@entry . filename_len == UINT_MAX @TO@ condition@@entry . filename_len == UINT_MAX @AT@ 11512 @LENGTH@ 32\n" +
-                "---------INS name@@entry . filename_len @TO@ expr@@entry . filename_len == UINT_MAX @AT@ 11512 @LENGTH@ 20\n" +
-                "------------INS name@@entry @TO@ name@@entry . filename_len @AT@ 11512 @LENGTH@ 5\n" +
-                "------------INS operator@@. @TO@ name@@entry . filename_len @AT@ 11517 @LENGTH@ 1\n" +
-                "------------INS name@@filename_len @TO@ name@@entry . filename_len @AT@ 11518 @LENGTH@ 12\n" +
-                "---------INS operator@@== @TO@ expr@@entry . filename_len == UINT_MAX @AT@ 11531 @LENGTH@ 2\n" +
-                "---------INS name@@UINT_MAX @TO@ expr@@entry . filename_len == UINT_MAX @AT@ 11534 @LENGTH@ 8\n" +
-                "---INS then@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @TO@ if@@if entry . filename_len == UINT_MAX if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @AT@ 11544 @LENGTH@ 175\n" +
-                "------INS block@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @TO@ then@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @AT@ 11544 @LENGTH@ 175\n" +
-                "---------INS if@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ block@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @AT@ 11553 @LENGTH@ 100\n" +
-                "------------INS condition@@error @TO@ if@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11553 @LENGTH@ 5\n" +
-                "---------------INS expr@@error @TO@ condition@@error @AT@ 11554 @LENGTH@ 5\n" +
-                "------------------INS name@@error @TO@ expr@@error @AT@ 11554 @LENGTH@ 5\n" +
-                "------------INS then@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ if@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11561 @LENGTH@ 91\n" +
-                "---------------INS block@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ then@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11561 @LENGTH@ 91\n" +
-                "------------------INS expr_stmt@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ block@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 91\n" +
-                "---------------------INS expr@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ expr_stmt@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 91\n" +
-                "------------------------INS call@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ expr@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 91\n" +
-                "---------------------------INS name@@spprintf @TO@ call@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 8\n" +
-                "---------------------------INS argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ call@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11576 @LENGTH@ 82\n" +
-                "------------------------------INS argument@@error @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11577 @LENGTH@ 5\n" +
-                "---------------------------------INS expr@@error @TO@ argument@@error @AT@ 11577 @LENGTH@ 5\n" +
-                "------------------------------------INS name@@error @TO@ expr@@error @AT@ 11577 @LENGTH@ 5\n" +
-                "------------------------------INS argument@@4096 @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11584 @LENGTH@ 4\n" +
-                "---------------------------------INS expr@@4096 @TO@ argument@@4096 @AT@ 11584 @LENGTH@ 4\n" +
-                "------------------------------------INS literal:number@@4096 @TO@ expr@@4096 @AT@ 11584 @LENGTH@ 4\n" +
-                "------------------------------INS argument@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11590 @LENGTH@ 65\n" +
-                "---------------------------------INS expr@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @TO@ argument@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @AT@ 11590 @LENGTH@ 65\n" +
-                "------------------------------------INS literal:string@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @TO@ expr@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @AT@ 11590 @LENGTH@ 65\n" +
-                "------------------------------INS argument@@fname @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11657 @LENGTH@ 5\n" +
-                "---------------------------------INS expr@@fname @TO@ argument@@fname @AT@ 11657 @LENGTH@ 5\n" +
-                "------------------------------------INS name@@fname @TO@ expr@@fname @AT@ 11657 @LENGTH@ 5\n" +
-                "---------INS expr_stmt@@php_stream_close fp @TO@ block@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @AT@ 11675 @LENGTH@ 19\n" +
-                "------------INS expr@@php_stream_close fp @TO@ expr_stmt@@php_stream_close fp @AT@ 11675 @LENGTH@ 19\n" +
-                "---------------INS call@@php_stream_close fp @TO@ expr@@php_stream_close fp @AT@ 11675 @LENGTH@ 19\n" +
-                "------------------INS name@@php_stream_close @TO@ call@@php_stream_close fp @AT@ 11675 @LENGTH@ 16\n" +
-                "------------------INS argument_list@@fp @TO@ call@@php_stream_close fp @AT@ 11691 @LENGTH@ 2\n" +
-                "---------------------INS argument@@fp @TO@ argument_list@@fp @AT@ 11692 @LENGTH@ 2\n" +
-                "------------------------INS expr@@fp @TO@ argument@@fp @AT@ 11692 @LENGTH@ 2\n" +
-                "---------------------------INS name@@fp @TO@ expr@@fp @AT@ 11692 @LENGTH@ 2\n" +
-                "---------INS macro@@phar_destroy_phar_data myphar TSRMLS_CC @TO@ block@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @AT@ 11701 @LENGTH@ 39\n" +
-                "------------INS name@@phar_destroy_phar_data @TO@ macro@@phar_destroy_phar_data myphar TSRMLS_CC @AT@ 11701 @LENGTH@ 22\n" +
-                "------------INS argument_list@@myphar TSRMLS_CC @TO@ macro@@phar_destroy_phar_data myphar TSRMLS_CC @AT@ 11723 @LENGTH@ 16\n" +
-                "---------------INS argument@@myphar TSRMLS_CC @TO@ argument_list@@myphar TSRMLS_CC @AT@ 11724 @LENGTH@ 16\n" +
-                "---------INS return@@return FAILURE @TO@ block@@if error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC return FAILURE @AT@ 11747 @LENGTH@ 14\n" +
-                "------------INS expr@@FAILURE @TO@ return@@return FAILURE @AT@ 11754 @LENGTH@ 7\n" +
-                "---------------INS name@@FAILURE @TO@ expr@@FAILURE @AT@ 11754 @LENGTH@ 7\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@! last_was_longlink && hdr -> typeflag == 'L' last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; ! last_was_longlink && ! old && hdr -> prefix ][0 != 0 char name ][256 int i j i = 0 i < 155 i ++ name ][i = hdr -> prefix ][i name ][i == '\\0' break; name ][i ++ = '/' j = 0 j < 100 j ++ name ][i + j = hdr -> name ][j name ][i + j == '\\0' break; entry . filename_len = i + j name ][entry . filename_len - 1 == '/' entry . filename_len -- entry . filename = pestrndup name entry . filename_len myphar -> is_persistent ! last_was_longlink int i i = 0 i < 100 i ++ hdr -> name ][i == '\\0' break; entry . filename_len = i entry . filename = pestrndup hdr -> name i myphar -> is_persistent entry . filename ][entry . filename_len - 1 == '/' entry . filename ][entry . filename_len - 1 = '\\0' entry . filename_len -- @TO@ ! last_was_longlink && hdr -> typeflag == 'L' last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; ! last_was_longlink && ! old && hdr -> prefix ][0 != 0 char name ][256 int i j i = 0 i < 155 i ++ name ][i = hdr -> prefix ][i name ][i == '\\0' break; name ][i ++ = '/' j = 0 j < 100 j ++ name ][i + j = hdr -> name ][j name ][i + j == '\\0' break; entry . filename_len = i + j name ][entry . filename_len - 1 == '/' entry . filename_len -- entry . filename = pestrndup name entry . filename_len myphar -> is_persistent ! last_was_longlink int i i = 0 i < 100 i ++ hdr -> name ][i == '\\0' break; entry . filename_len = i entry . filename = pestrndup hdr -> name i myphar -> is_persistent entry . filename ][entry . filename_len - 1 == '/' entry . filename ][entry . filename_len - 1 = '\\0' entry . filename_len -- @AT@ 11266 @LENGTH@ 1759\n" +
+                "---UPD if@@! last_was_longlink && hdr -> typeflag == 'L' last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; @TO@ ! last_was_longlink && hdr -> typeflag == 'L' last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; @AT@ 11266 @LENGTH@ 1047\n" +
+                "------UPD block@@last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; @TO@ last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; @AT@ 11314 @LENGTH@ 1001\n" +
+                "---------UPD block_content@@last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; @TO@ last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; @AT@ 11319 @LENGTH@ 1001\n" +
+                "------------INS if_stmt@@entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @TO@ block_content@@last_was_longlink = 1 entry . filename_len = entry . uncompressed_filesize entry . filename = pemalloc entry . filename_len + 1 myphar -> is_persistent read = php_stream_read fp entry . filename entry . filename_len read != entry . filename_len efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE entry . filename ][entry . filename_len = '\\0' size = ( ( size + 511 ) & ~ 511 ) - size php_stream_seek fp size SEEK_CUR ( uint ) php_stream_tell fp > totalsize efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE read = php_stream_read fp buf buf read != buf efree entry . filename error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (truncated)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE continue; @AT@ 11508 @LENGTH@ 198\n" +
+                "---------------INS if@@entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @TO@ if_stmt@@entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11508 @LENGTH@ 198\n" +
+                "------------------INS condition@@entry . filename_len == UINT_MAX @TO@ if@@entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11511 @LENGTH@ 32\n" +
+                "---------------------INS expr@@entry . filename_len == UINT_MAX @TO@ condition@@entry . filename_len == UINT_MAX @AT@ 11512 @LENGTH@ 32\n" +
+                "------------------------INS name@@entry . filename_len @TO@ expr@@entry . filename_len == UINT_MAX @AT@ 11512 @LENGTH@ 20\n" +
+                "---------------------------INS name@@entry @TO@ name@@entry . filename_len @AT@ 11512 @LENGTH@ 5\n" +
+                "---------------------------INS operator@@. @TO@ name@@entry . filename_len @AT@ 11517 @LENGTH@ 1\n" +
+                "---------------------------INS name@@filename_len @TO@ name@@entry . filename_len @AT@ 11518 @LENGTH@ 12\n" +
+                "------------------------INS operator@@== @TO@ expr@@entry . filename_len == UINT_MAX @AT@ 11531 @LENGTH@ 2\n" +
+                "------------------------INS name@@UINT_MAX @TO@ expr@@entry . filename_len == UINT_MAX @AT@ 11534 @LENGTH@ 8\n" +
+                "------------------INS block@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @TO@ if@@entry . filename_len == UINT_MAX error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11544 @LENGTH@ 165\n" +
+                "---------------------INS block_content@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @TO@ block@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11550 @LENGTH@ 165\n" +
+                "------------------------INS if_stmt@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ block_content@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11550 @LENGTH@ 97\n" +
+                "---------------------------INS if@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ if_stmt@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11550 @LENGTH@ 97\n" +
+                "------------------------------INS condition@@error @TO@ if@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11553 @LENGTH@ 5\n" +
+                "---------------------------------INS expr@@error @TO@ condition@@error @AT@ 11554 @LENGTH@ 5\n" +
+                "------------------------------------INS name@@error @TO@ expr@@error @AT@ 11554 @LENGTH@ 5\n" +
+                "------------------------------INS block@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ if@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11561 @LENGTH@ 91\n" +
+                "---------------------------------INS block_content@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ block@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 91\n" +
+                "------------------------------------INS expr_stmt@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ block_content@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 91\n" +
+                "---------------------------------------INS expr@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ expr_stmt@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 91\n" +
+                "------------------------------------------INS call@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ expr@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 91\n" +
+                "---------------------------------------------INS name@@spprintf @TO@ call@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11568 @LENGTH@ 8\n" +
+                "---------------------------------------------INS argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @TO@ call@@spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11576 @LENGTH@ 82\n" +
+                "------------------------------------------------INS argument@@error @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11577 @LENGTH@ 5\n" +
+                "---------------------------------------------------INS expr@@error @TO@ argument@@error @AT@ 11577 @LENGTH@ 5\n" +
+                "------------------------------------------------------INS name@@error @TO@ expr@@error @AT@ 11577 @LENGTH@ 5\n" +
+                "------------------------------------------------INS argument@@4096 @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11584 @LENGTH@ 4\n" +
+                "---------------------------------------------------INS expr@@4096 @TO@ argument@@4096 @AT@ 11584 @LENGTH@ 4\n" +
+                "------------------------------------------------------INS literal:number@@4096 @TO@ expr@@4096 @AT@ 11584 @LENGTH@ 4\n" +
+                "------------------------------------------------INS argument@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11590 @LENGTH@ 65\n" +
+                "---------------------------------------------------INS expr@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @TO@ argument@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @AT@ 11590 @LENGTH@ 65\n" +
+                "------------------------------------------------------INS literal:string@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @TO@ expr@@\"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" @AT@ 11590 @LENGTH@ 65\n" +
+                "------------------------------------------------INS argument@@fname @TO@ argument_list@@error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname @AT@ 11657 @LENGTH@ 5\n" +
+                "---------------------------------------------------INS expr@@fname @TO@ argument@@fname @AT@ 11657 @LENGTH@ 5\n" +
+                "------------------------------------------------------INS name@@fname @TO@ expr@@fname @AT@ 11657 @LENGTH@ 5\n" +
+                "------------------------INS expr_stmt@@php_stream_close fp @TO@ block_content@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11675 @LENGTH@ 19\n" +
+                "---------------------------INS expr@@php_stream_close fp @TO@ expr_stmt@@php_stream_close fp @AT@ 11675 @LENGTH@ 19\n" +
+                "------------------------------INS call@@php_stream_close fp @TO@ expr@@php_stream_close fp @AT@ 11675 @LENGTH@ 19\n" +
+                "---------------------------------INS name@@php_stream_close @TO@ call@@php_stream_close fp @AT@ 11675 @LENGTH@ 16\n" +
+                "---------------------------------INS argument_list@@fp @TO@ call@@php_stream_close fp @AT@ 11691 @LENGTH@ 2\n" +
+                "------------------------------------INS argument@@fp @TO@ argument_list@@fp @AT@ 11692 @LENGTH@ 2\n" +
+                "---------------------------------------INS expr@@fp @TO@ argument@@fp @AT@ 11692 @LENGTH@ 2\n" +
+                "------------------------------------------INS name@@fp @TO@ expr@@fp @AT@ 11692 @LENGTH@ 2\n" +
+                "------------------------INS macro@@phar_destroy_phar_data myphar TSRMLS_CC @TO@ block_content@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11701 @LENGTH@ 39\n" +
+                "---------------------------INS name@@phar_destroy_phar_data @TO@ macro@@phar_destroy_phar_data myphar TSRMLS_CC @AT@ 11701 @LENGTH@ 22\n" +
+                "---------------------------INS argument_list@@myphar TSRMLS_CC @TO@ macro@@phar_destroy_phar_data myphar TSRMLS_CC @AT@ 11723 @LENGTH@ 16\n" +
+                "------------------------------INS argument@@myphar TSRMLS_CC @TO@ argument_list@@myphar TSRMLS_CC @AT@ 11724 @LENGTH@ 16\n" +
+                "------------------------INS return@@FAILURE @TO@ block_content@@error spprintf error 4096 \"phar error: \\\"%s\\\" is a corrupted tar file (invalid entry size)\" fname php_stream_close fp phar_destroy_phar_data myphar TSRMLS_CC FAILURE @AT@ 11747 @LENGTH@ 7\n" +
+                "---------------------------INS expr@@FAILURE @TO@ return@@FAILURE @AT@ 11754 @LENGTH@ 7\n" +
+                "------------------------------INS name@@FAILURE @TO@ expr@@FAILURE @AT@ 11754 @LENGTH@ 7\n");
     }
     @Test//TODO
     public void test_php_src_c71358_283565() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_c71358_283565_main#main.c");//
-        Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && strcmp new_value \"syslog\" if PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) return FAILURE if PG open_basedir && php_check_open_basedir new_value TSRMLS_CC return FAILURE @TO@ if ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value && strcmp new_value \"syslog\" if PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) return FAILURE if PG open_basedir && php_check_open_basedir new_value TSRMLS_CC return FAILURE @AT@ 7907 @LENGTH@ 277\n" +
-                "---UPD condition@@( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && strcmp new_value \"syslog\" @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value && strcmp new_value \"syslog\" @AT@ 7907 @LENGTH@ 98\n" +
-                "------UPD expr@@( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && strcmp new_value \"syslog\" @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value && strcmp new_value \"syslog\" @AT@ 7908 @LENGTH@ 98\n" +
-                "---------INS name@@new_value @TO@ expr@@( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && strcmp new_value \"syslog\" @AT@ 7979 @LENGTH@ 9\n" +
-                "---------INS operator@@&& @TO@ expr@@( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && strcmp new_value \"syslog\" @AT@ 7989 @LENGTH@ 2\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if@@if stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS if PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) return FAILURE @TO@ if ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value if PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) return FAILURE @AT@ 8472 @LENGTH@ 164\n" +
-                "---UPD condition@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value @AT@ 8472 @LENGTH@ 65\n" +
-                "------UPD expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value @AT@ 8473 @LENGTH@ 65\n" +
-                "---------INS operator@@( @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8484 @LENGTH@ 1\n" +
-                "---------INS operator@@) @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8550 @LENGTH@ 1\n" +
-                "---------INS operator@@&& @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8552 @LENGTH@ 2\n" +
-                "---------INS name@@new_value @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8555 @LENGTH@ 9\n");
+        Assert.assertEquals(hierarchicalActionSets.size(),1);
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) FAILURE @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) FAILURE @AT@ 8469 @LENGTH@ 151\n" +
+                "---UPD if@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) FAILURE @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value PG safe_mode && ( ! php_checkuid new_value NULL CHECKUID_CHECK_FILE_AND_DIR ) FAILURE @AT@ 8469 @LENGTH@ 151\n" +
+                "------UPD condition@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value @AT@ 8472 @LENGTH@ 65\n" +
+                "---------UPD expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @TO@ ( stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS ) && new_value @AT@ 8473 @LENGTH@ 65\n" +
+                "------------INS operator@@( @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8484 @LENGTH@ 1\n" +
+                "------------INS operator@@) @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8550 @LENGTH@ 1\n" +
+                "------------INS operator@@&& @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8552 @LENGTH@ 2\n" +
+                "------------INS name@@new_value @TO@ expr@@stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS @AT@ 8555 @LENGTH@ 9\n");
     }
 
     @Test
     public void test_php_src_920358_bd306c() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_920358_bd306c_ext#dom#xpath.c");//
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS else@@else RETURN_FALSE @TO@ if@@if xpathobjp -> type == XPATH_NODESET int i xmlNodeSetPtr nodesetp if NULL == ( nodesetp = xpathobjp -> nodesetval ) xmlXPathFreeObject xpathobjp RETURN_FALSE MAKE_STD_ZVAL retval array_init retval for i = 0 i < nodesetp -> nodeNr i ++ xmlNodePtr node nodesetp -> nodeTab ][i zval * child MAKE_STD_ZVAL child if node -> type == XML_NAMESPACE_DECL xmlNsPtr curns xmlNodePtr nsparent nsparent = node -> _private curns = xmlNewNs NULL node -> name NULL if node -> children curns -> prefix = xmlStrdup ( char * ) node -> children if node -> children node = xmlNewDocNode docp NULL ( char * ) node -> children node -> name else node = xmlNewDocNode docp NULL \"xmlns\" node -> name node -> type = XML_NAMESPACE_DECL node -> parent = nsparent node -> ns = curns child = php_dom_create_object node &ret NULL child intern TSRMLS_CC add_next_index_zval retval child @AT@ 6427 @LENGTH@ 17\n" +
-                "---INS block@@RETURN_FALSE @TO@ else@@else RETURN_FALSE @AT@ 6427 @LENGTH@ 12\n" +
-                "------INS expr_stmt@@RETURN_FALSE @TO@ block@@RETURN_FALSE @AT@ 6431 @LENGTH@ 12\n" +
-                "---------INS expr@@RETURN_FALSE @TO@ expr_stmt@@RETURN_FALSE @AT@ 6431 @LENGTH@ 12\n" +
-                "------------INS name@@RETURN_FALSE @TO@ expr@@RETURN_FALSE @AT@ 6431 @LENGTH@ 12\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@xpathobjp -> type == XPATH_NODESET int i xmlNodeSetPtr nodesetp NULL == ( nodesetp = xpathobjp -> nodesetval ) xmlXPathFreeObject xpathobjp RETURN_FALSE MAKE_STD_ZVAL retval array_init retval i = 0 i < nodesetp -> nodeNr i ++ xmlNodePtr node nodesetp -> nodeTab ][i zval * child MAKE_STD_ZVAL child node -> type == XML_NAMESPACE_DECL xmlNsPtr curns xmlNodePtr nsparent nsparent = node -> _private curns = xmlNewNs NULL node -> name NULL node -> children curns -> prefix = xmlStrdup ( char * ) node -> children node -> children node = xmlNewDocNode docp NULL ( char * ) node -> children node -> name node = xmlNewDocNode docp NULL \"xmlns\" node -> name node -> type = XML_NAMESPACE_DECL node -> parent = nsparent node -> ns = curns child = php_dom_create_object node &ret NULL child intern TSRMLS_CC add_next_index_zval retval child @TO@ xpathobjp -> type == XPATH_NODESET int i xmlNodeSetPtr nodesetp NULL == ( nodesetp = xpathobjp -> nodesetval ) xmlXPathFreeObject xpathobjp RETURN_FALSE MAKE_STD_ZVAL retval array_init retval i = 0 i < nodesetp -> nodeNr i ++ xmlNodePtr node nodesetp -> nodeTab ][i zval * child MAKE_STD_ZVAL child node -> type == XML_NAMESPACE_DECL xmlNsPtr curns xmlNodePtr nsparent nsparent = node -> _private curns = xmlNewNs NULL node -> name NULL node -> children curns -> prefix = xmlStrdup ( char * ) node -> children node -> children node = xmlNewDocNode docp NULL ( char * ) node -> children node -> name node = xmlNewDocNode docp NULL \"xmlns\" node -> name node -> type = XML_NAMESPACE_DECL node -> parent = nsparent node -> ns = curns child = php_dom_create_object node &ret NULL child intern TSRMLS_CC add_next_index_zval retval child RETURN_FALSE @AT@ 5404 @LENGTH@ 830\n" +
+                "---INS else@@RETURN_FALSE @TO@ if_stmt@@xpathobjp -> type == XPATH_NODESET int i xmlNodeSetPtr nodesetp NULL == ( nodesetp = xpathobjp -> nodesetval ) xmlXPathFreeObject xpathobjp RETURN_FALSE MAKE_STD_ZVAL retval array_init retval i = 0 i < nodesetp -> nodeNr i ++ xmlNodePtr node nodesetp -> nodeTab ][i zval * child MAKE_STD_ZVAL child node -> type == XML_NAMESPACE_DECL xmlNsPtr curns xmlNodePtr nsparent nsparent = node -> _private curns = xmlNewNs NULL node -> name NULL node -> children curns -> prefix = xmlStrdup ( char * ) node -> children node -> children node = xmlNewDocNode docp NULL ( char * ) node -> children node -> name node = xmlNewDocNode docp NULL \"xmlns\" node -> name node -> type = XML_NAMESPACE_DECL node -> parent = nsparent node -> ns = curns child = php_dom_create_object node &ret NULL child intern TSRMLS_CC add_next_index_zval retval child @AT@ 6422 @LENGTH@ 12\n" +
+                "------INS block@@RETURN_FALSE @TO@ else@@RETURN_FALSE @AT@ 6427 @LENGTH@ 12\n" +
+                "---------INS block_content@@RETURN_FALSE @TO@ block@@RETURN_FALSE @AT@ 6431 @LENGTH@ 12\n" +
+                "------------INS expr_stmt@@RETURN_FALSE @TO@ block_content@@RETURN_FALSE @AT@ 6431 @LENGTH@ 12\n" +
+                "---------------INS expr@@RETURN_FALSE @TO@ expr_stmt@@RETURN_FALSE @AT@ 6431 @LENGTH@ 12\n" +
+                "------------------INS name@@RETURN_FALSE @TO@ expr@@RETURN_FALSE @AT@ 6431 @LENGTH@ 12\n");
     }
     @Test
     public void test_php_src_c3c87e_c9c279() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_c3c87e_c9c279_ext#zip#php_zip.c");//
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS else@@else RETURN_FALSE @TO@ if@@if stream php_stream_to_zval stream return_value @AT@ 64780 @LENGTH@ 17\n" +
-                "---INS block@@RETURN_FALSE @TO@ else@@else RETURN_FALSE @AT@ 64780 @LENGTH@ 12\n" +
-                "------INS expr_stmt@@RETURN_FALSE @TO@ block@@RETURN_FALSE @AT@ 64784 @LENGTH@ 12\n" +
-                "---------INS expr@@RETURN_FALSE @TO@ expr_stmt@@RETURN_FALSE @AT@ 64784 @LENGTH@ 12\n" +
-                "------------INS name@@RETURN_FALSE @TO@ expr@@RETURN_FALSE @AT@ 64784 @LENGTH@ 12\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@stream php_stream_to_zval stream return_value @TO@ stream php_stream_to_zval stream return_value RETURN_FALSE @AT@ 64714 @LENGTH@ 45\n" +
+                "---INS else@@RETURN_FALSE @TO@ if_stmt@@stream php_stream_to_zval stream return_value @AT@ 64775 @LENGTH@ 12\n" +
+                "------INS block@@RETURN_FALSE @TO@ else@@RETURN_FALSE @AT@ 64780 @LENGTH@ 12\n" +
+                "---------INS block_content@@RETURN_FALSE @TO@ block@@RETURN_FALSE @AT@ 64784 @LENGTH@ 12\n" +
+                "------------INS expr_stmt@@RETURN_FALSE @TO@ block_content@@RETURN_FALSE @AT@ 64784 @LENGTH@ 12\n" +
+                "---------------INS expr@@RETURN_FALSE @TO@ expr_stmt@@RETURN_FALSE @AT@ 64784 @LENGTH@ 12\n" +
+                "------------------INS name@@RETURN_FALSE @TO@ expr@@RETURN_FALSE @AT@ 64784 @LENGTH@ 12\n");
     }
     @Test
     public void test_php_src_c4ee76_2a1218() throws IOException {
@@ -1189,7 +1175,7 @@ public class TestInputCases {
     public void test_php_src_e76cf8_39753f() throws IOException {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("php-src_e76cf8_39753f_Zend#zend.c");
-        Assert.assertEquals(hierarchicalActionSets.size(),1);
+        Assert.assertEquals(hierarchicalActionSets.size(),0);
     }
     @Test
     public void test_cpython_f62026_71eb864() throws IOException {
@@ -1201,7 +1187,7 @@ public class TestInputCases {
     public void test_cpython_df0d00_1254d7() throws IOException {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("cpython_df0d00_1254d7_Python#ceval.c");
-        Assert.assertEquals(hierarchicalActionSets.size(),1);
+        Assert.assertEquals(hierarchicalActionSets.size(),0);
     }
     @Test
     public void test_cpython_6a619f_46ab6d() throws IOException {
diff --git a/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java b/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
index 25395a9..547496a 100644
--- a/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
+++ b/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
@@ -157,9 +157,12 @@ public class TestPredefinedCases {
             Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD function@@static ctl_serialize_action static int test field = ATOM TST IS_ERR fields -> mode PTR_ERROR fields -> mode a > 0 1 0 @TO@ const static ctl_serialize_action static int test field = ATOM TST IS_ERR fields -> mode PTR_ERROR fields -> mode a > 0 1 0 @AT@ 0 @LENGTH@ 117\n" +
                     "---UPD type@@static ctl_serialize_action static int @TO@ const static ctl_serialize_action static int @AT@ 0 @LENGTH@ 38\n" +
                     "------INS specifier@@const @TO@ type@@static ctl_serialize_action static int @AT@ 0 @LENGTH@ 5\n");
-            Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if_stmt@@IS_ERR fields -> mode PTR_ERROR fields -> mode a > 0 1 @TO@ IS_ERR fields -> mode PTR_ERROR fields -> mode @AT@ 73 @LENGTH@ 54\n");
+            Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if_stmt@@IS_ERR fields -> mode PTR_ERROR fields -> mode a > 0 1 @TO@ IS_ERR fields -> mode PTR_ERROR fields -> mode @AT@ 73 @LENGTH@ 54\n" +
+                    "---DEL if:elseif@@a > 0 1 @AT@ 142 @LENGTH@ 7\n");
             Assert.assertEquals(hierarchicalActionSets.get(2).toString(),"INS if_stmt@@a > 0 1 @TO@ block_content@@field = ATOM TST IS_ERR fields -> mode PTR_ERROR fields -> mode a > 0 1 0 @AT@ 149 @LENGTH@ 7\n" +
-                    "---MOV if@@a > 0 1 @TO@ if_stmt@@a > 0 1 @AT@ 142 @LENGTH@ 7\n");
+                    "---INS if@@a > 0 1 @TO@ if_stmt@@a > 0 1 @AT@ 149 @LENGTH@ 7\n" +
+                    "------MOV condition@@a > 0 @TO@ if@@a > 0 1 @AT@ 149 @LENGTH@ 5\n" +
+                    "------MOV block@@1 @TO@ if@@a > 0 1 @AT@ 163 @LENGTH@ 1\n");
         }
 
     @Test
diff --git a/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java b/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java
index fdc8db2..4537b96 100644
--- a/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java
+++ b/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java
@@ -20,18 +20,19 @@ public class TestRealCases extends BaseTest {
     public void test_287_A_14208510_14208532() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("287-A-14208510-14208532.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@if g ][i ][j == '.' d ++ else h ++ if g ][i ][j + 1 == '.' d ++ else h ++ if g ][i + 1 ][j == '.' d ++ else h ++ if g ][i + 1 ][j + 1 == '.' d ++ else h ++ if d == 3 || h == 3 printf \"YES\" return 0 @TO@ if g ][i ][j == '.' d ++ else h ++ if g ][i ][j + 1 == '.' d ++ else h ++ if g ][i + 1 ][j == '.' d ++ else h ++ if g ][i + 1 ][j + 1 == '.' d ++ else h ++ if d >= 3 || h >= 3 printf \"YES\" return 0 d = 0 h = 0 @AT@ 199 @LENGTH@ 197\n" +
-                "---UPD if@@if d == 3 || h == 3 printf \"YES\" return 0 @TO@ if d >= 3 || h >= 3 printf \"YES\" return 0 @AT@ 449 @LENGTH@ 41\n" +
-                "------UPD condition@@d == 3 || h == 3 @TO@ d >= 3 || h >= 3 @AT@ 449 @LENGTH@ 16\n" +
-                "---------UPD expr@@d == 3 || h == 3 @TO@ d >= 3 || h >= 3 @AT@ 450 @LENGTH@ 16\n" +
-                "------------UPD operator@@== @TO@ >= @AT@ 451 @LENGTH@ 2\n" +
-                "------------UPD operator@@== @TO@ >= @AT@ 459 @LENGTH@ 2\n" +
-                "---INS expr_stmt@@d = 0 @TO@ block@@if g ][i ][j == '.' d ++ else h ++ if g ][i ][j + 1 == '.' d ++ else h ++ if g ][i + 1 ][j == '.' d ++ else h ++ if g ][i + 1 ][j + 1 == '.' d ++ else h ++ if d == 3 || h == 3 printf \"YES\" return 0 @AT@ 548 @LENGTH@ 5\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block_content@@g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d == 3 || h == 3 printf \"YES\" 0 @TO@ g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 d = 0 h = 0 @AT@ 213 @LENGTH@ 155\n" +
+                "---UPD if_stmt@@d == 3 || h == 3 printf \"YES\" 0 @TO@ d >= 3 || h >= 3 printf \"YES\" 0 @AT@ 447 @LENGTH@ 31\n" +
+                "------UPD if@@d == 3 || h == 3 printf \"YES\" 0 @TO@ d >= 3 || h >= 3 printf \"YES\" 0 @AT@ 447 @LENGTH@ 31\n" +
+                "---------UPD condition@@d == 3 || h == 3 @TO@ d >= 3 || h >= 3 @AT@ 449 @LENGTH@ 16\n" +
+                "------------UPD expr@@d == 3 || h == 3 @TO@ d >= 3 || h >= 3 @AT@ 450 @LENGTH@ 16\n" +
+                "---------------UPD operator@@== @TO@ >= @AT@ 451 @LENGTH@ 2\n" +
+                "---------------UPD operator@@== @TO@ >= @AT@ 459 @LENGTH@ 2\n" +
+                "---INS expr_stmt@@d = 0 @TO@ block_content@@g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d == 3 || h == 3 printf \"YES\" 0 @AT@ 548 @LENGTH@ 5\n" +
                 "------INS expr@@d = 0 @TO@ expr_stmt@@d = 0 @AT@ 548 @LENGTH@ 5\n" +
                 "---------INS name@@d @TO@ expr@@d = 0 @AT@ 548 @LENGTH@ 1\n" +
                 "---------INS operator@@= @TO@ expr@@d = 0 @AT@ 549 @LENGTH@ 1\n" +
                 "---------INS literal:number@@0 @TO@ expr@@d = 0 @AT@ 550 @LENGTH@ 1\n" +
-                "---INS expr_stmt@@h = 0 @TO@ block@@if g ][i ][j == '.' d ++ else h ++ if g ][i ][j + 1 == '.' d ++ else h ++ if g ][i + 1 ][j == '.' d ++ else h ++ if g ][i + 1 ][j + 1 == '.' d ++ else h ++ if d == 3 || h == 3 printf \"YES\" return 0 @AT@ 553 @LENGTH@ 5\n" +
+                "---INS expr_stmt@@h = 0 @TO@ block_content@@g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d == 3 || h == 3 printf \"YES\" 0 @AT@ 553 @LENGTH@ 5\n" +
                 "------INS expr@@h = 0 @TO@ expr_stmt@@h = 0 @AT@ 553 @LENGTH@ 5\n" +
                 "---------INS name@@h @TO@ expr@@h = 0 @AT@ 553 @LENGTH@ 1\n" +
                 "---------INS operator@@= @TO@ expr@@h = 0 @AT@ 554 @LENGTH@ 1\n" +
@@ -39,21 +40,24 @@ public class TestRealCases extends BaseTest {
 
     }
 
-    @Ignore
+//    @Ignore
     @Test
     public void test_287_A_14208521_14208532() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("287-A-14208521-14208532.c");
-        Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS expr_stmt@@d = 0 @TO@ block@@if g ][i ][j == '.' d ++ else h ++ if g ][i ][j + 1 == '.' d ++ else h ++ if g ][i + 1 ][j == '.' d ++ else h ++ if g ][i + 1 ][j + 1 == '.' d ++ else h ++ if d >= 3 || h >= 3 printf \"YES\" return 0 @AT@ 548 @LENGTH@ 5\n" +
-                "---INS expr@@d = 0 @TO@ expr_stmt@@d = 0 @AT@ 548 @LENGTH@ 5\n" +
-                "------INS name@@d @TO@ expr@@d = 0 @AT@ 548 @LENGTH@ 1\n" +
-                "------INS operator@@= @TO@ expr@@d = 0 @AT@ 549 @LENGTH@ 1\n" +
-                "------INS literal:number@@0 @TO@ expr@@d = 0 @AT@ 550 @LENGTH@ 1\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"INS expr_stmt@@h = 0 @TO@ block@@if g ][i ][j == '.' d ++ else h ++ if g ][i ][j + 1 == '.' d ++ else h ++ if g ][i + 1 ][j == '.' d ++ else h ++ if g ][i + 1 ][j + 1 == '.' d ++ else h ++ if d >= 3 || h >= 3 printf \"YES\" return 0 @AT@ 553 @LENGTH@ 5\n" +
-                "---INS expr@@h = 0 @TO@ expr_stmt@@h = 0 @AT@ 553 @LENGTH@ 5\n" +
-                "------INS name@@h @TO@ expr@@h = 0 @AT@ 553 @LENGTH@ 1\n" +
-                "------INS operator@@= @TO@ expr@@h = 0 @AT@ 554 @LENGTH@ 1\n" +
-                "------INS literal:number@@0 @TO@ expr@@h = 0 @AT@ 555 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.size(),1);
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@j = 0 j < 3 j ++ g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 @TO@ j = 0 j < 3 j ++ g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 d = 0 h = 0 @AT@ 181 @LENGTH@ 172\n" +
+                "---UPD block@@g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 @TO@ g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 d = 0 h = 0 @AT@ 199 @LENGTH@ 155\n" +
+                "------UPD block_content@@g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 @TO@ g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 d = 0 h = 0 @AT@ 213 @LENGTH@ 155\n" +
+                "---------INS expr_stmt@@d = 0 @TO@ block_content@@g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 @AT@ 548 @LENGTH@ 5\n" +
+                "------------INS expr@@d = 0 @TO@ expr_stmt@@d = 0 @AT@ 548 @LENGTH@ 5\n" +
+                "---------------INS name@@d @TO@ expr@@d = 0 @AT@ 548 @LENGTH@ 1\n" +
+                "---------------INS operator@@= @TO@ expr@@d = 0 @AT@ 549 @LENGTH@ 1\n" +
+                "---------------INS literal:number@@0 @TO@ expr@@d = 0 @AT@ 550 @LENGTH@ 1\n" +
+                "---------INS expr_stmt@@h = 0 @TO@ block_content@@g ][i ][j == '.' d ++ h ++ g ][i ][j + 1 == '.' d ++ h ++ g ][i + 1 ][j == '.' d ++ h ++ g ][i + 1 ][j + 1 == '.' d ++ h ++ d >= 3 || h >= 3 printf \"YES\" 0 @AT@ 553 @LENGTH@ 5\n" +
+                "------------INS expr@@h = 0 @TO@ expr_stmt@@h = 0 @AT@ 553 @LENGTH@ 5\n" +
+                "---------------INS name@@h @TO@ expr@@h = 0 @AT@ 553 @LENGTH@ 1\n" +
+                "---------------INS operator@@= @TO@ expr@@h = 0 @AT@ 554 @LENGTH@ 1\n" +
+                "---------------INS literal:number@@0 @TO@ expr@@h = 0 @AT@ 555 @LENGTH@ 1\n");
 
     }
 
@@ -79,27 +83,30 @@ public class TestRealCases extends BaseTest {
     public void test_177_A2_1594730_1595168() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("177-A2-1594730-1595168.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if i == ( n - 1 ) / 2 && j == ( n - 1 ) / 2 mid = a @TO@ if i == ( n + 1 ) / 2 && j == ( n + 1 ) / 2 mid = a @AT@ 350 @LENGTH@ 51\n" +
-                "---UPD condition@@i == ( n - 1 ) / 2 && j == ( n - 1 ) / 2 @TO@ i == ( n + 1 ) / 2 && j == ( n + 1 ) / 2 @AT@ 350 @LENGTH@ 40\n" +
-                "------UPD expr@@i == ( n - 1 ) / 2 && j == ( n - 1 ) / 2 @TO@ i == ( n + 1 ) / 2 && j == ( n + 1 ) / 2 @AT@ 351 @LENGTH@ 40\n" +
-                "---------UPD operator@@- @TO@ + @AT@ 356 @LENGTH@ 1\n" +
-                "---------UPD operator@@- @TO@ + @AT@ 370 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@i == ( n - 1 ) / 2 && j == ( n - 1 ) / 2 mid = a @TO@ i == ( n + 1 ) / 2 && j == ( n + 1 ) / 2 mid = a @AT@ 348 @LENGTH@ 48\n" +
+                "---UPD if@@i == ( n - 1 ) / 2 && j == ( n - 1 ) / 2 mid = a @TO@ i == ( n + 1 ) / 2 && j == ( n + 1 ) / 2 mid = a @AT@ 348 @LENGTH@ 48\n" +
+                "------UPD condition@@i == ( n - 1 ) / 2 && j == ( n - 1 ) / 2 @TO@ i == ( n + 1 ) / 2 && j == ( n + 1 ) / 2 @AT@ 350 @LENGTH@ 40\n" +
+                "---------UPD expr@@i == ( n - 1 ) / 2 && j == ( n - 1 ) / 2 @TO@ i == ( n + 1 ) / 2 && j == ( n + 1 ) / 2 @AT@ 351 @LENGTH@ 40\n" +
+                "------------UPD operator@@- @TO@ + @AT@ 356 @LENGTH@ 1\n" +
+                "------------UPD operator@@- @TO@ + @AT@ 370 @LENGTH@ 1\n");
 
     }
 
-    @Ignore
+//    @Ignore
     @Test
     public void test_680_A_18343132_18343191() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("680-A-18343132-18343191.c");
         Assert.assertEquals(hierarchicalActionSets.size(),2);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if b ][a ][i == 3 max = 3 * a ][i break; @TO@ if b ][a ][i >= 3 max = 3 * a ][i break; @AT@ 176 @LENGTH@ 40\n" +
-                "---UPD condition@@b ][a ][i == 3 @TO@ b ][a ][i >= 3 @AT@ 176 @LENGTH@ 14\n" +
-                "------UPD expr@@b ][a ][i == 3 @TO@ b ][a ][i >= 3 @AT@ 177 @LENGTH@ 14\n" +
-                "---------UPD operator@@== @TO@ >= @AT@ 184 @LENGTH@ 2\n");
-        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if@@if temp > max max = temp break; @TO@ if temp > max max = temp @AT@ 270 @LENGTH@ 31\n" +
-                "---UPD then@@max = temp break; @TO@ max = temp @AT@ 282 @LENGTH@ 17\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@b ][a ][i == 3 max = 3 * a ][i break; @TO@ b ][a ][i >= 3 max = 3 * a ][i break; @AT@ 174 @LENGTH@ 37\n" +
+                "---UPD if@@b ][a ][i == 3 max = 3 * a ][i break; @TO@ b ][a ][i >= 3 max = 3 * a ][i break; @AT@ 174 @LENGTH@ 37\n" +
+                "------UPD condition@@b ][a ][i == 3 @TO@ b ][a ][i >= 3 @AT@ 176 @LENGTH@ 14\n" +
+                "---------UPD expr@@b ][a ][i == 3 @TO@ b ][a ][i >= 3 @AT@ 177 @LENGTH@ 14\n" +
+                "------------UPD operator@@== @TO@ >= @AT@ 184 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(1).toString(),"UPD if_stmt@@temp > max max = temp break; @TO@ temp > max max = temp @AT@ 268 @LENGTH@ 28\n" +
+                "---UPD if@@temp > max max = temp break; @TO@ temp > max max = temp @AT@ 268 @LENGTH@ 28\n" +
                 "------UPD block@@max = temp break; @TO@ max = temp @AT@ 282 @LENGTH@ 17\n" +
-                "---------DEL break@@break; @AT@ 296 @LENGTH@ 6\n");
+                "---------UPD block_content@@max = temp break; @TO@ max = temp @AT@ 285 @LENGTH@ 17\n" +
+                "------------DEL break@@break; @AT@ 296 @LENGTH@ 6\n");
 
     }
 
@@ -107,7 +114,11 @@ public class TestRealCases extends BaseTest {
     public void test_245_D_3671804_3671831() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("245-D-3671804-3671831.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"MOV expr_stmt@@ans |= a @TO@ block@@ @AT@ 194 @LENGTH@ 8\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@i != j @TO@ i != j ans |= a @AT@ 183 @LENGTH@ 6\n" +
+                "---UPD if@@i != j @TO@ i != j ans |= a @AT@ 183 @LENGTH@ 6\n" +
+                "------UPD block@@ @TO@ ans |= a @AT@ 192 @LENGTH@ 0\n" +
+                "---------UPD block_content@@ @TO@ ans |= a @AT@ 192 @LENGTH@ 0\n" +
+                "------------MOV expr_stmt@@ans |= a @TO@ block_content@@ @AT@ 194 @LENGTH@ 8\n");
 
     }
 
@@ -116,10 +127,14 @@ public class TestRealCases extends BaseTest {
         //TODO not sure
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("197-B-18221952-18221968.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS expr_stmt@@i -- @TO@ block@@a ][0 /= i b ][0 /= i @AT@ 831 @LENGTH@ 4\n" +
-                "---INS expr@@i -- @TO@ expr_stmt@@i -- @AT@ 831 @LENGTH@ 4\n" +
-                "------INS name@@i @TO@ expr@@i -- @AT@ 831 @LENGTH@ 1\n" +
-                "------INS operator@@-- @TO@ expr@@i -- @AT@ 832 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@a ][0 % i == 0 && b ][0 % i == 0 a ][0 /= i b ][0 /= i @TO@ a ][0 % i == 0 && b ][0 % i == 0 a ][0 /= i b ][0 /= i i -- @AT@ 740 @LENGTH@ 54\n" +
+                "---UPD if@@a ][0 % i == 0 && b ][0 % i == 0 a ][0 /= i b ][0 /= i @TO@ a ][0 % i == 0 && b ][0 % i == 0 a ][0 /= i b ][0 /= i i -- @AT@ 740 @LENGTH@ 54\n" +
+                "------UPD block@@a ][0 /= i b ][0 /= i @TO@ a ][0 /= i b ][0 /= i i -- @AT@ 779 @LENGTH@ 21\n" +
+                "---------UPD block_content@@a ][0 /= i b ][0 /= i @TO@ a ][0 /= i b ][0 /= i i -- @AT@ 797 @LENGTH@ 21\n" +
+                "------------INS expr_stmt@@i -- @TO@ block_content@@a ][0 /= i b ][0 /= i @AT@ 831 @LENGTH@ 4\n" +
+                "---------------INS expr@@i -- @TO@ expr_stmt@@i -- @AT@ 831 @LENGTH@ 4\n" +
+                "------------------INS name@@i @TO@ expr@@i -- @AT@ 831 @LENGTH@ 1\n" +
+                "------------------INS operator@@-- @TO@ expr@@i -- @AT@ 832 @LENGTH@ 2\n");
 
     }
 
@@ -127,21 +142,22 @@ public class TestRealCases extends BaseTest {
     public void test_474_A_15226851_15226912() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("474-A-15226851-15226912.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@str ][i = s ][j + 1 @TO@ j ++ str ][i = s ][j @AT@ 560 @LENGTH@ 19\n" +
-                "---INS expr_stmt@@j ++ @TO@ block@@str ][i = s ][j + 1 @AT@ 582 @LENGTH@ 4\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block_content@@str ][i = s ][j + 1 @TO@ j ++ str ][i = s ][j @AT@ 582 @LENGTH@ 19\n" +
+                "---INS expr_stmt@@j ++ @TO@ block_content@@str ][i = s ][j + 1 @AT@ 582 @LENGTH@ 4\n" +
                 "------INS expr@@j ++ @TO@ expr_stmt@@j ++ @AT@ 582 @LENGTH@ 4\n" +
                 "---------INS name@@j @TO@ expr@@j ++ @AT@ 582 @LENGTH@ 1\n" +
                 "---------INS operator@@++ @TO@ expr@@j ++ @AT@ 583 @LENGTH@ 2\n" +
                 "---UPD expr_stmt@@str ][i = s ][j + 1 @TO@ str ][i = s ][j @AT@ 582 @LENGTH@ 19\n" +
                 "------UPD expr@@str ][i = s ][j + 1 @TO@ str ][i = s ][j @AT@ 582 @LENGTH@ 19\n" +
                 "---------UPD name@@s ][j + 1 @TO@ s ][j @AT@ 589 @LENGTH@ 9\n" +
-                "------------UPD index@@][j + 1 @TO@ ][j @AT@ 591 @LENGTH@ 7\n" +
+                "------------UPD index@@][j + 1 @TO@ ][j @AT@ 590 @LENGTH@ 7\n" +
                 "---------------UPD expr@@[j + 1 @TO@ [j @AT@ 591 @LENGTH@ 6\n" +
                 "------------------DEL operator@@+ @AT@ 592 @LENGTH@ 1\n" +
                 "------------------DEL literal:number@@1 @AT@ 593 @LENGTH@ 1\n");
 
     }
 
+    @Ignore
     @Test
     public void test_469_B_8248222_8248281() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("469-B-8248222-8248281.c");
@@ -158,7 +174,7 @@ public class TestRealCases extends BaseTest {
     public void test_189_B_17295034_17295064() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("189-B-17295034-17295064.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for b = 2 b <= w b += 2 count += ( w - a + 1 ) * ( h - b + 1 ) @TO@ for b = 2 b <= h b += 2 count += ( w - a + 1 ) * ( h - b + 1 ) @AT@ 183 @LENGTH@ 62\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@b = 2 b <= w b += 2 count += ( w - a + 1 ) * ( h - b + 1 ) @TO@ b = 2 b <= h b += 2 count += ( w - a + 1 ) * ( h - b + 1 ) @AT@ 180 @LENGTH@ 58\n" +
                 "---UPD control@@b = 2 b <= w b += 2 @TO@ b = 2 b <= h b += 2 @AT@ 183 @LENGTH@ 19\n" +
                 "------UPD condition@@b <= w @TO@ b <= h @AT@ 188 @LENGTH@ 6\n" +
                 "---------UPD expr@@b <= w @TO@ b <= h @AT@ 188 @LENGTH@ 6\n" +
@@ -171,16 +187,16 @@ public class TestRealCases extends BaseTest {
         //TODO not sure
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("244-B-5291533-5291541.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS elseif@@elseif if a == 784262 printf \"4079\\n\" @TO@ if@@if a <= 101 printf \"%d\\n\" a elseif if a == 123 printf \"113\\n\" elseif if a == 1000 printf \"352\\n\" elseif if a == 1000000000 printf \"40744\\n\" elseif if a == 999999999 printf \"40743\\n\" elseif if a == 999999998 printf \"40742\\n\" elseif if a == 999999997 printf \"40741\\n\" elseif if a == 909090901 printf \"38532\\n\" elseif if a == 142498040 printf \"21671\\n\" elseif if a == 603356456 printf \"31623\\n\" elseif if a == 64214872 printf \"15759\\n\" elseif if a == 820040584 printf \"36407\\n\" elseif if a == 442198 printf \"3071\\n\" elseif if a == 642678 printf \"3615\\n\" elseif if a == 468390 printf \"3223\\n\" elseif if a == 326806 printf \"2759\\n\" elseif if a == 940 printf \"331\\n\" elseif if a == 356 printf \"175\\n\" elseif if a == 132 printf \"114\\n\" elseif if a == 102 printf \"101\\n\" @AT@ 877 @LENGTH@ 37\n" +
-                "---INS if@@if a == 784262 printf \"4079\\n\" @TO@ elseif@@elseif if a == 784262 printf \"4079\\n\" @AT@ 877 @LENGTH@ 30\n" +
-                "------INS condition@@a == 784262 @TO@ if@@if a == 784262 printf \"4079\\n\" @AT@ 877 @LENGTH@ 11\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@a <= 101 printf \"%d\\n\" a a == 123 printf \"113\\n\" a == 1000 printf \"352\\n\" a == 1000000000 printf \"40744\\n\" a == 999999999 printf \"40743\\n\" a == 999999998 printf \"40742\\n\" a == 999999997 printf \"40741\\n\" a == 909090901 printf \"38532\\n\" a == 142498040 printf \"21671\\n\" a == 603356456 printf \"31623\\n\" a == 64214872 printf \"15759\\n\" a == 820040584 printf \"36407\\n\" a == 442198 printf \"3071\\n\" a == 642678 printf \"3615\\n\" a == 468390 printf \"3223\\n\" a == 326806 printf \"2759\\n\" a == 940 printf \"331\\n\" a == 356 printf \"175\\n\" a == 132 printf \"114\\n\" a == 102 printf \"101\\n\" @TO@ a <= 101 printf \"%d\\n\" a a == 123 printf \"113\\n\" a == 1000 printf \"352\\n\" a == 1000000000 printf \"40744\\n\" a == 999999999 printf \"40743\\n\" a == 999999998 printf \"40742\\n\" a == 999999997 printf \"40741\\n\" a == 909090901 printf \"38532\\n\" a == 142498040 printf \"21671\\n\" a == 603356456 printf \"31623\\n\" a == 64214872 printf \"15759\\n\" a == 820040584 printf \"36407\\n\" a == 442198 printf \"3071\\n\" a == 784262 printf \"4079\\n\" a == 642678 printf \"3615\\n\" a == 468390 printf \"3223\\n\" a == 326806 printf \"2759\\n\" a == 940 printf \"331\\n\" a == 356 printf \"175\\n\" a == 132 printf \"114\\n\" a == 102 printf \"101\\n\" @AT@ 108 @LENGTH@ 569\n" +
+                "---INS if:elseif@@a == 784262 printf \"4079\\n\" @TO@ if_stmt@@a <= 101 printf \"%d\\n\" a a == 123 printf \"113\\n\" a == 1000 printf \"352\\n\" a == 1000000000 printf \"40744\\n\" a == 999999999 printf \"40743\\n\" a == 999999998 printf \"40742\\n\" a == 999999997 printf \"40741\\n\" a == 909090901 printf \"38532\\n\" a == 142498040 printf \"21671\\n\" a == 603356456 printf \"31623\\n\" a == 64214872 printf \"15759\\n\" a == 820040584 printf \"36407\\n\" a == 442198 printf \"3071\\n\" a == 642678 printf \"3615\\n\" a == 468390 printf \"3223\\n\" a == 326806 printf \"2759\\n\" a == 940 printf \"331\\n\" a == 356 printf \"175\\n\" a == 132 printf \"114\\n\" a == 102 printf \"101\\n\" @AT@ 870 @LENGTH@ 27\n" +
+                "------INS condition@@a == 784262 @TO@ if:elseif@@a == 784262 printf \"4079\\n\" @AT@ 877 @LENGTH@ 11\n" +
                 "---------INS expr@@a == 784262 @TO@ condition@@a == 784262 @AT@ 878 @LENGTH@ 11\n" +
                 "------------INS name@@a @TO@ expr@@a == 784262 @AT@ 878 @LENGTH@ 1\n" +
                 "------------INS operator@@== @TO@ expr@@a == 784262 @AT@ 879 @LENGTH@ 2\n" +
                 "------------INS literal:number@@784262 @TO@ expr@@a == 784262 @AT@ 881 @LENGTH@ 6\n" +
-                "------INS then@@printf \"4079\\n\" @TO@ if@@if a == 784262 printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
-                "---------INS block@@printf \"4079\\n\" @TO@ then@@printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
-                "------------INS expr_stmt@@printf \"4079\\n\" @TO@ block@@printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
+                "------INS block@@printf \"4079\\n\" @TO@ if:elseif@@a == 784262 printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
+                "---------INS block_content@@printf \"4079\\n\" @TO@ block@@printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
+                "------------INS expr_stmt@@printf \"4079\\n\" @TO@ block_content@@printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
                 "---------------INS expr@@printf \"4079\\n\" @TO@ expr_stmt@@printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
                 "------------------INS call@@printf \"4079\\n\" @TO@ expr@@printf \"4079\\n\" @AT@ 901 @LENGTH@ 15\n" +
                 "---------------------INS name@@printf @TO@ call@@printf \"4079\\n\" @AT@ 901 @LENGTH@ 6\n" +
@@ -194,31 +210,31 @@ public class TestRealCases extends BaseTest {
     public void test_166_C_1395587_1395933() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("166-C-1395587-1395933.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if array ][( n + 1 ) / 2 == x printf \"0\\n\" elseif if last < ( n + 1 ) / 2 printf \"%d\\n\" n - 2 * last elseif if first > ( n + 1 ) / 2 printf \"%d\\n\" 2 * first - n - 1 @TO@ if array ][( n + 1 ) / 2 - 1 == x printf \"0\\n\" elseif if last < ( n + 1 ) / 2 printf \"%d\\n\" n - 2 * last elseif if first > ( n + 1 ) / 2 printf \"%d\\n\" 2 * first - n - 1 elseif if n == 1 printf \"0\\n\" @AT@ 771 @LENGTH@ 164\n" +
-                "---UPD condition@@array ][( n + 1 ) / 2 == x @TO@ array ][( n + 1 ) / 2 - 1 == x @AT@ 771 @LENGTH@ 26\n" +
-                "------UPD expr@@array ][( n + 1 ) / 2 == x @TO@ array ][( n + 1 ) / 2 - 1 == x @AT@ 772 @LENGTH@ 26\n" +
-                "---------UPD name@@array ][( n + 1 ) / 2 @TO@ array ][( n + 1 ) / 2 - 1 @AT@ 772 @LENGTH@ 21\n" +
-                "------------UPD index@@][( n + 1 ) / 2 @TO@ ][( n + 1 ) / 2 - 1 @AT@ 778 @LENGTH@ 15\n" +
-                "---------------UPD expr@@[( n + 1 ) / 2 @TO@ [( n + 1 ) / 2 - 1 @AT@ 778 @LENGTH@ 14\n" +
-                "------------------INS operator@@- @TO@ expr@@[( n + 1 ) / 2 @AT@ 785 @LENGTH@ 1\n" +
-                "------------------INS literal:number@@1 @TO@ expr@@[( n + 1 ) / 2 @AT@ 786 @LENGTH@ 1\n" +
-                "---INS elseif@@elseif if n == 1 printf \"0\\n\" @TO@ if@@if array ][( n + 1 ) / 2 == x printf \"0\\n\" elseif if last < ( n + 1 ) / 2 printf \"%d\\n\" n - 2 * last elseif if first > ( n + 1 ) / 2 printf \"%d\\n\" 2 * first - n - 1 @AT@ 925 @LENGTH@ 29\n" +
-                "------INS if@@if n == 1 printf \"0\\n\" @TO@ elseif@@elseif if n == 1 printf \"0\\n\" @AT@ 925 @LENGTH@ 22\n" +
-                "---------INS condition@@n == 1 @TO@ if@@if n == 1 printf \"0\\n\" @AT@ 925 @LENGTH@ 6\n" +
-                "------------INS expr@@n == 1 @TO@ condition@@n == 1 @AT@ 926 @LENGTH@ 6\n" +
-                "---------------INS name@@n @TO@ expr@@n == 1 @AT@ 926 @LENGTH@ 1\n" +
-                "---------------INS operator@@== @TO@ expr@@n == 1 @AT@ 927 @LENGTH@ 2\n" +
-                "---------------INS literal:number@@1 @TO@ expr@@n == 1 @AT@ 929 @LENGTH@ 1\n" +
-                "---------INS then@@printf \"0\\n\" @TO@ if@@if n == 1 printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
-                "------------INS block@@printf \"0\\n\" @TO@ then@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
-                "---------------INS expr_stmt@@printf \"0\\n\" @TO@ block@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
-                "------------------INS expr@@printf \"0\\n\" @TO@ expr_stmt@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
-                "---------------------INS call@@printf \"0\\n\" @TO@ expr@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
-                "------------------------INS name@@printf @TO@ call@@printf \"0\\n\" @AT@ 932 @LENGTH@ 6\n" +
-                "------------------------INS argument_list@@\"0\\n\" @TO@ call@@printf \"0\\n\" @AT@ 938 @LENGTH@ 5\n" +
-                "---------------------------INS argument@@\"0\\n\" @TO@ argument_list@@\"0\\n\" @AT@ 939 @LENGTH@ 5\n" +
-                "------------------------------INS expr@@\"0\\n\" @TO@ argument@@\"0\\n\" @AT@ 939 @LENGTH@ 5\n" +
-                "---------------------------------INS literal:string@@\"0\\n\" @TO@ expr@@\"0\\n\" @AT@ 939 @LENGTH@ 5\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@array ][( n + 1 ) / 2 == x printf \"0\\n\" last < ( n + 1 ) / 2 printf \"%d\\n\" n - 2 * last first > ( n + 1 ) / 2 printf \"%d\\n\" 2 * first - n - 1 @TO@ array ][( n + 1 ) / 2 - 1 == x printf \"0\\n\" last < ( n + 1 ) / 2 printf \"%d\\n\" n - 2 * last first > ( n + 1 ) / 2 printf \"%d\\n\" 2 * first - n - 1 n == 1 printf \"0\\n\" @AT@ 769 @LENGTH@ 141\n" +
+                "---UPD if@@array ][( n + 1 ) / 2 == x printf \"0\\n\" @TO@ array ][( n + 1 ) / 2 - 1 == x printf \"0\\n\" @AT@ 769 @LENGTH@ 39\n" +
+                "------UPD condition@@array ][( n + 1 ) / 2 == x @TO@ array ][( n + 1 ) / 2 - 1 == x @AT@ 771 @LENGTH@ 26\n" +
+                "---------UPD expr@@array ][( n + 1 ) / 2 == x @TO@ array ][( n + 1 ) / 2 - 1 == x @AT@ 772 @LENGTH@ 26\n" +
+                "------------UPD name@@array ][( n + 1 ) / 2 @TO@ array ][( n + 1 ) / 2 - 1 @AT@ 772 @LENGTH@ 21\n" +
+                "---------------UPD index@@][( n + 1 ) / 2 @TO@ ][( n + 1 ) / 2 - 1 @AT@ 777 @LENGTH@ 15\n" +
+                "------------------UPD expr@@[( n + 1 ) / 2 @TO@ [( n + 1 ) / 2 - 1 @AT@ 778 @LENGTH@ 14\n" +
+                "---------------------INS operator@@- @TO@ expr@@[( n + 1 ) / 2 @AT@ 785 @LENGTH@ 1\n" +
+                "---------------------INS literal:number@@1 @TO@ expr@@[( n + 1 ) / 2 @AT@ 786 @LENGTH@ 1\n" +
+                "---INS if:elseif@@n == 1 printf \"0\\n\" @TO@ if_stmt@@array ][( n + 1 ) / 2 == x printf \"0\\n\" last < ( n + 1 ) / 2 printf \"%d\\n\" n - 2 * last first > ( n + 1 ) / 2 printf \"%d\\n\" 2 * first - n - 1 @AT@ 918 @LENGTH@ 19\n" +
+                "------INS condition@@n == 1 @TO@ if:elseif@@n == 1 printf \"0\\n\" @AT@ 925 @LENGTH@ 6\n" +
+                "---------INS expr@@n == 1 @TO@ condition@@n == 1 @AT@ 926 @LENGTH@ 6\n" +
+                "------------INS name@@n @TO@ expr@@n == 1 @AT@ 926 @LENGTH@ 1\n" +
+                "------------INS operator@@== @TO@ expr@@n == 1 @AT@ 927 @LENGTH@ 2\n" +
+                "------------INS literal:number@@1 @TO@ expr@@n == 1 @AT@ 929 @LENGTH@ 1\n" +
+                "------INS block@@printf \"0\\n\" @TO@ if:elseif@@n == 1 printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
+                "---------INS block_content@@printf \"0\\n\" @TO@ block@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
+                "------------INS expr_stmt@@printf \"0\\n\" @TO@ block_content@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
+                "---------------INS expr@@printf \"0\\n\" @TO@ expr_stmt@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
+                "------------------INS call@@printf \"0\\n\" @TO@ expr@@printf \"0\\n\" @AT@ 932 @LENGTH@ 12\n" +
+                "---------------------INS name@@printf @TO@ call@@printf \"0\\n\" @AT@ 932 @LENGTH@ 6\n" +
+                "---------------------INS argument_list@@\"0\\n\" @TO@ call@@printf \"0\\n\" @AT@ 938 @LENGTH@ 5\n" +
+                "------------------------INS argument@@\"0\\n\" @TO@ argument_list@@\"0\\n\" @AT@ 939 @LENGTH@ 5\n" +
+                "---------------------------INS expr@@\"0\\n\" @TO@ argument@@\"0\\n\" @AT@ 939 @LENGTH@ 5\n" +
+                "------------------------------INS literal:string@@\"0\\n\" @TO@ expr@@\"0\\n\" @AT@ 939 @LENGTH@ 5\n");
 
     }
 
@@ -227,15 +243,19 @@ public class TestRealCases extends BaseTest {
         //TODO not sure
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("315-A-6149995-6150754.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS expr_stmt@@a ][j = 0 @TO@ block@@ans -- @AT@ 377 @LENGTH@ 9\n" +
-                "---INS expr@@a ][j = 0 @TO@ expr_stmt@@a ][j = 0 @AT@ 377 @LENGTH@ 9\n" +
-                "------INS name@@a ][j @TO@ expr@@a ][j = 0 @AT@ 377 @LENGTH@ 5\n" +
-                "---------INS name@@a @TO@ name@@a ][j @AT@ 377 @LENGTH@ 1\n" +
-                "---------INS index@@][j @TO@ name@@a ][j @AT@ 379 @LENGTH@ 3\n" +
-                "------------INS expr@@[j @TO@ index@@][j @AT@ 379 @LENGTH@ 2\n" +
-                "---------------INS name@@[j @TO@ expr@@[j @AT@ 379 @LENGTH@ 2\n" +
-                "------INS operator@@= @TO@ expr@@a ][j = 0 @AT@ 381 @LENGTH@ 1\n" +
-                "------INS literal:number@@0 @TO@ expr@@a ][j = 0 @AT@ 382 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@a ][j == t ans -- @TO@ a ][j == t ans -- a ][j = 0 @AT@ 300 @LENGTH@ 17\n" +
+                "---UPD if@@a ][j == t ans -- @TO@ a ][j == t ans -- a ][j = 0 @AT@ 300 @LENGTH@ 17\n" +
+                "------UPD block@@ans -- @TO@ ans -- a ][j = 0 @AT@ 332 @LENGTH@ 6\n" +
+                "---------UPD block_content@@ans -- @TO@ ans -- a ][j = 0 @AT@ 332 @LENGTH@ 6\n" +
+                "------------INS expr_stmt@@a ][j = 0 @TO@ block_content@@ans -- @AT@ 377 @LENGTH@ 9\n" +
+                "---------------INS expr@@a ][j = 0 @TO@ expr_stmt@@a ][j = 0 @AT@ 377 @LENGTH@ 9\n" +
+                "------------------INS name@@a ][j @TO@ expr@@a ][j = 0 @AT@ 377 @LENGTH@ 5\n" +
+                "---------------------INS name@@a @TO@ name@@a ][j @AT@ 377 @LENGTH@ 1\n" +
+                "---------------------INS index@@][j @TO@ name@@a ][j @AT@ 378 @LENGTH@ 3\n" +
+                "------------------------INS expr@@[j @TO@ index@@][j @AT@ 379 @LENGTH@ 2\n" +
+                "---------------------------INS name@@[j @TO@ expr@@[j @AT@ 379 @LENGTH@ 2\n" +
+                "------------------INS operator@@= @TO@ expr@@a ][j = 0 @AT@ 381 @LENGTH@ 1\n" +
+                "------------------INS literal:number@@0 @TO@ expr@@a ][j = 0 @AT@ 382 @LENGTH@ 1\n");
 
     }
 
@@ -243,17 +263,18 @@ public class TestRealCases extends BaseTest {
     public void test_158_A_18237828_18237840() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("158-A-18237828-18237840.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if ara ][i >= ara ][k - 1 count ++ @TO@ if ara ][i >= ara ][k - 1 && ara ][i != 0 count ++ @AT@ 219 @LENGTH@ 34\n" +
-                "---UPD condition@@ara ][i >= ara ][k - 1 @TO@ ara ][i >= ara ][k - 1 && ara ][i != 0 @AT@ 219 @LENGTH@ 22\n" +
-                "------UPD expr@@ara ][i >= ara ][k - 1 @TO@ ara ][i >= ara ][k - 1 && ara ][i != 0 @AT@ 220 @LENGTH@ 22\n" +
-                "---------INS operator@@&& @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 236 @LENGTH@ 2\n" +
-                "---------INS name@@ara ][i @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 239 @LENGTH@ 7\n" +
-                "------------INS name@@ara @TO@ name@@ara ][i @AT@ 239 @LENGTH@ 3\n" +
-                "------------INS index@@][i @TO@ name@@ara ][i @AT@ 243 @LENGTH@ 3\n" +
-                "---------------INS expr@@[i @TO@ index@@][i @AT@ 243 @LENGTH@ 2\n" +
-                "------------------INS name@@[i @TO@ expr@@[i @AT@ 243 @LENGTH@ 2\n" +
-                "---------INS operator@@!= @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 245 @LENGTH@ 2\n" +
-                "---------INS literal:number@@0 @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 247 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@ara ][i >= ara ][k - 1 count ++ @TO@ ara ][i >= ara ][k - 1 && ara ][i != 0 count ++ @AT@ 217 @LENGTH@ 31\n" +
+                "---UPD if@@ara ][i >= ara ][k - 1 count ++ @TO@ ara ][i >= ara ][k - 1 && ara ][i != 0 count ++ @AT@ 217 @LENGTH@ 31\n" +
+                "------UPD condition@@ara ][i >= ara ][k - 1 @TO@ ara ][i >= ara ][k - 1 && ara ][i != 0 @AT@ 219 @LENGTH@ 22\n" +
+                "---------UPD expr@@ara ][i >= ara ][k - 1 @TO@ ara ][i >= ara ][k - 1 && ara ][i != 0 @AT@ 220 @LENGTH@ 22\n" +
+                "------------INS operator@@&& @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 236 @LENGTH@ 2\n" +
+                "------------INS name@@ara ][i @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 239 @LENGTH@ 7\n" +
+                "---------------INS name@@ara @TO@ name@@ara ][i @AT@ 239 @LENGTH@ 3\n" +
+                "---------------INS index@@][i @TO@ name@@ara ][i @AT@ 242 @LENGTH@ 3\n" +
+                "------------------INS expr@@[i @TO@ index@@][i @AT@ 243 @LENGTH@ 2\n" +
+                "---------------------INS name@@[i @TO@ expr@@[i @AT@ 243 @LENGTH@ 2\n" +
+                "------------INS operator@@!= @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 245 @LENGTH@ 2\n" +
+                "------------INS literal:number@@0 @TO@ expr@@ara ][i >= ara ][k - 1 @AT@ 247 @LENGTH@ 1\n");
 
     }
 
@@ -263,13 +284,15 @@ public class TestRealCases extends BaseTest {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("405-B-9434593-9434605.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
         Assert.assertEquals(hierarchicalActionSets.get(0).toString(),
-                "INS else@@else i1 = 0 @TO@ if@@if input ][0 == '.' count = 1 @AT@ 295 @LENGTH@ 11\n" +
-                        "---INS block@@i1 = 0 @TO@ else@@else i1 = 0 @AT@ 295 @LENGTH@ 6\n" +
-                        "------INS expr_stmt@@i1 = 0 @TO@ block@@i1 = 0 @AT@ 295 @LENGTH@ 6\n" +
-                        "---------INS expr@@i1 = 0 @TO@ expr_stmt@@i1 = 0 @AT@ 295 @LENGTH@ 6\n" +
-                        "------------INS name@@i1 @TO@ expr@@i1 = 0 @AT@ 295 @LENGTH@ 2\n" +
-                        "------------INS operator@@= @TO@ expr@@i1 = 0 @AT@ 297 @LENGTH@ 1\n" +
-                        "------------INS literal:number@@0 @TO@ expr@@i1 = 0 @AT@ 298 @LENGTH@ 1\n");
+                "UPD if_stmt@@input ][0 == '.' count = 1 @TO@ input ][0 == '.' count = 1 i1 = 0 @AT@ 258 @LENGTH@ 26\n" +
+                        "---INS else@@i1 = 0 @TO@ if_stmt@@input ][0 == '.' count = 1 @AT@ 288 @LENGTH@ 6\n" +
+                        "------INS block@@i1 = 0 @TO@ else@@i1 = 0 @AT@ 295 @LENGTH@ 6\n" +
+                        "---------INS block_content@@i1 = 0 @TO@ block@@i1 = 0 @AT@ 295 @LENGTH@ 6\n" +
+                        "------------INS expr_stmt@@i1 = 0 @TO@ block_content@@i1 = 0 @AT@ 295 @LENGTH@ 6\n" +
+                        "---------------INS expr@@i1 = 0 @TO@ expr_stmt@@i1 = 0 @AT@ 295 @LENGTH@ 6\n" +
+                        "------------------INS name@@i1 @TO@ expr@@i1 = 0 @AT@ 295 @LENGTH@ 2\n" +
+                        "------------------INS operator@@= @TO@ expr@@i1 = 0 @AT@ 297 @LENGTH@ 1\n" +
+                        "------------------INS literal:number@@0 @TO@ expr@@i1 = 0 @AT@ 298 @LENGTH@ 1\n");
 
     }
 
@@ -278,10 +301,11 @@ public class TestRealCases extends BaseTest {
     public void test_489_A_9343123_9343126() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("489-A-9343123-9343126.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if ZA ][d < ZA ][c d = c @TO@ if ZA ][d > ZA ][c d = c @AT@ 252 @LENGTH@ 24\n" +
-                "---UPD condition@@ZA ][d < ZA ][c @TO@ ZA ][d > ZA ][c @AT@ 252 @LENGTH@ 15\n" +
-                "------UPD expr@@ZA ][d < ZA ][c @TO@ ZA ][d > ZA ][c @AT@ 253 @LENGTH@ 15\n" +
-                "---------UPD operator@@< @TO@ > @AT@ 259 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@ZA ][d < ZA ][c d = c @TO@ ZA ][d > ZA ][c d = c @AT@ 249 @LENGTH@ 21\n" +
+                "---UPD if@@ZA ][d < ZA ][c d = c @TO@ ZA ][d > ZA ][c d = c @AT@ 249 @LENGTH@ 21\n" +
+                "------UPD condition@@ZA ][d < ZA ][c @TO@ ZA ][d > ZA ][c @AT@ 252 @LENGTH@ 15\n" +
+                "---------UPD expr@@ZA ][d < ZA ][c @TO@ ZA ][d > ZA ][c @AT@ 253 @LENGTH@ 15\n" +
+                "------------UPD operator@@< @TO@ > @AT@ 259 @LENGTH@ 1\n");
 
     }
 
@@ -289,7 +313,7 @@ public class TestRealCases extends BaseTest {
     public void test_143_A_17964626_17964657() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("143-A-17964626-17964657.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for a = 1 a < ( r1 % 10 ) a ++ for i = 1 i <= 1000 i ++ ar ][i = 0 ar ][a = 1 if a >= c1 || a >= d1 continue; b = r1 - a if ar ][b == 1 continue; else ar ][b = 1 if b >= c2 || b >= d2 continue; c = c1 - a if ar ][c == 1 continue; else ar ][c = 1 if c >= r2 || c >= d2 continue; d = d1 - a if ar ][d == 1 continue; if d >= r2 || d >= c2 continue; if b + c != d2 continue; if b + d != c2 continue; if c + d != r2 continue; if a > 9 || b > 9 || c > 9 || d > 9 continue; flag = 1 break; @TO@ for a = 1 a < r1 a ++ for i = 1 i <= 1000 i ++ ar ][i = 0 ar ][a = 1 if a >= c1 || a >= d1 continue; b = r1 - a if ar ][b == 1 continue; else ar ][b = 1 if b >= c2 || b >= d2 continue; c = c1 - a if ar ][c == 1 continue; else ar ][c = 1 if c >= r2 || c >= d2 continue; d = d1 - a if ar ][d == 1 continue; if d >= r2 || d >= c2 continue; if b + c != d2 continue; if b + d != c2 continue; if c + d != r2 continue; if a > 9 || b > 9 || c > 9 || d > 9 continue; flag = 1 break; @AT@ 187 @LENGTH@ 482\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@a = 1 a < ( r1 % 10 ) a ++ i = 1 i <= 1000 i ++ ar ][i = 0 ar ][a = 1 a >= c1 || a >= d1 continue; b = r1 - a ar ][b == 1 continue; ar ][b = 1 b >= c2 || b >= d2 continue; c = c1 - a ar ][c == 1 continue; ar ][c = 1 c >= r2 || c >= d2 continue; d = d1 - a ar ][d == 1 continue; d >= r2 || d >= c2 continue; b + c != d2 continue; b + d != c2 continue; c + d != r2 continue; a > 9 || b > 9 || c > 9 || d > 9 continue; flag = 1 break; @TO@ a = 1 a < r1 a ++ i = 1 i <= 1000 i ++ ar ][i = 0 ar ][a = 1 a >= c1 || a >= d1 continue; b = r1 - a ar ][b == 1 continue; ar ][b = 1 b >= c2 || b >= d2 continue; c = c1 - a ar ][c == 1 continue; ar ][c = 1 c >= r2 || c >= d2 continue; d = d1 - a ar ][d == 1 continue; d >= r2 || d >= c2 continue; b + c != d2 continue; b + d != c2 continue; c + d != r2 continue; a > 9 || b > 9 || c > 9 || d > 9 continue; flag = 1 break; @AT@ 184 @LENGTH@ 431\n" +
                 "---UPD control@@a = 1 a < ( r1 % 10 ) a ++ @TO@ a = 1 a < r1 a ++ @AT@ 187 @LENGTH@ 26\n" +
                 "------UPD condition@@a < ( r1 % 10 ) @TO@ a < r1 @AT@ 193 @LENGTH@ 15\n" +
                 "---------UPD expr@@a < ( r1 % 10 ) @TO@ a < r1 @AT@ 193 @LENGTH@ 15\n" +
@@ -307,7 +331,7 @@ public class TestRealCases extends BaseTest {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("612-A-15750192-15750273.c");
 
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for i = p i <= k i ++ printf \"%c\" a ][i @TO@ for i = p i < k i ++ printf \"%c\" a ][i @AT@ 262 @LENGTH@ 39\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = p i <= k i ++ printf \"%c\" a ][i @TO@ i = p i < k i ++ printf \"%c\" a ][i @AT@ 259 @LENGTH@ 35\n" +
                 "---UPD control@@i = p i <= k i ++ @TO@ i = p i < k i ++ @AT@ 262 @LENGTH@ 17\n" +
                 "------UPD condition@@i <= k @TO@ i < k @AT@ 267 @LENGTH@ 6\n" +
                 "---------UPD expr@@i <= k @TO@ i < k @AT@ 267 @LENGTH@ 6\n" +
@@ -320,23 +344,25 @@ public class TestRealCases extends BaseTest {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("344-A-17290259-17290309.c");
 
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for i = 0 i < n i ++ if a ][i + 1 == a ][i d = d + 1 else f = f + 1 i = i + 2 @TO@ for i = 0 i < n - 1 i ++ if a ][i + 1 == a ][i d = d + 1 else f = f + 1 @AT@ 158 @LENGTH@ 77\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 0 i < n i ++ a ][i + 1 == a ][i d = d + 1 f = f + 1 i = i + 2 @TO@ i = 0 i < n - 1 i ++ a ][i + 1 == a ][i d = d + 1 f = f + 1 @AT@ 155 @LENGTH@ 65\n" +
                 "---UPD control@@i = 0 i < n i ++ @TO@ i = 0 i < n - 1 i ++ @AT@ 158 @LENGTH@ 16\n" +
                 "------UPD condition@@i < n @TO@ i < n - 1 @AT@ 163 @LENGTH@ 5\n" +
                 "---------UPD expr@@i < n @TO@ i < n - 1 @AT@ 163 @LENGTH@ 5\n" +
                 "------------INS operator@@- @TO@ expr@@i < n @AT@ 166 @LENGTH@ 1\n" +
                 "------------INS literal:number@@1 @TO@ expr@@i < n @AT@ 167 @LENGTH@ 1\n" +
-                "---UPD block@@if a ][i + 1 == a ][i d = d + 1 else f = f + 1 i = i + 2 @TO@ if a ][i + 1 == a ][i d = d + 1 else f = f + 1 @AT@ 173 @LENGTH@ 56\n" +
-                "------UPD if@@if a ][i + 1 == a ][i d = d + 1 else f = f + 1 i = i + 2 @TO@ if a ][i + 1 == a ][i d = d + 1 else f = f + 1 @AT@ 179 @LENGTH@ 56\n" +
-                "---------UPD else@@else f = f + 1 i = i + 2 @TO@ else f = f + 1 @AT@ 218 @LENGTH@ 24\n" +
-                "------------UPD block@@f = f + 1 i = i + 2 @TO@ f = f + 1 @AT@ 218 @LENGTH@ 19\n" +
-                "---------------DEL expr_stmt@@i = i + 2 @AT@ 233 @LENGTH@ 9\n" +
-                "------------------DEL expr@@i = i + 2 @AT@ 233 @LENGTH@ 9\n" +
-                "---------------------DEL name@@i @AT@ 233 @LENGTH@ 1\n" +
-                "---------------------DEL operator@@= @AT@ 234 @LENGTH@ 1\n" +
-                "---------------------DEL name@@i @AT@ 235 @LENGTH@ 1\n" +
-                "---------------------DEL operator@@+ @AT@ 236 @LENGTH@ 1\n" +
-                "---------------------DEL literal:number@@2 @AT@ 237 @LENGTH@ 1\n");
+                "---UPD block@@a ][i + 1 == a ][i d = d + 1 f = f + 1 i = i + 2 @TO@ a ][i + 1 == a ][i d = d + 1 f = f + 1 @AT@ 173 @LENGTH@ 48\n" +
+                "------UPD block_content@@a ][i + 1 == a ][i d = d + 1 f = f + 1 i = i + 2 @TO@ a ][i + 1 == a ][i d = d + 1 f = f + 1 @AT@ 177 @LENGTH@ 48\n" +
+                "---------UPD if_stmt@@a ][i + 1 == a ][i d = d + 1 f = f + 1 i = i + 2 @TO@ a ][i + 1 == a ][i d = d + 1 f = f + 1 @AT@ 177 @LENGTH@ 48\n" +
+                "------------UPD else@@f = f + 1 i = i + 2 @TO@ f = f + 1 @AT@ 214 @LENGTH@ 19\n" +
+                "---------------UPD block@@f = f + 1 i = i + 2 @TO@ f = f + 1 @AT@ 218 @LENGTH@ 19\n" +
+                "------------------UPD block_content@@f = f + 1 i = i + 2 @TO@ f = f + 1 @AT@ 223 @LENGTH@ 19\n" +
+                "---------------------DEL expr_stmt@@i = i + 2 @AT@ 233 @LENGTH@ 9\n" +
+                "------------------------DEL expr@@i = i + 2 @AT@ 233 @LENGTH@ 9\n" +
+                "---------------------------DEL name@@i @AT@ 233 @LENGTH@ 1\n" +
+                "---------------------------DEL operator@@= @AT@ 234 @LENGTH@ 1\n" +
+                "---------------------------DEL name@@i @AT@ 235 @LENGTH@ 1\n" +
+                "---------------------------DEL operator@@+ @AT@ 236 @LENGTH@ 1\n" +
+                "---------------------------DEL literal:number@@2 @AT@ 237 @LENGTH@ 1\n");
 
     }
     @Test
@@ -345,15 +371,15 @@ public class TestRealCases extends BaseTest {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("452-B-7271987-7272004.c");
 
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@int i j n m x i_temp 1 scanf \"%d %d\" & n & m if n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) return 0 elseif if m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) return 0 elseif if ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) return 0 elseif if m == n if m + m * 1.41f > ( 2 * sqrt double m * m + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n else printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 elseif if n < m if m + sqrt ( double ) n * n + m * m < ( 2 * sqrt double n - 1 * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 else printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n return 0 elseif if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ int i j n m x i_temp 1 scanf \"%d %d\" & n & m if n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) return 0 elseif if m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) return 0 elseif if ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) return 0 elseif if m == n if m + m * 1.41f > ( 2 * sqrt double m * m + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n else printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 elseif if n < m if m + sqrt ( double ) n * n + m * m < ( 2 * sqrt double n - 1 * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 else printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n return 0 elseif if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 return 0 @AT@ 115 @LENGTH@ 1106\n" +
-                "---UPD if@@if n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) return 0 elseif if m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) return 0 elseif if ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) return 0 elseif if m == n if m + m * 1.41f > ( 2 * sqrt double m * m + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n else printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 elseif if n < m if m + sqrt ( double ) n * n + m * m < ( 2 * sqrt double n - 1 * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 else printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n return 0 elseif if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ if n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) return 0 elseif if m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) return 0 elseif if ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) return 0 elseif if m == n if m + m * 1.41f > ( 2 * sqrt double m * m + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n else printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 elseif if n < m if m + sqrt ( double ) n * n + m * m < ( 2 * sqrt double n - 1 * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 else printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n return 0 elseif if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 168 @LENGTH@ 1061\n" +
-                "------UPD elseif@@elseif if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ elseif if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 1116 @LENGTH@ 249\n" +
-                "---------UPD if@@if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 1116 @LENGTH@ 242\n" +
-                "------------UPD then@@if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 1123 @LENGTH@ 233\n" +
-                "---------------UPD block@@if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 1123 @LENGTH@ 233\n" +
-                "------------------UPD if@@if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 1129 @LENGTH@ 233\n" +
-                "---------------------UPD else@@else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ else printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 1313 @LENGTH@ 55\n" +
-                "------------------------UPD block@@printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @TO@ printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m return 0 @AT@ 1313 @LENGTH@ 50\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block_content@@int i j n m x i_temp 1 scanf \"%d %d\" & n & m n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) 0 m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) 0 ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) 0 m == n m + m * 1.41f > ( 2 * sqrt ( double ) ( m * m + ( m - 1 ) * ( m - 1 ) ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 n < m m + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) ( n - 1 ) * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n 0 n > m n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ int i j n m x i_temp 1 scanf \"%d %d\" & n & m n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) 0 m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) 0 ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) 0 m == n m + m * 1.41f > ( 2 * sqrt ( double ) ( m * m + ( m - 1 ) * ( m - 1 ) ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 n < m m + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) ( n - 1 ) * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n 0 n > m n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 0 @AT@ 118 @LENGTH@ 989\n" +
+                "---UPD if_stmt@@n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) 0 m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) 0 ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) 0 m == n m + m * 1.41f > ( 2 * sqrt ( double ) ( m * m + ( m - 1 ) * ( m - 1 ) ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 n < m m + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) ( n - 1 ) * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n 0 n > m n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) 0 m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) 0 ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) 0 m == n m + m * 1.41f > ( 2 * sqrt ( double ) ( m * m + ( m - 1 ) * ( m - 1 ) ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 n < m m + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) ( n - 1 ) * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n 0 n > m n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 166 @LENGTH@ 944\n" +
+                "------UPD if:elseif@@n > m n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ n > m n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 1109 @LENGTH@ 217\n" +
+                "---------UPD block@@n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 1123 @LENGTH@ 211\n" +
+                "------------UPD block_content@@n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 1127 @LENGTH@ 211\n" +
+                "---------------UPD if_stmt@@n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 1127 @LENGTH@ 211\n" +
+                "------------------UPD else@@printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 1306 @LENGTH@ 43\n" +
+                "---------------------UPD block@@printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 1313 @LENGTH@ 43\n" +
+                "------------------------UPD block_content@@printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @TO@ printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m 0 @AT@ 1318 @LENGTH@ 43\n" +
                 "---------------------------UPD expr_stmt@@printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m @TO@ printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m @AT@ 1318 @LENGTH@ 41\n" +
                 "------------------------------UPD expr@@printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m @TO@ printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m @AT@ 1318 @LENGTH@ 41\n" +
                 "---------------------------------UPD call@@printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m @TO@ printf \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" n m n m @AT@ 1318 @LENGTH@ 41\n" +
@@ -361,8 +387,8 @@ public class TestRealCases extends BaseTest {
                 "---------------------------------------UPD argument@@\"%d %d\\n0 0 \\n%d \\n0 %d\\n\" @TO@ \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" @AT@ 1325 @LENGTH@ 26\n" +
                 "------------------------------------------UPD expr@@\"%d %d\\n0 0 \\n%d \\n0 %d\\n\" @TO@ \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" @AT@ 1325 @LENGTH@ 26\n" +
                 "---------------------------------------------UPD literal:string@@\"%d %d\\n0 0 \\n%d \\n0 %d\\n\" @TO@ \"%d %d\\n0 0 \\n%d 0\\n0 %d\\n\" @AT@ 1325 @LENGTH@ 26\n" +
-                "---INS return@@return 0 @TO@ block@@int i j n m x i_temp 1 scanf \"%d %d\" & n & m if n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) return 0 elseif if m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) return 0 elseif if ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) return 0 elseif if m == n if m + m * 1.41f > ( 2 * sqrt double m * m + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n else printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 elseif if n < m if m + sqrt ( double ) n * n + m * m < ( 2 * sqrt double n - 1 * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" return 0 else printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n return 0 elseif if n > m if n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" return 0 else printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m return 0 @AT@ 1385 @LENGTH@ 8\n" +
-                "------INS expr@@0 @TO@ return@@return 0 @AT@ 1392 @LENGTH@ 1\n" +
+                "---INS return@@0 @TO@ block_content@@int i j n m x i_temp 1 scanf \"%d %d\" & n & m n == 0 printf \"0 1\\n\" printf \"0 %d\\n\" m printf \"0 0\\n\" printf \"0 %d\\n\" ( m - 1 ) 0 m == 0 printf \"1 0\\n\" printf \"%d 0\\n\" n printf \"0 0\\n\" printf \"%d 0\\n\" ( n - 1 ) 0 ( m == n ) && ( n == 1 ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" ( m ) 0 m == n m + m * 1.41f > ( 2 * sqrt ( double ) ( m * m + ( m - 1 ) * ( m - 1 ) ) ) printf \"%d %d\\n\" n m printf \"0 0\\n\" printf \"%d 0\\n\" n printf \"0 %d\\n\" n printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 n < m m + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) ( n - 1 ) * ( n - 1 ) + ( m ) * ( m ) ) printf \"%d %d\\n\" n - 1 m printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"1 0\\n\" 0 printf \"%d %d\\n0 0 \\n0 %d\\n%d 0\\n\" n m m n 0 n > m n + sqrt ( double ) n * n + m * m < ( 2 * sqrt ( double ) n * n + ( m - 1 ) * ( m - 1 ) ) printf \"%d %d\\n\" n m - 1 printf \"0 0\\n\" printf \"%d %d\\n\" n m printf \"0 1\\n\" 0 printf \"%d %d\\n0 0 \\n%d \\n0 %d\\n\" n m n m 0 @AT@ 1385 @LENGTH@ 1\n" +
+                "------INS expr@@0 @TO@ return@@0 @AT@ 1392 @LENGTH@ 1\n" +
                 "---------INS literal:number@@0 @TO@ expr@@0 @AT@ 1392 @LENGTH@ 1\n");
 
 
@@ -403,7 +429,7 @@ public class TestRealCases extends BaseTest {
         //TODO
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("31-B-6435804-6435825.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for i = 1 i <= strlen s i ++ if n == - 1 if s ][i != '@' n = i else printf \"No solution\\n\" return ( 0 ) if fl == 1 if s ][i != '@' fl = 0 if flag != 0 jj ++ cc ][jj = ',' for j = n j <= i j ++ jj ++ cc ][jj = s ][j else for j = n j <= i j ++ jj ++ cc ][jj = s ][j flag = 1 n = - 1 kon = i exit = 1 else printf \"No solution\\n\" return ( 0 ) elseif if s ][i == '@' fl = 1 @TO@ for i = 1 i < strlen s i ++ if n == - 1 if s ][i != '@' n = i else printf \"No solution\\n\" return ( 0 ) if fl == 1 if s ][i != '@' fl = 0 if flag != 0 jj ++ cc ][jj = ',' for j = n j <= i j ++ jj ++ cc ][jj = s ][j else for j = n j <= i j ++ jj ++ cc ][jj = s ][j flag = 1 n = - 1 kon = i exit = 1 else printf \"No solution\\n\" return ( 0 ) elseif if s ][i == '@' fl = 1 @AT@ 225 @LENGTH@ 368\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 1 i <= strlen s i ++ n == - 1 s ][i != '@' n = i printf \"No solution\\n\" ( 0 ) fl == 1 s ][i != '@' fl = 0 flag != 0 jj ++ cc ][jj = ',' j = n j <= i j ++ jj ++ cc ][jj = s ][j j = n j <= i j ++ jj ++ cc ][jj = s ][j flag = 1 n = - 1 kon = i exit = 1 printf \"No solution\\n\" ( 0 ) s ][i == '@' fl = 1 @TO@ i = 1 i < strlen s i ++ n == - 1 s ][i != '@' n = i printf \"No solution\\n\" ( 0 ) fl == 1 s ][i != '@' fl = 0 flag != 0 jj ++ cc ][jj = ',' j = n j <= i j ++ jj ++ cc ][jj = s ][j j = n j <= i j ++ jj ++ cc ][jj = s ][j flag = 1 n = - 1 kon = i exit = 1 printf \"No solution\\n\" ( 0 ) s ][i == '@' fl = 1 @AT@ 221 @LENGTH@ 302\n" +
                 "---UPD control@@i = 1 i <= strlen s i ++ @TO@ i = 1 i < strlen s i ++ @AT@ 225 @LENGTH@ 24\n" +
                 "------UPD condition@@i <= strlen s @TO@ i < strlen s @AT@ 233 @LENGTH@ 13\n" +
                 "---------UPD expr@@i <= strlen s @TO@ i < strlen s @AT@ 233 @LENGTH@ 13\n" +
@@ -416,7 +442,7 @@ public class TestRealCases extends BaseTest {
         //TODO
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("644-A-18166947-18166954.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@for i = 0 i < b i ++ for j = 0 j < b j ++ printf \"%lld \" array ][i ][j printf \"\\n\" @TO@ for i = 0 i < a i ++ for j = 0 j < b j ++ printf \"%lld \" array ][i ][j printf \"\\n\" @AT@ 1251 @LENGTH@ 82\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 0 i < b i ++ j = 0 j < b j ++ printf \"%lld \" array ][i ][j printf \"\\n\" @TO@ i = 0 i < a i ++ j = 0 j < b j ++ printf \"%lld \" array ][i ][j printf \"\\n\" @AT@ 1248 @LENGTH@ 74\n" +
                 "---UPD control@@i = 0 i < b i ++ @TO@ i = 0 i < a i ++ @AT@ 1251 @LENGTH@ 16\n" +
                 "------UPD condition@@i < b @TO@ i < a @AT@ 1256 @LENGTH@ 5\n" +
                 "---------UPD expr@@i < b @TO@ i < a @AT@ 1256 @LENGTH@ 5\n" +
@@ -428,12 +454,13 @@ public class TestRealCases extends BaseTest {
     public void test_5_B_10350073_10350082() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("5-B-10350073-10350082.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if ! ( ( ml - l ) % 2 ) if right sl += 1 right = 1 - right @TO@ if ( ml - l ) % 2 if right sl += 1 right = 1 - right @AT@ 515 @LENGTH@ 58\n" +
-                "---UPD condition@@! ( ( ml - l ) % 2 ) @TO@ ( ml - l ) % 2 @AT@ 515 @LENGTH@ 20\n" +
-                "------UPD expr@@! ( ( ml - l ) % 2 ) @TO@ ( ml - l ) % 2 @AT@ 516 @LENGTH@ 20\n" +
-                "---------DEL operator@@! @AT@ 516 @LENGTH@ 1\n" +
-                "---------DEL operator@@( @AT@ 518 @LENGTH@ 1\n" +
-                "---------DEL operator@@) @AT@ 530 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@! ( ( ml - l ) % 2 ) right sl += 1 right = 1 - right @TO@ ( ml - l ) % 2 right sl += 1 right = 1 - right @AT@ 512 @LENGTH@ 52\n" +
+                "---UPD if@@! ( ( ml - l ) % 2 ) right sl += 1 right = 1 - right @TO@ ( ml - l ) % 2 right sl += 1 right = 1 - right @AT@ 512 @LENGTH@ 52\n" +
+                "------UPD condition@@! ( ( ml - l ) % 2 ) @TO@ ( ml - l ) % 2 @AT@ 515 @LENGTH@ 20\n" +
+                "---------UPD expr@@! ( ( ml - l ) % 2 ) @TO@ ( ml - l ) % 2 @AT@ 516 @LENGTH@ 20\n" +
+                "------------DEL operator@@! @AT@ 516 @LENGTH@ 1\n" +
+                "------------DEL operator@@( @AT@ 518 @LENGTH@ 1\n" +
+                "------------DEL operator@@) @AT@ 530 @LENGTH@ 1\n");
 
     }
 
@@ -441,7 +468,11 @@ public class TestRealCases extends BaseTest {
     public void test_675_A_18211752_18211767() throws IOException {
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("675-A-18211752-18211767.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"MOV return@@return 0 @TO@ block@@if a == b printf \"YES\" else printf \"NO\" @AT@ 242 @LENGTH@ 8\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@c == 0 a == b printf \"YES\" printf \"NO\" @TO@ c == 0 a == b printf \"YES\" printf \"NO\" 0 @AT@ 106 @LENGTH@ 38\n" +
+                "---UPD if@@c == 0 a == b printf \"YES\" printf \"NO\" @TO@ c == 0 a == b printf \"YES\" printf \"NO\" 0 @AT@ 106 @LENGTH@ 38\n" +
+                "------UPD block@@a == b printf \"YES\" printf \"NO\" @TO@ a == b printf \"YES\" printf \"NO\" 0 @AT@ 114 @LENGTH@ 31\n" +
+                "---------UPD block_content@@a == b printf \"YES\" printf \"NO\" @TO@ a == b printf \"YES\" printf \"NO\" 0 @AT@ 119 @LENGTH@ 31\n" +
+                "------------MOV return@@0 @TO@ block_content@@a == b printf \"YES\" printf \"NO\" @AT@ 242 @LENGTH@ 1\n");
 
     }
 
@@ -450,26 +481,27 @@ public class TestRealCases extends BaseTest {
         //TODO
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("158-A-18278572-18278586.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD while@@while a ][i >= a ][k && i <= n count ++ i ++ @TO@ while a ][i >= a ][k && i <= n && a ][i != 0 count ++ i ++ @AT@ 501 @LENGTH@ 44\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD while@@a ][i >= a ][k && i <= n count ++ i ++ @TO@ a ][i >= a ][k && i <= n && a ][i != 0 count ++ i ++ @AT@ 496 @LENGTH@ 38\n" +
                 "---UPD condition@@a ][i >= a ][k && i <= n @TO@ a ][i >= a ][k && i <= n && a ][i != 0 @AT@ 501 @LENGTH@ 24\n" +
                 "------UPD expr@@a ][i >= a ][k && i <= n @TO@ a ][i >= a ][k && i <= n && a ][i != 0 @AT@ 502 @LENGTH@ 24\n" +
                 "---------INS operator@@&& @TO@ expr@@a ][i >= a ][k && i <= n @AT@ 518 @LENGTH@ 2\n" +
                 "---------INS name@@a ][i @TO@ expr@@a ][i >= a ][k && i <= n @AT@ 520 @LENGTH@ 5\n" +
                 "------------INS name@@a @TO@ name@@a ][i @AT@ 520 @LENGTH@ 1\n" +
-                "------------INS index@@][i @TO@ name@@a ][i @AT@ 522 @LENGTH@ 3\n" +
+                "------------INS index@@][i @TO@ name@@a ][i @AT@ 521 @LENGTH@ 3\n" +
                 "---------------INS expr@@[i @TO@ index@@][i @AT@ 522 @LENGTH@ 2\n" +
                 "------------------INS name@@[i @TO@ expr@@[i @AT@ 522 @LENGTH@ 2\n" +
                 "---------INS operator@@!= @TO@ expr@@a ][i >= a ][k && i <= n @AT@ 524 @LENGTH@ 2\n" +
                 "---------INS literal:number@@0 @TO@ expr@@a ][i >= a ][k && i <= n @AT@ 526 @LENGTH@ 1\n");
 
     }
-
+    //TODO
+    @Ignore
     @Test
     public void test_31_B_136044_136045() throws IOException {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("31-B-136044-136045.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"MOV if@@if flag puts ans + 1 else printf \"No solution\\n\" @TO@ block@@long i long l long flag 0 long tot 0 gets str + 1 l = strlen str + 1 if str ][1 == '@' || str ][l == '@' end for i = 1 i <= l - 2 i ++ if str ][i == '@' && ( str ][i + 1 == '@' || str ][i + 2 == '@' ) end for i = 1 i <= l i ++ if flag && str ][i + 1 == '@' ans ][++ tot = ',' if str ][i == '@' flag = 1 ans ][++ tot = str ][i if flag puts ans + 1 else printf \"No solution\\n\" end return 0 @AT@ 937 @LENGTH@ 48\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"");
     }
 
     @Test
@@ -477,7 +509,10 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("432-A-16886797-16886828.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"MOV if@@if z <= 5 - y s ++ @TO@ block@@scanf \"%d\" & z @AT@ 132 @LENGTH@ 18\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 0 i < x i ++ scanf \"%d\" & z @TO@ i = 0 i < x i ++ scanf \"%d\" & z z <= 5 - y s ++ @AT@ 93 @LENGTH@ 31\n" +
+                "---UPD block@@scanf \"%d\" & z @TO@ scanf \"%d\" & z z <= 5 - y s ++ @AT@ 112 @LENGTH@ 14\n" +
+                "------UPD block_content@@scanf \"%d\" & z @TO@ scanf \"%d\" & z z <= 5 - y s ++ @AT@ 112 @LENGTH@ 14\n" +
+                "---------MOV if_stmt@@z <= 5 - y s ++ @TO@ block_content@@scanf \"%d\" & z @AT@ 130 @LENGTH@ 15\n");
     }
 
     @Test
@@ -485,10 +520,9 @@ public class TestRealCases extends BaseTest {
         //TODO macro
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("507-A-16886367-16886377.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@int x 0 n 0 s 0 i j k h ][105 0 a ][105 0 c ][105 0 y 0 top 0 scanf \"%d %d\" & n & k FOR i 0 n scanf \"%d\" & c ][i FOR i 0 n a ][i = i + 1 FOR i 0 n FOR j 1 n if c ][j - 1 > c ][j s = c ][j c ][j = c ][j - 1 c ][j - 1 = s s = a ][j a ][j = a ][j - 1 a ][j - 1 = s FOR i 0 n top += c ][i if top > k break; printf \"%d\\n\" i FOR j 0 n printf \"%d \" a ][j return 0 @TO@ int x 0 n 0 s 0 i j k h ][105 0 a ][105 0 c ][105 0 y 0 top 0 scanf \"%d %d\" & n & k FOR i 0 n scanf \"%d\" & c ][i FOR i 0 n a ][i = i + 1 FOR i 0 n FOR j 1 n if c ][j - 1 > c ][j s = c ][j c ][j = c ][j - 1 c ][j - 1 = s s = a ][j a ][j = a ][j - 1 a ][j - 1 = s FOR i 0 n top += c ][i if top > k break; printf \"%d\\n\" i FOR j 0 i printf \"%d \" a ][j return 0 @AT@ 270 @LENGTH@ 356\n" +
-                "---UPD macro@@FOR j 0 n @TO@ FOR j 0 i @AT@ 701 @LENGTH@ 9\n" +
-                "------UPD argument_list@@j 0 n @TO@ j 0 i @AT@ 704 @LENGTH@ 5\n" +
-                "---------UPD argument@@n @TO@ i @AT@ 709 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD macro@@FOR j 0 n @TO@ FOR j 0 i @AT@ 701 @LENGTH@ 9\n" +
+                "---UPD argument_list@@j 0 n @TO@ j 0 i @AT@ 704 @LENGTH@ 5\n" +
+                "------UPD argument@@n @TO@ i @AT@ 709 @LENGTH@ 1\n");
     }
 
     @Test
@@ -496,13 +530,12 @@ public class TestRealCases extends BaseTest {
         //TODO macro
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("25-D-110126-110132.c");
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@int i j k l m n int a ][1200 b ][1200 unused ][1200 int ind ][1200 int cnt ][1200 int res_a ][1200 res_b ][1200 res_c ][1200 res_d ][1200 int shima int res bef scanf \"%d\" & n m = n - 1 rep i m scanf \"%d%d\" a + i b + i , a ][i -- , b ][i -- unionInit ind n rep i m unionConnect ind a ][i b ][i shima = 0 rep i m cnt ][unionGet ind i = 1 rep i n shima += cnt ][i res = 0 bef = - 1 rep i n if cnt ][i if bef >= 0 res_c ][res = bef res_d ][res ++ = i bef = i res = 0 rep k m unused ][k = 0 rep k m unionInit ind n rep i m if unused ][i == 0 if i != k unionConnect ind a ][i b ][i rep i n cnt ][i = 0 rep i n cnt ][unionGet ind i = 1 j = 0 rep i n j += cnt ][i if j == shima unused ][k = 1 res_a ][res = a ][k res_b ][res ++ = b ][k printf \"%d\\n\" res rep i res printf \"%d %d %d %d\\n\" res_a ][i + 1 res_b ][i + 1 res_c ][i + 1 res_d ][i + 1 return 0 @TO@ int i j k l m n int a ][1200 b ][1200 unused ][1200 int ind ][1200 int cnt ][1200 int res_a ][1200 res_b ][1200 res_c ][1200 res_d ][1200 int shima int res bef scanf \"%d\" & n m = n - 1 rep i m scanf \"%d%d\" a + i b + i , a ][i -- , b ][i -- unionInit ind n rep i m unionConnect ind a ][i b ][i shima = 0 rep i n cnt ][unionGet ind i = 1 rep i n shima += cnt ][i res = 0 bef = - 1 rep i n if cnt ][i if bef >= 0 res_c ][res = bef res_d ][res ++ = i bef = i res = 0 rep k m unused ][k = 0 rep k m unionInit ind n rep i m if unused ][i == 0 if i != k unionConnect ind a ][i b ][i rep i n cnt ][i = 0 rep i n cnt ][unionGet ind i = 1 j = 0 rep i n j += cnt ][i if j == shima unused ][k = 1 res_a ][res = a ][k res_b ][res ++ = b ][k printf \"%d\\n\" res rep i res printf \"%d %d %d %d\\n\" res_a ][i + 1 res_b ][i + 1 res_c ][i + 1 res_d ][i + 1 return 0 @AT@ 411 @LENGTH@ 843\n" +
-                "---UPD macro@@rep i m @TO@ rep i n @AT@ 746 @LENGTH@ 7\n" +
-                "------UPD argument_list@@i m @TO@ i n @AT@ 749 @LENGTH@ 3\n" +
-                "---------UPD argument@@m @TO@ n @AT@ 752 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD macro@@rep i m @TO@ rep i n @AT@ 746 @LENGTH@ 7\n" +
+                "---UPD argument_list@@i m @TO@ i n @AT@ 749 @LENGTH@ 3\n" +
+                "------UPD argument@@m @TO@ n @AT@ 752 @LENGTH@ 1\n");
     }
 
-    @Ignore
+
     @Test
     public void test_490_A_14580360_14580456() throws IOException {
         //TODO
@@ -513,21 +546,18 @@ public class TestRealCases extends BaseTest {
                 "------DEL elseif@@elseif if y < min min = y @AT@ 548 @LENGTH@ 25\n" +
                 "---MOV if@@if y < min min = y @TO@ block@@int n i j k l scanf \"%d\" & n int a ][5005 b ][5005 c ][5005 d ][5005 int w 0 x 0 y 0 for i = 1 , j = 1 , k = 1 , l = 1 i <= n i ++ scanf \"%d\" & a ][i if a ][i == 1 b ][j = i w ++ j ++ elseif if a ][i == 2 c ][k = i x ++ k ++ elseif if a ][i == 3 d ][l = i y ++ l ++ int min w if x < min min = x elseif if y < min min = y printf \"%d\\n\" min for i = 1 i <= min i ++ printf \"%d %d %d\\n\" b ][i c ][i d ][i return 0 @AT@ 548 @LENGTH@ 18\n");
     }
-    @Ignore
+
     @Test
     public void test_336_A_11394760_11394769() throws IOException {
         //TODO
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("336-A-11394760-11394769.c");
 //        Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(), "UPD block@@ll x y ll zero 0 scanf \"%lld%lld\" & x & y if x >= 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" zero x + y x + y zero if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y elseif if x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero else printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) return 0 @TO@ ll x y ll zero 0 scanf \"%lld%lld\" & x & y if x >= 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" zero x + y x + y zero elseif if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y elseif if x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero else printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) return 0 @AT@ 72 @LENGTH@ 364\n" +
-                "---DEL if@@if x >= 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" zero x + y x + y zero @AT@ 146 @LENGTH@ 72\n" +
-                "---UPD if@@if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y elseif if x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero else printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @TO@ if x >= 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" zero x + y x + y zero elseif if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y elseif if x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero else printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @AT@ 245 @LENGTH@ 240\n" +
-                "------MOV condition@@x >= 0 && y >= 0 @TO@ if@@if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y elseif if x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero else printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @AT@ 146 @LENGTH@ 16\n" +
-                "------MOV then@@printf \"%lld %lld %lld %lld\\n\" zero x + y x + y zero @TO@ if@@if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y elseif if x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero else printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @AT@ 165 @LENGTH@ 52\n" +
-                "------INS elseif@@elseif if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @TO@ if@@if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y elseif if x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero else printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @AT@ 250 @LENGTH@ 88\n" +
-                "---------INS if@@if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @TO@ elseif@@elseif if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @AT@ 250 @LENGTH@ 81\n" +
-                "------------MOV condition@@x < 0 && y >= 0 @TO@ if@@if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @AT@ 245 @LENGTH@ 15\n" +
-                "------------MOV then@@printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @TO@ if@@if x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @AT@ 263 @LENGTH@ 62\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(), "UPD if_stmt@@x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @TO@ x >= 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" zero x + y x + y zero x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @AT@ 243 @LENGTH@ 222\n" +
+                "---MOV if@@x >= 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" zero x + y x + y zero @TO@ if_stmt@@x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @AT@ 144 @LENGTH@ 69\n" +
+                "---INS if:elseif@@x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @TO@ if_stmt@@x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y x >= 0 && y < 0 printf \"%lld %lld %lld %lld\\n\" zero - ( x - y ) x - y zero printf \"%lld %lld %lld %lld\\n\" - ( - x - y ) zero zero - ( - x - y ) @AT@ 243 @LENGTH@ 78\n" +
+                "------MOV condition@@x < 0 && y >= 0 @TO@ if:elseif@@x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @AT@ 245 @LENGTH@ 15\n" +
+                "------MOV block@@printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @TO@ if:elseif@@x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @AT@ 263 @LENGTH@ 62\n" +
+                "---DEL if@@x < 0 && y >= 0 printf \"%lld %lld %lld %lld\\n\" - ( - x + y ) zero zero - x + y @AT@ 243 @LENGTH@ 78\n");
     }
 
 
@@ -537,11 +567,14 @@ public class TestRealCases extends BaseTest {
         //TODO
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("10-A-1998522-1998523.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(), "INS expr_stmt@@lr = r @TO@ block@@scanf \"%d %d\" & l & r e += ( r - l ) * p1 if l - lr <= t1 e += ( l - lr ) * p1 else e += t1 * p1 if l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 else e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 @AT@ 465 @LENGTH@ 6\n" +
-                "---INS expr@@lr = r @TO@ expr_stmt@@lr = r @AT@ 465 @LENGTH@ 6\n" +
-                "------INS name@@lr @TO@ expr@@lr = r @AT@ 465 @LENGTH@ 2\n" +
-                "------INS operator@@= @TO@ expr@@lr = r @AT@ 468 @LENGTH@ 1\n" +
-                "------INS name@@r @TO@ expr@@lr = r @AT@ 470 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(), "UPD while@@-- n scanf \"%d %d\" & l & r e += ( r - l ) * p1 l - lr <= t1 e += ( l - lr ) * p1 e += t1 * p1 l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 @TO@ -- n scanf \"%d %d\" & l & r e += ( r - l ) * p1 l - lr <= t1 e += ( l - lr ) * p1 e += t1 * p1 l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 lr = r @AT@ 218 @LENGTH@ 178\n" +
+                "---UPD block@@scanf \"%d %d\" & l & r e += ( r - l ) * p1 l - lr <= t1 e += ( l - lr ) * p1 e += t1 * p1 l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 @TO@ scanf \"%d %d\" & l & r e += ( r - l ) * p1 l - lr <= t1 e += ( l - lr ) * p1 e += t1 * p1 l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 lr = r @AT@ 231 @LENGTH@ 173\n" +
+                "------UPD block_content@@scanf \"%d %d\" & l & r e += ( r - l ) * p1 l - lr <= t1 e += ( l - lr ) * p1 e += t1 * p1 l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 @TO@ scanf \"%d %d\" & l & r e += ( r - l ) * p1 l - lr <= t1 e += ( l - lr ) * p1 e += t1 * p1 l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 lr = r @AT@ 235 @LENGTH@ 173\n" +
+                "---------INS expr_stmt@@lr = r @TO@ block_content@@scanf \"%d %d\" & l & r e += ( r - l ) * p1 l - lr <= t1 e += ( l - lr ) * p1 e += t1 * p1 l - lr <= t1 + t2 e += ( l - lr - t1 ) * p2 e += t2 * p2 + ( l - lr - t1 - t2 ) * p3 @AT@ 465 @LENGTH@ 6\n" +
+                "------------INS expr@@lr = r @TO@ expr_stmt@@lr = r @AT@ 465 @LENGTH@ 6\n" +
+                "---------------INS name@@lr @TO@ expr@@lr = r @AT@ 465 @LENGTH@ 2\n" +
+                "---------------INS operator@@= @TO@ expr@@lr = r @AT@ 468 @LENGTH@ 1\n" +
+                "---------------INS name@@r @TO@ expr@@lr = r @AT@ 470 @LENGTH@ 1\n");
     }
     @Test
     public void test_328_B_4080800_4080805() throws IOException {
@@ -594,15 +627,17 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("10-A-2106391-2106405.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@ @TO@ scanf \"%d %d\" & c & e d = c - b if d >= t1 p += t1 * p1 d -= t1 elseif if d > 0 p += d * p1 d = 0 if d >= t2 p += t2 * p2 d -= t2 elseif if d > 0 p += d * p2 d = 0 if d > 0 p += d * p3 p += p1 * ( e - c ) a = c b = e @AT@ 295 @LENGTH@ 0\n" +
-                "---MOV expr_stmt@@scanf \"%d %d\" & c & e @TO@ block@@ @AT@ 309 @LENGTH@ 21\n" +
-                "---MOV expr_stmt@@d = c - b @TO@ block@@ @AT@ 347 @LENGTH@ 9\n" +
-                "---MOV if@@if d >= t1 p += t1 * p1 d -= t1 elseif if d > 0 p += d * p1 d = 0 @TO@ block@@ @AT@ 372 @LENGTH@ 65\n" +
-                "---MOV if@@if d >= t2 p += t2 * p2 d -= t2 elseif if d > 0 p += d * p2 d = 0 @TO@ block@@ @AT@ 618 @LENGTH@ 65\n" +
-                "---MOV if@@if d > 0 p += d * p3 @TO@ block@@ @AT@ 857 @LENGTH@ 20\n" +
-                "---MOV expr_stmt@@p += p1 * ( e - c ) @TO@ block@@ @AT@ 888 @LENGTH@ 19\n" +
-                "---MOV expr_stmt@@a = c @TO@ block@@ @AT@ 917 @LENGTH@ 5\n" +
-                "---MOV expr_stmt@@b = e @TO@ block@@ @AT@ 938 @LENGTH@ 5\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 1 i < n i ++ @TO@ i = 1 i < n i ++ scanf \"%d %d\" & c & e d = c - b d >= t1 p += t1 * p1 d -= t1 d > 0 p += d * p1 d = 0 d >= t2 p += t2 * p2 d -= t2 d > 0 p += d * p2 d = 0 d > 0 p += d * p3 p += p1 * ( e - c ) a = c b = e @AT@ 275 @LENGTH@ 16\n" +
+                "---UPD block@@ @TO@ scanf \"%d %d\" & c & e d = c - b d >= t1 p += t1 * p1 d -= t1 d > 0 p += d * p1 d = 0 d >= t2 p += t2 * p2 d -= t2 d > 0 p += d * p2 d = 0 d > 0 p += d * p3 p += p1 * ( e - c ) a = c b = e @AT@ 291 @LENGTH@ 0\n" +
+                "------UPD block_content@@ @TO@ scanf \"%d %d\" & c & e d = c - b d >= t1 p += t1 * p1 d -= t1 d > 0 p += d * p1 d = 0 d >= t2 p += t2 * p2 d -= t2 d > 0 p += d * p2 d = 0 d > 0 p += d * p3 p += p1 * ( e - c ) a = c b = e @AT@ 291 @LENGTH@ 0\n" +
+                "---------MOV expr_stmt@@scanf \"%d %d\" & c & e @TO@ block_content@@ @AT@ 309 @LENGTH@ 21\n" +
+                "---------MOV expr_stmt@@d = c - b @TO@ block_content@@ @AT@ 347 @LENGTH@ 9\n" +
+                "---------MOV if_stmt@@d >= t1 p += t1 * p1 d -= t1 d > 0 p += d * p1 d = 0 @TO@ block_content@@ @AT@ 370 @LENGTH@ 52\n" +
+                "---------MOV if_stmt@@d >= t2 p += t2 * p2 d -= t2 d > 0 p += d * p2 d = 0 @TO@ block_content@@ @AT@ 616 @LENGTH@ 52\n" +
+                "---------MOV if_stmt@@d > 0 p += d * p3 @TO@ block_content@@ @AT@ 855 @LENGTH@ 17\n" +
+                "---------MOV expr_stmt@@p += p1 * ( e - c ) @TO@ block_content@@ @AT@ 888 @LENGTH@ 19\n" +
+                "---------MOV expr_stmt@@a = c @TO@ block_content@@ @AT@ 917 @LENGTH@ 5\n" +
+                "---------MOV expr_stmt@@b = e @TO@ block_content@@ @AT@ 938 @LENGTH@ 5\n");
     }
 
     //10-A-4557108-4561236
@@ -611,11 +646,12 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("10-A-4557108-4561236.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if m > t1 && m < t2 p += p2 * ( m - t1 ) @TO@ if m > t1 && m - t1 < t2 p += p2 * ( m - t1 ) @AT@ 502 @LENGTH@ 40\n" +
-                "---UPD condition@@m > t1 && m < t2 @TO@ m > t1 && m - t1 < t2 @AT@ 502 @LENGTH@ 16\n" +
-                "------UPD expr@@m > t1 && m < t2 @TO@ m > t1 && m - t1 < t2 @AT@ 503 @LENGTH@ 16\n" +
-                "---------INS operator@@- @TO@ expr@@m > t1 && m < t2 @AT@ 512 @LENGTH@ 1\n" +
-                "---------INS name@@t1 @TO@ expr@@m > t1 && m < t2 @AT@ 513 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@m - t1 >= t2 p += p2 * t2 m > t1 && m < t2 p += p2 * ( m - t1 ) @TO@ m - t1 >= t2 p += p2 * t2 m > t1 && m - t1 < t2 p += p2 * ( m - t1 ) @AT@ 469 @LENGTH@ 63\n" +
+                "---UPD if:elseif@@m > t1 && m < t2 p += p2 * ( m - t1 ) @TO@ m > t1 && m - t1 < t2 p += p2 * ( m - t1 ) @AT@ 494 @LENGTH@ 37\n" +
+                "------UPD condition@@m > t1 && m < t2 @TO@ m > t1 && m - t1 < t2 @AT@ 502 @LENGTH@ 16\n" +
+                "---------UPD expr@@m > t1 && m < t2 @TO@ m > t1 && m - t1 < t2 @AT@ 503 @LENGTH@ 16\n" +
+                "------------INS operator@@- @TO@ expr@@m > t1 && m < t2 @AT@ 512 @LENGTH@ 1\n" +
+                "------------INS name@@t1 @TO@ expr@@m > t1 && m < t2 @AT@ 513 @LENGTH@ 2\n");
     }
 
     //10-A-5914564-5914663
@@ -624,21 +660,23 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("10-A-5914564-5914663.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS else@@else power += ( a - lr - t1 ) * p2 @TO@ if@@if lr + t1 + t2 <= a power += ( t2 * p2 ) + ( a - lr - t1 - t2 ) * p3 @AT@ 501 @LENGTH@ 34\n" +
-                "---INS block@@power += ( a - lr - t1 ) * p2 @TO@ else@@else power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 29\n" +
-                "------INS expr_stmt@@power += ( a - lr - t1 ) * p2 @TO@ block@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 29\n" +
-                "---------INS expr@@power += ( a - lr - t1 ) * p2 @TO@ expr_stmt@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 29\n" +
-                "------------INS name@@power @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 5\n" +
-                "------------INS operator@@+= @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 506 @LENGTH@ 2\n" +
-                "------------INS operator@@( @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 508 @LENGTH@ 1\n" +
-                "------------INS name@@a @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 509 @LENGTH@ 1\n" +
-                "------------INS operator@@- @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 510 @LENGTH@ 1\n" +
-                "------------INS name@@lr @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 511 @LENGTH@ 2\n" +
-                "------------INS operator@@- @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 513 @LENGTH@ 1\n" +
-                "------------INS name@@t1 @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 514 @LENGTH@ 2\n" +
-                "------------INS operator@@) @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 516 @LENGTH@ 1\n" +
-                "------------INS operator@@* @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 517 @LENGTH@ 1\n" +
-                "------------INS name@@p2 @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 518 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@lr + t1 + t2 <= a power += ( t2 * p2 ) + ( a - lr - t1 - t2 ) * p3 @TO@ lr + t1 + t2 <= a power += ( t2 * p2 ) + ( a - lr - t1 - t2 ) * p3 power += ( a - lr - t1 ) * p2 @AT@ 404 @LENGTH@ 66\n" +
+                "---INS else@@power += ( a - lr - t1 ) * p2 @TO@ if_stmt@@lr + t1 + t2 <= a power += ( t2 * p2 ) + ( a - lr - t1 - t2 ) * p3 @AT@ 480 @LENGTH@ 29\n" +
+                "------INS block@@power += ( a - lr - t1 ) * p2 @TO@ else@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 29\n" +
+                "---------INS block_content@@power += ( a - lr - t1 ) * p2 @TO@ block@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 29\n" +
+                "------------INS expr_stmt@@power += ( a - lr - t1 ) * p2 @TO@ block_content@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 29\n" +
+                "---------------INS expr@@power += ( a - lr - t1 ) * p2 @TO@ expr_stmt@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 29\n" +
+                "------------------INS name@@power @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 501 @LENGTH@ 5\n" +
+                "------------------INS operator@@+= @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 506 @LENGTH@ 2\n" +
+                "------------------INS operator@@( @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 508 @LENGTH@ 1\n" +
+                "------------------INS name@@a @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 509 @LENGTH@ 1\n" +
+                "------------------INS operator@@- @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 510 @LENGTH@ 1\n" +
+                "------------------INS name@@lr @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 511 @LENGTH@ 2\n" +
+                "------------------INS operator@@- @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 513 @LENGTH@ 1\n" +
+                "------------------INS name@@t1 @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 514 @LENGTH@ 2\n" +
+                "------------------INS operator@@) @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 516 @LENGTH@ 1\n" +
+                "------------------INS operator@@* @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 517 @LENGTH@ 1\n" +
+                "------------------INS name@@p2 @TO@ expr@@power += ( a - lr - t1 ) * p2 @AT@ 518 @LENGTH@ 2\n");
     }
 
     //10-D-1434543-1434549
@@ -672,10 +710,11 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("101-A-3317973-3317996.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if sum >= k break; @TO@ if sum > k break; @AT@ 858 @LENGTH@ 18\n" +
-                "---UPD condition@@sum >= k @TO@ sum > k @AT@ 858 @LENGTH@ 8\n" +
-                "------UPD expr@@sum >= k @TO@ sum > k @AT@ 859 @LENGTH@ 8\n" +
-                "---------UPD operator@@>= @TO@ > @AT@ 862 @LENGTH@ 2\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@sum >= k break; @TO@ sum > k break; @AT@ 856 @LENGTH@ 15\n" +
+                "---UPD if@@sum >= k break; @TO@ sum > k break; @AT@ 856 @LENGTH@ 15\n" +
+                "------UPD condition@@sum >= k @TO@ sum > k @AT@ 858 @LENGTH@ 8\n" +
+                "---------UPD expr@@sum >= k @TO@ sum > k @AT@ 859 @LENGTH@ 8\n" +
+                "------------UPD operator@@>= @TO@ > @AT@ 862 @LENGTH@ 2\n");
         HierarchicalActionSet actionSet = hierarchicalActionSets.get(0);
         ITree targetTree = EDiffHelper.getTargets(actionSet,false);
         ITree actionTree = EDiffHelper.getActionTrees(actionSet);
@@ -688,11 +727,12 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("102-A-14574020-14574054.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if min printf \"%ld \\n\" min else printf \"%d\" - 1 @TO@ if min != LONG_MAX printf \"%ld \\n\" min else printf \"%d\" - 1 @AT@ 1082 @LENGTH@ 47\n" +
-                "---UPD condition@@min @TO@ min != LONG_MAX @AT@ 1082 @LENGTH@ 3\n" +
-                "------UPD expr@@min @TO@ min != LONG_MAX @AT@ 1084 @LENGTH@ 3\n" +
-                "---------INS operator@@!= @TO@ expr@@min @AT@ 1087 @LENGTH@ 2\n" +
-                "---------INS name@@LONG_MAX @TO@ expr@@min @AT@ 1089 @LENGTH@ 8\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@min printf \"%ld \\n\" min printf \"%d\" - 1 @TO@ min != LONG_MAX printf \"%ld \\n\" min printf \"%d\" - 1 @AT@ 1079 @LENGTH@ 39\n" +
+                "---UPD if@@min printf \"%ld \\n\" min @TO@ min != LONG_MAX printf \"%ld \\n\" min @AT@ 1079 @LENGTH@ 23\n" +
+                "------UPD condition@@min @TO@ min != LONG_MAX @AT@ 1082 @LENGTH@ 3\n" +
+                "---------UPD expr@@min @TO@ min != LONG_MAX @AT@ 1084 @LENGTH@ 3\n" +
+                "------------INS operator@@!= @TO@ expr@@min @AT@ 1087 @LENGTH@ 2\n" +
+                "------------INS name@@LONG_MAX @TO@ expr@@min @AT@ 1089 @LENGTH@ 8\n");
     }
 
     //102-A-9556179-9556185
@@ -706,10 +746,10 @@ public class TestRealCases extends BaseTest {
                 "------MOV name@@b ][x ][y @TO@ expr@@b ][x ][y = 1 @AT@ 244 @LENGTH@ 9\n" +
                 "------INS name@@b ][y ][x @TO@ expr@@b ][x ][y = 1 @AT@ 244 @LENGTH@ 9\n" +
                 "---------INS name@@b @TO@ name@@b ][y ][x @AT@ 244 @LENGTH@ 1\n" +
-                "---------INS index@@][y @TO@ name@@b ][y ][x @AT@ 246 @LENGTH@ 3\n" +
+                "---------INS index@@][y @TO@ name@@b ][y ][x @AT@ 245 @LENGTH@ 3\n" +
                 "------------INS expr@@[y @TO@ index@@][y @AT@ 246 @LENGTH@ 2\n" +
                 "---------------INS name@@[y @TO@ expr@@[y @AT@ 246 @LENGTH@ 2\n" +
-                "---------INS index@@][x @TO@ name@@b ][y ][x @AT@ 249 @LENGTH@ 3\n" +
+                "---------INS index@@][x @TO@ name@@b ][y ][x @AT@ 248 @LENGTH@ 3\n" +
                 "------------INS expr@@[x @TO@ index@@][x @AT@ 249 @LENGTH@ 2\n" +
                 "---------------INS name@@[x @TO@ expr@@[x @AT@ 249 @LENGTH@ 2\n" +
                 "------INS operator@@= @TO@ expr@@b ][x ][y = 1 @AT@ 262 @LENGTH@ 1\n");
@@ -720,10 +760,11 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("254-B-2751488-2751528.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if d <= 0 * m = * m - 1 * d = days ][* m @TO@ if * d <= 0 * m = * m - 1 * d = days ][* m @AT@ 197 @LENGTH@ 40\n" +
-                "---UPD condition@@d <= 0 @TO@ * d <= 0 @AT@ 197 @LENGTH@ 6\n" +
-                "------UPD expr@@d <= 0 @TO@ * d <= 0 @AT@ 198 @LENGTH@ 6\n" +
-                "---------INS operator@@* @TO@ expr@@d <= 0 @AT@ 198 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@d <= 0 * m = * m - 1 * d = days ][* m @TO@ * d <= 0 * m = * m - 1 * d = days ][* m @AT@ 195 @LENGTH@ 37\n" +
+                "---UPD if@@d <= 0 * m = * m - 1 * d = days ][* m @TO@ * d <= 0 * m = * m - 1 * d = days ][* m @AT@ 195 @LENGTH@ 37\n" +
+                "------UPD condition@@d <= 0 @TO@ * d <= 0 @AT@ 197 @LENGTH@ 6\n" +
+                "---------UPD expr@@d <= 0 @TO@ * d <= 0 @AT@ 198 @LENGTH@ 6\n" +
+                "------------INS operator@@* @TO@ expr@@d <= 0 @AT@ 198 @LENGTH@ 1\n");
     }
 
     //codeflaws_430-C-6594918-6595299.c
@@ -732,25 +773,26 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("430-C-6594918-6595299.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block@@stk ][front ++ = nn -> v v ][nn -> v -> c = 0 if cc == 1 val ][nn -> v ++ @TO@ stk ][front ++ = nn -> v v ][nn -> v -> c = 0 val ][nn -> v += val ][stk ][rear @AT@ 1733 @LENGTH@ 73\n" +
-                "---DEL if@@if cc == 1 val ][nn -> v ++ @AT@ 1832 @LENGTH@ 27\n" +
-                "------DEL condition@@cc == 1 @AT@ 1832 @LENGTH@ 7\n" +
-                "---------DEL expr@@cc == 1 @AT@ 1833 @LENGTH@ 7\n" +
-                "------------DEL name@@cc @AT@ 1833 @LENGTH@ 2\n" +
-                "------------DEL operator@@== @AT@ 1835 @LENGTH@ 2\n" +
-                "------------DEL literal:number@@1 @AT@ 1837 @LENGTH@ 1\n" +
-                "------DEL then@@val ][nn -> v ++ @AT@ 1864 @LENGTH@ 16\n" +
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD block_content@@stk ][front ++ = nn -> v v ][nn -> v -> c = 0 cc == 1 val ][nn -> v ++ @TO@ stk ][front ++ = nn -> v v ][nn -> v -> c = 0 val ][nn -> v += val ][stk ][rear @AT@ 1755 @LENGTH@ 70\n" +
+                "---DEL if_stmt@@cc == 1 val ][nn -> v ++ @AT@ 1830 @LENGTH@ 24\n" +
+                "------DEL if@@cc == 1 val ][nn -> v ++ @AT@ 1830 @LENGTH@ 24\n" +
+                "---------DEL condition@@cc == 1 @AT@ 1832 @LENGTH@ 7\n" +
+                "------------DEL expr@@cc == 1 @AT@ 1833 @LENGTH@ 7\n" +
+                "---------------DEL name@@cc @AT@ 1833 @LENGTH@ 2\n" +
+                "---------------DEL operator@@== @AT@ 1835 @LENGTH@ 2\n" +
+                "---------------DEL literal:number@@1 @AT@ 1837 @LENGTH@ 1\n" +
                 "---------DEL block@@val ][nn -> v ++ @AT@ 1864 @LENGTH@ 16\n" +
-                "---MOV expr_stmt@@val ][nn -> v ++ @TO@ block@@stk ][front ++ = nn -> v v ][nn -> v -> c = 0 if cc == 1 val ][nn -> v ++ @AT@ 1864 @LENGTH@ 16\n" +
+                "------------DEL block_content@@val ][nn -> v ++ @AT@ 1864 @LENGTH@ 16\n" +
+                "---MOV expr_stmt@@val ][nn -> v ++ @TO@ block_content@@stk ][front ++ = nn -> v v ][nn -> v -> c = 0 cc == 1 val ][nn -> v ++ @AT@ 1864 @LENGTH@ 16\n" +
                 "------UPD expr_stmt@@val ][nn -> v ++ @TO@ val ][nn -> v += val ][stk ][rear @AT@ 1864 @LENGTH@ 16\n" +
                 "---------UPD expr@@val ][nn -> v ++ @TO@ val ][nn -> v += val ][stk ][rear @AT@ 1864 @LENGTH@ 16\n" +
                 "------------INS name@@val ][stk ][rear @TO@ expr@@val ][nn -> v ++ @AT@ 1842 @LENGTH@ 16\n" +
                 "---------------INS name@@val @TO@ name@@val ][stk ][rear @AT@ 1842 @LENGTH@ 3\n" +
-                "---------------INS index@@][stk ][rear @TO@ name@@val ][stk ][rear @AT@ 1846 @LENGTH@ 12\n" +
+                "---------------INS index@@][stk ][rear @TO@ name@@val ][stk ][rear @AT@ 1845 @LENGTH@ 12\n" +
                 "------------------INS expr@@[stk ][rear @TO@ index@@][stk ][rear @AT@ 1846 @LENGTH@ 11\n" +
                 "---------------------INS name@@[stk ][rear @TO@ expr@@[stk ][rear @AT@ 1846 @LENGTH@ 11\n" +
                 "------------------------INS name@@[stk @TO@ name@@[stk ][rear @AT@ 1846 @LENGTH@ 4\n" +
-                "------------------------INS index@@][rear @TO@ name@@[stk ][rear @AT@ 1850 @LENGTH@ 6\n" +
+                "------------------------INS index@@][rear @TO@ name@@[stk ][rear @AT@ 1849 @LENGTH@ 6\n" +
                 "---------------------------INS expr@@[rear @TO@ index@@][rear @AT@ 1850 @LENGTH@ 5\n" +
                 "------------------------------INS name@@[rear @TO@ expr@@[rear @AT@ 1850 @LENGTH@ 5\n" +
                 "------------UPD operator@@++ @TO@ += @AT@ 1874 @LENGTH@ 2\n");
@@ -761,11 +803,14 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("496-A-15303159-15303846.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS expr_stmt@@max = 0 @TO@ block@@for j = 0 j < n - 1 j ++ if i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j elseif if max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @AT@ 155 @LENGTH@ 7\n" +
-                "---INS expr@@max = 0 @TO@ expr_stmt@@max = 0 @AT@ 155 @LENGTH@ 7\n" +
-                "------INS name@@max @TO@ expr@@max = 0 @AT@ 155 @LENGTH@ 3\n" +
-                "------INS operator@@= @TO@ expr@@max = 0 @AT@ 158 @LENGTH@ 1\n" +
-                "------INS literal:number@@0 @TO@ expr@@max = 0 @AT@ 159 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 1 i < n - 1 i ++ j = 0 j < n - 1 j ++ i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @TO@ i = 1 i < n - 1 i ++ max = 0 j = 0 j < n - 1 j ++ i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @AT@ 135 @LENGTH@ 163\n" +
+                "---UPD block@@j = 0 j < n - 1 j ++ i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @TO@ max = 0 j = 0 j < n - 1 j ++ i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @AT@ 153 @LENGTH@ 142\n" +
+                "------UPD block_content@@j = 0 j < n - 1 j ++ i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @TO@ max = 0 j = 0 j < n - 1 j ++ i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @AT@ 155 @LENGTH@ 142\n" +
+                "---------INS expr_stmt@@max = 0 @TO@ block_content@@j = 0 j < n - 1 j ++ i == j + 1 && max < a ][j + 2 - a ][j max = a ][j + 2 - a ][j max < a ][j + 1 - a ][j max = a ][j + 1 - a ][j b ][i = max @AT@ 155 @LENGTH@ 7\n" +
+                "------------INS expr@@max = 0 @TO@ expr_stmt@@max = 0 @AT@ 155 @LENGTH@ 7\n" +
+                "---------------INS name@@max @TO@ expr@@max = 0 @AT@ 155 @LENGTH@ 3\n" +
+                "---------------INS operator@@= @TO@ expr@@max = 0 @AT@ 158 @LENGTH@ 1\n" +
+                "---------------INS literal:number@@0 @TO@ expr@@max = 0 @AT@ 159 @LENGTH@ 1\n");
     }
 
     @Test
@@ -773,9 +818,11 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("430-B-10625991-10626001.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"INS else@@else break; @TO@ if@@if A ][start == A ][end && ( start && A ][start - 1 == A ][end ) && ( end != n - 1 && A ][start == A ][end + 1 ) count2 = 4 , start -= 2 , end += 2 elseif if ( A ][start == A ][end ) && ( start && A ][start - 1 == A ][end ) count2 = 3 , start -= 2 , end += 1 elseif if ( A ][start == A ][end ) && ( end != n - 1 && A ][start == A ][end + 1 ) count2 = 3 , start -= 1 , end += 2 @AT@ 803 @LENGTH@ 11\n" +
-                "---INS block@@break; @TO@ else@@else break; @AT@ 803 @LENGTH@ 6\n" +
-                "------INS break@@break; @TO@ block@@break; @AT@ 803 @LENGTH@ 6\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@A ][start == A ][end && ( start && A ][start - 1 == A ][end ) && ( end != n - 1 && A ][start == A ][end + 1 ) count2 = 4 , start -= 2 , end += 2 ( A ][start == A ][end ) && ( start && A ][start - 1 == A ][end ) count2 = 3 , start -= 2 , end += 1 ( A ][start == A ][end ) && ( end != n - 1 && A ][start == A ][end + 1 ) count2 = 3 , start -= 1 , end += 2 @TO@ A ][start == A ][end && ( start && A ][start - 1 == A ][end ) && ( end != n - 1 && A ][start == A ][end + 1 ) count2 = 4 , start -= 2 , end += 2 ( A ][start == A ][end ) && ( start && A ][start - 1 == A ][end ) count2 = 3 , start -= 2 , end += 1 ( A ][start == A ][end ) && ( end != n - 1 && A ][start == A ][end + 1 ) count2 = 3 , start -= 1 , end += 2 break; @AT@ 483 @LENGTH@ 353\n" +
+                "---UPD else@@ @TO@ break; @AT@ 794 @LENGTH@ 0\n" +
+                "------UPD block@@ @TO@ break; @AT@ 803 @LENGTH@ 0\n" +
+                "---------UPD block_content@@ @TO@ break; @AT@ 803 @LENGTH@ 0\n" +
+                "------------INS break@@break; @TO@ block_content@@ @AT@ 803 @LENGTH@ 6\n");
     }
     @Test
     public void test_60_A_510615_510619() throws IOException {
@@ -791,24 +838,31 @@ public class TestRealCases extends BaseTest {
         //wrong//
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("509-B-11349359-11354327.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD ternary@@j < min 1 else j - min + 1 @TO@ j <= min 1 else j - min @AT@ 368 @LENGTH@ 26\n" +
-                "---UPD condition@@j < min @TO@ j <= min @AT@ 368 @LENGTH@ 7\n" +
-                "------UPD expr@@j < min @TO@ j <= min @AT@ 368 @LENGTH@ 7\n" +
-                "---------UPD operator@@< @TO@ <= @AT@ 369 @LENGTH@ 1\n" +
-                "---UPD else@@else j - min + 1 @TO@ else j - min @AT@ 380 @LENGTH@ 16\n" +
-                "------UPD expr@@j - min + 1 @TO@ j - min @AT@ 380 @LENGTH@ 11\n" +
-                "---------DEL operator@@+ @AT@ 385 @LENGTH@ 1\n" +
-                "---------DEL literal:number@@1 @AT@ 386 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD expr_stmt@@printf \"%d \" j < min 1 j - min + 1 @TO@ printf \"%d \" j <= min 1 j - min @AT@ 355 @LENGTH@ 34\n" +
+                "---UPD expr@@printf \"%d \" j < min 1 j - min + 1 @TO@ printf \"%d \" j <= min 1 j - min @AT@ 355 @LENGTH@ 34\n" +
+                "------UPD call@@printf \"%d \" j < min 1 j - min + 1 @TO@ printf \"%d \" j <= min 1 j - min @AT@ 355 @LENGTH@ 34\n" +
+                "---------UPD argument_list@@\"%d \" j < min 1 j - min + 1 @TO@ \"%d \" j <= min 1 j - min @AT@ 361 @LENGTH@ 27\n" +
+                "------------UPD argument@@j < min 1 j - min + 1 @TO@ j <= min 1 j - min @AT@ 368 @LENGTH@ 21\n" +
+                "---------------UPD expr@@j < min 1 j - min + 1 @TO@ j <= min 1 j - min @AT@ 368 @LENGTH@ 21\n" +
+                "------------------UPD ternary@@j < min 1 j - min + 1 @TO@ j <= min 1 j - min @AT@ 368 @LENGTH@ 21\n" +
+                "---------------------UPD condition@@j < min @TO@ j <= min @AT@ 368 @LENGTH@ 7\n" +
+                "------------------------UPD expr@@j < min @TO@ j <= min @AT@ 368 @LENGTH@ 7\n" +
+                "---------------------------UPD operator@@< @TO@ <= @AT@ 369 @LENGTH@ 1\n" +
+                "---------------------UPD else@@j - min + 1 @TO@ j - min @AT@ 378 @LENGTH@ 11\n" +
+                "------------------------UPD expr@@j - min + 1 @TO@ j - min @AT@ 380 @LENGTH@ 11\n" +
+                "---------------------------DEL operator@@+ @AT@ 385 @LENGTH@ 1\n" +
+                "---------------------------DEL literal:number@@1 @AT@ 386 @LENGTH@ 1\n");
     }
     @Test
     public void test_6_C_12776326_12776346() throws IOException {
         //wrong//
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("6-C-12776326-12776346.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if n == 1 printf \"1 0\\n\" @TO@ if n == 1 printf \"1 0\\n\" return 0 @AT@ 83 @LENGTH@ 24\n" +
-                "---UPD then@@printf \"1 0\\n\" @TO@ printf \"1 0\\n\" return 0 @AT@ 94 @LENGTH@ 14\n" +
-                "------UPD block@@printf \"1 0\\n\" @TO@ printf \"1 0\\n\" return 0 @AT@ 94 @LENGTH@ 14\n" +
-                "---------MOV return@@return 0 @TO@ block@@printf \"1 0\\n\" @AT@ 111 @LENGTH@ 8\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@n == 1 printf \"1 0\\n\" @TO@ n == 1 printf \"1 0\\n\" 0 @AT@ 81 @LENGTH@ 21\n" +
+                "---UPD if@@n == 1 printf \"1 0\\n\" @TO@ n == 1 printf \"1 0\\n\" 0 @AT@ 81 @LENGTH@ 21\n" +
+                "------UPD block@@printf \"1 0\\n\" @TO@ printf \"1 0\\n\" 0 @AT@ 94 @LENGTH@ 14\n" +
+                "---------UPD block_content@@printf \"1 0\\n\" @TO@ printf \"1 0\\n\" 0 @AT@ 94 @LENGTH@ 14\n" +
+                "------------MOV return@@0 @TO@ block_content@@printf \"1 0\\n\" @AT@ 111 @LENGTH@ 1\n");
     }
 
     @Test
@@ -816,19 +870,20 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("494-A-10139010-10139025.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if sum == 0 && h > 0 flag = 0 @TO@ if ( sum == 0 && h > 0 ) || sum - h + 1 <= 0 flag = 0 @AT@ 298 @LENGTH@ 29\n" +
-                "---UPD condition@@sum == 0 && h > 0 @TO@ ( sum == 0 && h > 0 ) || sum - h + 1 <= 0 @AT@ 298 @LENGTH@ 17\n" +
-                "------UPD expr@@sum == 0 && h > 0 @TO@ ( sum == 0 && h > 0 ) || sum - h + 1 <= 0 @AT@ 299 @LENGTH@ 17\n" +
-                "---------INS operator@@( @TO@ expr@@sum == 0 && h > 0 @AT@ 299 @LENGTH@ 1\n" +
-                "---------INS operator@@) @TO@ expr@@sum == 0 && h > 0 @AT@ 313 @LENGTH@ 1\n" +
-                "---------INS operator@@|| @TO@ expr@@sum == 0 && h > 0 @AT@ 315 @LENGTH@ 2\n" +
-                "---------INS name@@sum @TO@ expr@@sum == 0 && h > 0 @AT@ 318 @LENGTH@ 3\n" +
-                "---------INS operator@@- @TO@ expr@@sum == 0 && h > 0 @AT@ 321 @LENGTH@ 1\n" +
-                "---------INS name@@h @TO@ expr@@sum == 0 && h > 0 @AT@ 322 @LENGTH@ 1\n" +
-                "---------INS operator@@+ @TO@ expr@@sum == 0 && h > 0 @AT@ 323 @LENGTH@ 1\n" +
-                "---------INS literal:number@@1 @TO@ expr@@sum == 0 && h > 0 @AT@ 324 @LENGTH@ 1\n" +
-                "---------INS operator@@<= @TO@ expr@@sum == 0 && h > 0 @AT@ 325 @LENGTH@ 2\n" +
-                "---------INS literal:number@@0 @TO@ expr@@sum == 0 && h > 0 @AT@ 327 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@sum == 0 && h > 0 flag = 0 @TO@ ( sum == 0 && h > 0 ) || sum - h + 1 <= 0 flag = 0 @AT@ 296 @LENGTH@ 26\n" +
+                "---UPD if@@sum == 0 && h > 0 flag = 0 @TO@ ( sum == 0 && h > 0 ) || sum - h + 1 <= 0 flag = 0 @AT@ 296 @LENGTH@ 26\n" +
+                "------UPD condition@@sum == 0 && h > 0 @TO@ ( sum == 0 && h > 0 ) || sum - h + 1 <= 0 @AT@ 298 @LENGTH@ 17\n" +
+                "---------UPD expr@@sum == 0 && h > 0 @TO@ ( sum == 0 && h > 0 ) || sum - h + 1 <= 0 @AT@ 299 @LENGTH@ 17\n" +
+                "------------INS operator@@( @TO@ expr@@sum == 0 && h > 0 @AT@ 299 @LENGTH@ 1\n" +
+                "------------INS operator@@) @TO@ expr@@sum == 0 && h > 0 @AT@ 313 @LENGTH@ 1\n" +
+                "------------INS operator@@|| @TO@ expr@@sum == 0 && h > 0 @AT@ 315 @LENGTH@ 2\n" +
+                "------------INS name@@sum @TO@ expr@@sum == 0 && h > 0 @AT@ 318 @LENGTH@ 3\n" +
+                "------------INS operator@@- @TO@ expr@@sum == 0 && h > 0 @AT@ 321 @LENGTH@ 1\n" +
+                "------------INS name@@h @TO@ expr@@sum == 0 && h > 0 @AT@ 322 @LENGTH@ 1\n" +
+                "------------INS operator@@+ @TO@ expr@@sum == 0 && h > 0 @AT@ 323 @LENGTH@ 1\n" +
+                "------------INS literal:number@@1 @TO@ expr@@sum == 0 && h > 0 @AT@ 324 @LENGTH@ 1\n" +
+                "------------INS operator@@<= @TO@ expr@@sum == 0 && h > 0 @AT@ 325 @LENGTH@ 2\n" +
+                "------------INS literal:number@@0 @TO@ expr@@sum == 0 && h > 0 @AT@ 327 @LENGTH@ 1\n");
     }
 
     @Test
@@ -854,16 +909,11 @@ public class TestRealCases extends BaseTest {
 
         List<HierarchicalActionSet> hierarchicalActionSets = getHierarchicalActionSets("31-B-14288247-14288278.c");
         Assert.assertEquals(hierarchicalActionSets.size(), 1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD expr_stmt@@printf \"%3d\\n\" suf ][n % P @TO@ printf \"%.*d\\n\" 3 suf ][n % P @AT@ 334 @LENGTH@ 26\n" +
-                "---UPD expr@@printf \"%3d\\n\" suf ][n % P @TO@ printf \"%.*d\\n\" 3 suf ][n % P @AT@ 334 @LENGTH@ 26\n" +
-                "------UPD call@@printf \"%3d\\n\" suf ][n % P @TO@ printf \"%.*d\\n\" 3 suf ][n % P @AT@ 334 @LENGTH@ 26\n" +
-                "---------UPD argument_list@@\"%3d\\n\" suf ][n % P @TO@ \"%.*d\\n\" 3 suf ][n % P @AT@ 341 @LENGTH@ 19\n" +
-                "------------UPD argument@@\"%3d\\n\" @TO@ \"%.*d\\n\" @AT@ 342 @LENGTH@ 7\n" +
-                "---------------UPD expr@@\"%3d\\n\" @TO@ \"%.*d\\n\" @AT@ 342 @LENGTH@ 7\n" +
-                "------------------UPD literal:string@@\"%3d\\n\" @TO@ \"%.*d\\n\" @AT@ 342 @LENGTH@ 7\n" +
-                "------------INS argument@@3 @TO@ argument_list@@\"%3d\\n\" suf ][n % P @AT@ 352 @LENGTH@ 1\n" +
-                "---------------INS expr@@3 @TO@ argument@@3 @AT@ 352 @LENGTH@ 1\n" +
-                "------------------INS literal:number@@3 @TO@ expr@@3 @AT@ 352 @LENGTH@ 1\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if_stmt@@* p == '@' p - q < 3 break; q = p @TO@ * p == '@' p - q < 3 break; q = p ms = 1 @AT@ 131 @LENGTH@ 33\n" +
+                "---UPD if@@* p == '@' p - q < 3 break; q = p @TO@ * p == '@' p - q < 3 break; q = p ms = 1 @AT@ 131 @LENGTH@ 33\n" +
+                "------UPD block@@p - q < 3 break; q = p @TO@ p - q < 3 break; q = p ms = 1 @AT@ 147 @LENGTH@ 22\n" +
+                "---------UPD block_content@@p - q < 3 break; q = p @TO@ p - q < 3 break; q = p ms = 1 @AT@ 147 @LENGTH@ 22\n" +
+                "------------MOV expr_stmt@@ms = 1 @TO@ block_content@@p - q < 3 break; q = p @AT@ 181 @LENGTH@ 6\n");
     }
 
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index ed2c912..4f7ea85 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,12 +1,13 @@
 java:
     8home:  /Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home
 spinfer:
-    home:   /Users/anilkoyuncu/projects/fixminer/spinfer/spinfer.native
+    home:   /Users/anil.koyuncu/projects/fixminer/spinfer/spinfer.native
 coccinelle:
-    home:   /Users/anilkoyuncu/projects/fixminer/spinfer/statics
+    home:   /Users/anil.koyuncu/projects/fixminer/spinfer/statics
 
 dataset:
 #    home:   /Users/anilkoyuncu/projects/fixminer/fixminer-core/python/data/gumInputLinux
+
     inputPath : /Users/anil.koyuncu/projects/release/fixminer-data/patches
     repo:   /Users/anil.koyuncu/projects/release/fixminer-data/datasets
 
@@ -15,6 +16,7 @@ fixminer:
     datapath: /Users/anil.koyuncu/projects/release/fixminer-data/
 
 
+
     pjName : patches
     portDumps : 6399
     numOfWorkers : 14
@@ -22,6 +24,7 @@ fixminer:
     hunkLimit : 2
     patchSize : 50
 
+
     projectList : fuse
     inputPath : /Users/anil.koyuncu/projects/release/fixminer-data/patches
     redisPath : /Users/anil.koyuncu/projects/release/fixminer_source/python/data/redis