Commit 3ff284b4 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Remove useless output from MatlabParser now. 

Now that Matlab parsing is pretty much all done, remove extra output.

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_javization@10708 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 43736f20

Matlab2SMT/src/main/java/ca/mcmaster/cas/matlab2smt/MatlabParser.java

+0 −37
Original line number Diff line number Diff line
@@ -90,12 +90,10 @@ final public class MatlabParser implements MatlabExpressionWithSubExpression { 
    }



    private void addExpressionValue(MatlabExpressionValue expressionValue) {

        System.out.println("" + m_level + " " + m_opStack.peekFirst().level);

        m_opStack.peekFirst().op.setSubExpression(expressionValue);

    }



    private void addExpressionBinaryOperation(MatlabExpressionBinaryOperation op) {

        System.out.println("" + m_level + " " + m_opStack.peekFirst().level);

        if (m_rootExpression == null) {

            throw new IllegalStateException("It should not be possible to have"

                    + "an op where the left hand side is a null expression!");
@@ -112,7 +110,6 @@ final public class MatlabParser implements MatlabExpressionWithSubExpression { 
    }



    private void addPrefixUnaryOperation(MatlabExpressionUnaryOperation op) {

        System.out.println("" + m_level + " " + m_opStack.peekFirst().level);

        /* Unlike Binary operations, unary operations just always insert

         * themselves into the operation stack exactly where they appear.

         * The whole left hand side handling never happens, since there is no
@@ -139,13 +136,11 @@ final public class MatlabParser implements MatlabExpressionWithSubExpression { 


        @Override

        public void enterE0(E0Context ctx) {

            System.out.println("In E0");

            incrementLevel();

        }



        @Override

        public void enterE1(E1Context ctx) {

            System.out.println("In E1");

            incrementLevel();

            if (ctx.LOG_OR().size() > 0) {

                enqueHiddenOp(MatlabBinaryOperation.BooleanOr, ctx.LOG_OR().size());
@@ -154,7 +149,6 @@ final public class MatlabParser implements MatlabExpressionWithSubExpression { 


        @Override

        public void enterE2(E2Context ctx) {

            System.out.println("In E2");

            incrementLevel();

            if (ctx.LOG_AND().size() > 0) {

                enqueHiddenOp(MatlabBinaryOperation.BooleanAnd, ctx.LOG_AND().size());
@@ -163,127 +157,106 @@ final public class MatlabParser implements MatlabExpressionWithSubExpression { 


        @Override

        public void enterE3(E3Context ctx) {

            System.out.println("In E3");

            incrementLevel();

        }



        @Override

        public void enterE4(E4Context ctx) {

            System.out.println("In E4");

            incrementLevel();

        }



        @Override

        public void enterE5(E5Context ctx) {

            System.out.println("In E5");

            incrementLevel();

        }



        @Override

        public void enterE6(E6Context ctx) {

            System.out.println("In E6");

            incrementLevel();

        }



        @Override

        public void enterE7(E7Context ctx) {

            System.out.println("In E7");

            incrementLevel();

        }



        @Override

        public void enterE8(E8Context ctx) {

            System.out.println("In E8");

            incrementLevel();

        }



        @Override

        public void enterE9(E9Context ctx) {

            System.out.println("In E9");

            incrementLevel();

        }



        @Override

        public void enterE10(E10Context ctx) {

            System.out.println("In E10");

            incrementLevel();

        }



        @Override

        public void enterE11(E11Context ctx) {

            System.out.println("In E11");

            incrementLevel();

        }



        @Override

        public void exitE0(E0Context ctx) {

            System.out.println("Out E0");

            decrementLevel();

        }



        @Override

        public void exitE1(E1Context ctx) {

            System.out.println("Out E1");

            decrementLevel();

        }



        @Override

        public void exitE2(E2Context ctx) {

            System.out.println("Out E2");

            decrementLevel();

        }



        @Override

        public void exitE3(E3Context ctx) {

            System.out.println("Out E3");

            decrementLevel();

        }



        @Override

        public void exitE4(E4Context ctx) {

            System.out.println("Out E4");

            decrementLevel();

        }



        @Override

        public void exitE5(E5Context ctx) {

            System.out.println("Out E5");

            decrementLevel();

        }



        @Override

        public void exitE6(E6Context ctx) {

            System.out.println("Out E6");

            decrementLevel();

        }



        @Override

        public void exitE7(E7Context ctx) {

            System.out.println("Out E7");

            decrementLevel();

        }



        @Override

        public void exitE8(E8Context ctx) {

            System.out.println("Out E8");

            decrementLevel();

        }



        @Override

        public void exitE9(E9Context ctx) {

            System.out.println("Out E9");

            decrementLevel();

        }



        @Override

        public void exitE10(E10Context ctx) {

            System.out.println("Out E10");

            decrementLevel();

        }



        @Override

        public void exitE11(E11Context ctx) {

            System.out.println("Out E11");

            decrementLevel();

        }
@@ -309,26 +282,18 @@ final public class MatlabParser implements MatlabExpressionWithSubExpression { 


        @Override

        public void exitG1(G1Context ctx) {

            System.out.print("op e ");

            System.out.println(ctx.getText());

        }



        @Override

        public void exitG2(G2Context ctx) {

            System.out.println("op ex");

            System.out.println(ctx.getText());

        }



        @Override

        public void exitG3(G3Context ctx) {

            System.out.println("op ex");

            System.out.println(ctx.getText());

        }



        @Override

        public void exitG4(G4Context ctx) {

            System.out.println("op ex");

            System.out.println(ctx.getText());

        }



        @Override
@@ -338,8 +303,6 @@ final public class MatlabParser implements MatlabExpressionWithSubExpression { 


        @Override

        public void exitPrefix_operator(Prefix_operatorContext ctx) {

            System.out.print("prefix ");

            System.out.println(ctx.getText());

        }



        @Override