Restructure of ast/parser [not working]

Author: Kalashnikovni

ast/expr.cpp

@@ -42,18 +42,10 @@ struct UnaryOp;
 struct BinOp;
 struct Call;
 struct Interval;
-struct InterUnaryOp;
-struct InterBinOp;
 struct MultiDimInter;
-struct MDInterUnaryOp;
-struct MDInterBinOp;
 struct Set;
-struct SetUnaryOp;
-struct SetBinOp;
 struct LinearExp;
-struct LExpBinOp;
 struct MDLExp;
-struct MDLExpBinOp;
 struct LinearMap;
 struct PWLMap;
 struct SBG;
@@ -67,18 +59,10 @@ typedef boost::variant<Natural, VariableName,
   boost::recursive_wrapper<BinOp>, 
   boost::recursive_wrapper<Call>, 
   boost::recursive_wrapper<Interval>, 
-  boost::recursive_wrapper<InterUnaryOp>,
-  boost::recursive_wrapper<InterBinOp>,
   boost::recursive_wrapper<MultiDimInter>,
-  boost::recursive_wrapper<MDInterUnaryOp>,
-  boost::recursive_wrapper<MDInterBinOp>,
   boost::recursive_wrapper<Set>,
-  boost::recursive_wrapper<SetUnaryOp>,
-  boost::recursive_wrapper<SetBinOp>,
   boost::recursive_wrapper<LinearExp>,
-  boost::recursive_wrapper<LExpBinOp>,
   boost::recursive_wrapper<MDLExp>,
-  boost::recursive_wrapper<MDLExpBinOp>,
   boost::recursive_wrapper<LinearMap>,
   boost::recursive_wrapper<PWLMap>,
   boost::recursive_wrapper<SBG>,
@@ -89,6 +73,10 @@ std::ostream &operator<<(std::ostream &out, const ExprList &el);
 template <typename T>
 inline bool is(Expr e) { return e.type() == typeid(T); }
 
+////////////////////////////////////////////////////////////////////////////////
+// Arithmetic expressions ------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
+
 struct Rational {
   member_class(Expr, num);
   member_class(Expr, den);
@@ -100,54 +88,9 @@ struct Rational {
 };
 std::ostream &operator<<(std::ostream &out, const Rational &op);
 
-enum class UnOp { neg };
-std::ostream &operator<<(std::ostream &out, const UnOp &op);
-
-struct UnaryOp {
-  member_class(UnOp, op);
-  member_class(Expr, expr);
-
-  UnaryOp();
-  UnaryOp(UnOp op, Expr expr);
-
- bool operator==(const UnaryOp &uop) const;
-};
-std::ostream &operator<<(std::ostream &out, const UnaryOp &uop);
-
-enum class Op { add, sub, mult, div, expo };
-std::ostream &operator<<(std::ostream &out, const Op &op);
-
-struct BinOp {
-  member_class(Expr, left);
-  member_class(Op, op);
-  member_class(Expr, right);
-
-  BinOp();
-  BinOp(Expr left, Op op, Expr right);
-
-  bool operator==(const BinOp &bop) const;
-};
-std::ostream &operator<<(std::ostream &out, const BinOp &bop);
-
-struct Call {
-  member_class(Name, name);
-  member_class(ExprList, args);
-
-  Call();
-  Call(Name name, Expr args);
-  Call(Name name, ExprList args);
-
-  bool operator==(const Call &c) const;
-};
-std::ostream &operator<<(std::ostream &out, const Call &c);
-
+////////////////////////////////////////////////////////////////////////////////
 // SBG structures --------------------------------------------------------------
-
-enum class ContainerUOp { card, comp };
-std::ostream &operator<<(std::ostream &out, const ContainerUOp &op);
-
-enum class ContainerOp { eq, less, cap, diff, cup };
-std::ostream &operator<<(std::ostream &out, const ContainerOp &op);
+////////////////////////////////////////////////////////////////////////////////
 
 // Intervals -------------------------------------------------------------------
 
@@ -163,29 +106,6 @@ struct Interval {
 };
 std::ostream &operator<<(std::ostream &out, const Interval &i);
 
-struct InterUnaryOp {
-  member_class(ContainerUOp, op);
-  member_class(Expr, e);
-
-  InterUnaryOp();
-  InterUnaryOp(ContainerUOp op, Expr e);
-
-  bool operator==(const InterUnaryOp &iuop) const;
-};
-std::ostream &operator<<(std::ostream &out, const InterUnaryOp &i);
-
-struct InterBinOp {
-  member_class(Expr, left);
-  member_class(ContainerOp, op);
-  member_class(Expr, right);
-
-  InterBinOp();
-  InterBinOp(Expr left, ContainerOp op, Expr right);
-
-  bool operator==(const InterBinOp &ibop) const;
-};
-std::ostream &operator<<(std::ostream &out, const InterBinOp &i);
-
 // Multi-dimensional intervals -------------------------------------------------
 
 struct MultiDimInter {
@@ -198,29 +118,6 @@ struct MultiDimInter {
 };
 std::ostream &operator<<(std::ostream &out, const MultiDimInter &mdi);
 
-struct MDInterUnaryOp {
-  member_class(ContainerUOp, op);
-  member_class(Expr, e);
-
-  MDInterUnaryOp();
-  MDInterUnaryOp(ContainerUOp op, Expr e);
-
-  bool operator==(const MDInterUnaryOp &mdiuop) const;
-};
-std::ostream &operator<<(std::ostream &out, const MDInterUnaryOp &mdi);
-
-struct MDInterBinOp {
-  member_class(Expr, left);
-  member_class(ContainerOp, op);
-  member_class(Expr, right);
-
-  MDInterBinOp();
-  MDInterBinOp(Expr left, ContainerOp op, Expr right);
-
-  bool operator==(const MDInterBinOp &bop) const;
-};
-std::ostream &operator<<(std::ostream &out, const MDInterBinOp &mdi);
-
 // Sets ------------------------------------------------------------------------
 
 struct Set {
@@ -233,29 +130,6 @@ struct Set {
 };
 std::ostream &operator<<(std::ostream &out, const Set &s); 
 
-struct SetUnaryOp {
-  member_class(ContainerUOp, op);
-  member_class(Expr, e);
-
-  SetUnaryOp();
-  SetUnaryOp(ContainerUOp op, Expr e);
-
-  bool operator==(const SetUnaryOp &uop) const;
-};
-std::ostream &operator<<(std::ostream &out, const SetUnaryOp &s);
-
-struct SetBinOp {
-  member_class(Expr, left);
-  member_class(ContainerOp, op);
-  member_class(Expr, right);
-
-  SetBinOp();
-  SetBinOp(Expr left, ContainerOp op, Expr right);
-
-  bool operator==(const SetBinOp &bop) const;
-};
-std::ostream &operator<<(std::ostream &out, const SetBinOp &s);
-
 // Linear expression -----------------------------------------------------------
 
 struct LinearExp {
@@ -269,21 +143,6 @@ struct LinearExp {
 };
 std::ostream &operator<<(std::ostream &out, const LinearExp &le);
 
-enum class ExpOp { eq, add, sub };
-std::ostream &operator<<(std::ostream &out, const ExpOp &op);
-
-struct LExpBinOp {
-  member_class(Expr, left);
-  member_class(ExpOp, op);
-  member_class(Expr, right);
-
-  LExpBinOp();
-  LExpBinOp(Expr left, ExpOp op, Expr right);
-
-  bool operator==(const LExpBinOp &bop) const;
-};
-std::ostream &operator<<(std::ostream &out, const LExpBinOp &lbop);
-
 // Multi-dimensional linear expression -----------------------------------------
 
 struct MDLExp {
@@ -296,18 +155,6 @@ struct MDLExp {
 };
 std::ostream &operator<<(std::ostream &out, const MDLExp &le);
 
-struct MDLExpBinOp {
-  member_class(Expr, left);
-  member_class(ExpOp, op);
-  member_class(Expr, right);
-
-  MDLExpBinOp();
-  MDLExpBinOp(Expr left, ExpOp op, Expr right);
-
-  bool operator==(const MDLExpBinOp &bop) const;
-};
-std::ostream &operator<<(std::ostream &out, const MDLExpBinOp &lbop);
-
 // SBG map ---------------------------------------------------------------------
 
 struct LinearMap {
@@ -367,6 +214,51 @@ struct DSBG {
 };
 std::ostream &operator<<(std::ostream &out, const DSBG &g);
 
+////////////////////////////////////////////////////////////////////////////////
+// Composite expressions -------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
+
+enum class UnOp { neg, card, comp };
+std::ostream &operator<<(std::ostream &out, const UnOp &op);
+
+struct UnaryOp {
+  member_class(UnOp, op);
+  member_class(Expr, expr);
+
+  UnaryOp();
+  UnaryOp(UnOp op, Expr expr);
+
+ bool operator==(const UnaryOp &uop) const;
+};
+std::ostream &operator<<(std::ostream &out, const UnaryOp &uop);
+
+enum class Op { add, sub, mult, expo, eq, less, cap, cup, diff };
+std::ostream &operator<<(std::ostream &out, const Op &op);
+
+struct BinOp {
+  member_class(Expr, left);
+  member_class(Op, op);
+  member_class(Expr, right);
+
+  BinOp();
+  BinOp(Expr left, Op op, Expr right);
+
+  bool operator==(const BinOp &bop) const;
+};
+std::ostream &operator<<(std::ostream &out, const BinOp &bop);
+
+struct Call {
+  member_class(Name, name);
+  member_class(ExprList, args);
+
+  Call();
+  Call(Name name, Expr args);
+  Call(Name name, ExprList args);
+
+  bool operator==(const Call &c) const;
+};
+std::ostream &operator<<(std::ostream &out, const Call &c);
+
 } // namespace AST
 
 } // namespace SBG

ast/expr.hpp

@@ -12,7 +12,6 @@ all: $(EVAL)
 EVAL_SRC := \
 	  $(EVAL_DIR)/main.cpp \
     $(VISIT_DIR)/program_visitor.cpp \
-    $(VISIT_DIR)/check_opt_conds.cpp \
     $(VISIT_DIR)/stm_visitor.cpp \
     $(VISIT_DIR)/eval_expr.cpp \
     $(VISIT_DIR)/eval_dsbg.cpp \