Further drastic simplications of the output mechanism.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 95c282a00d4fa46d3d52c5a6035600375f4e6e3d..33de680e2b7df771b7f6f0098d6650baab643f41 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -91,6 +91,7 @@ struct CYOutput {
     }
 
     void Check(char value);
+    void Terminate();
 
     CYOutput &operator <<(char rhs);
     CYOutput &operator <<(const char *rhs);
@@ -105,9 +106,6 @@ struct CYOutput {
         rhs.Output(*this);
         return *this;
     }
-
-    void Indent();
-    void Space();
 };
 
 struct CYPropertyName {
@@ -196,12 +194,8 @@ struct CYStatement :
         labels_ = new CYLabel(identifier, labels_);
     }
 
-    virtual bool IsBlock() const {
-        return next_ != NULL;
-    }
-
-    virtual void Single(CYOutput &out, CYFlags flags) const;
-    virtual void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
+    bool Single(CYOutput &out, CYFlags flags) const;
+    void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 
   private:
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
@@ -217,10 +211,6 @@ struct CYBlock :
     {
     }
 
-    virtual bool IsBlock() const {
-        return true;
-    }
-
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };