Commit ebcd28b3 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Add predicate subtypes to the SAL generator. 

Add the necessary logic to generate predicate subtypes to SAL, along with
hooking up the usual tests to verify it all works correctly.
parent a8c51028

src/main/java/ca/mcscert/jtet/expression/SALGenerator.java

+14 −4
Original line number Diff line number Diff line
@@ -106,10 +106,20 @@ public class SALGenerator implements CheckerGenerator { 


        // Generate all the variables.

        for(Variable var : vars.values()) {

            ret.append(var.outputName())

            ret.append(var.outputName()).append(":");

            VariableType type = var.type();

            if (type.subtypePredicate() == null) {

                ret.append(GenerateVariableType(type));

            } else {

                ret.append("{")

                        .append(var.outputName())

                        .append(":")

                    .append(GenerateVariableType(var.type()))

                    .append("\n");

                        .append(GenerateVariableType(type))

                        .append("|")

                        .append(type.subtypePredicate().getCheckerOutput(this, BooleanVariableType.Type))

                        .append("}");

            }

            ret.append("\n");

        }



        return ret.toString();

src/test/java/ca/mcscert/jtet/expression/GenericVariableDeclarationGeneratorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class GenericVariableDeclarationGeneratorTest { 
                {new SALGenerator(),

                        "x:REAL\n",

                        "new_x_name:REAL\n",

                        null,

                        "x:{x:REAL|(x > 0)}\n",

                        "x:BOOLEAN\n",

                        null,

                        null,