Commit adf83114 authored by Yanjun Jiang's avatar Yanjun Jiang Committed by Matthew Dawson
Browse files

Put the correct file name in the refinement relation XML tag. 

The file name that was used in the refinement relation tag was being
incorrectly generated as tablenameMi, where tablename was the tablename,
and i was the refinement layer.  However, the actual files were called
tablename_Mi.  Fix this by using the same function to generate the name,
and standardize on the tablename_Mi notation.
parent 6eb468b6

src/main/java/ca/mcscert/jtet/eventbgenerator/EventBTableGenerator.java

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ final public class EventBTableGenerator { 
        String fullName = folderPath;



        if (m_refineMode == RefinementMode.WithRefinement) {

            fullName += m_table.getTableName() + "_M" + no + ".bum";

            fullName += generateFileName(no) + ".bum";

        } else {

            fullName += m_table.getTableName()  + ".bum";

        }
@@ -118,7 +118,7 @@ final public class EventBTableGenerator { 
    }



    private String generateFileName(int fileNo) {

        return m_table.getTableName() + "M" + fileNo;

        return m_table.getTableName() + "_M" + fileNo;

    }



    private String generateFileRefineRelation(int refinerFileNo) {

src/test/resources/expected/WR/momThreeLayerTable/momThreeLayerTable_M1.bum

+1 −1
Original line number Diff line number Diff line
@@ -61,5 +61,5 @@ 
<org.eventb.core.action name="Action2" org.eventb.core.assignment="n ≔ 8" org.eventb.core.label="act2"/>

<org.eventb.core.refinesEvent name="evt3" org.eventb.core.target="evt3"/>

</org.eventb.core.event>

<org.eventb.core.refinesMachine name="momThreeLayerTableM1" org.eventb.core.target="momThreeLayerTableM0"/>

<org.eventb.core.refinesMachine name="momThreeLayerTable_M1" org.eventb.core.target="momThreeLayerTable_M0"/>

</org.eventb.core.machineFile>
 
 No newline at end of file

src/test/resources/expected/WR/momThreeLayerTable/momThreeLayerTable_M2.bum

+1 −1
Original line number Diff line number Diff line
@@ -78,5 +78,5 @@ 
<org.eventb.core.action name="Action2" org.eventb.core.assignment="n ≔ 8" org.eventb.core.label="act2"/>

<org.eventb.core.refinesEvent name="evt3_3" org.eventb.core.target="evt3_3"/>

</org.eventb.core.event>

<org.eventb.core.refinesMachine name="momThreeLayerTableM2" org.eventb.core.target="momThreeLayerTableM1"/>

<org.eventb.core.refinesMachine name="momThreeLayerTable_M2" org.eventb.core.target="momThreeLayerTable_M1"/>

</org.eventb.core.machineFile>
 
 No newline at end of file

src/test/resources/expected/WR/threeLayerTable/threeLayerTable_M1.bum

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ 
<org.eventb.core.action name="Action1" org.eventb.core.assignment="output ≔ 8" org.eventb.core.label="act1"/>

<org.eventb.core.refinesEvent name="evt3" org.eventb.core.target="evt3"/>

</org.eventb.core.event>

<org.eventb.core.refinesMachine name="threeLayerTableM1" org.eventb.core.target="threeLayerTableM0"/>

<org.eventb.core.refinesMachine name="threeLayerTable_M1" org.eventb.core.target="threeLayerTable_M0"/>

</org.eventb.core.machineFile>
 
 No newline at end of file

src/test/resources/expected/WR/threeLayerTable/threeLayerTable_M2.bum

+1 −1
Original line number Diff line number Diff line
@@ -67,5 +67,5 @@ 
<org.eventb.core.action name="Action1" org.eventb.core.assignment="output ≔ 8" org.eventb.core.label="act1"/>

<org.eventb.core.refinesEvent name="evt3_3" org.eventb.core.target="evt3_3"/>

</org.eventb.core.event>

<org.eventb.core.refinesMachine name="threeLayerTableM2" org.eventb.core.target="threeLayerTableM1"/>

<org.eventb.core.refinesMachine name="threeLayerTable_M2" org.eventb.core.target="threeLayerTable_M1"/>

</org.eventb.core.machineFile>
 
 No newline at end of file