Isolate linkage of libreadline and libtermcap.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index ba896b7db8299773de98d0b772d42bac4794f08b..c9614ed604a6e734f09e711b451fa4fc952ff906 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -39,7 +39,7 @@
 #include "Pooling.hpp"
 #include "Options.hpp"
 
 #include "Pooling.hpp"
 #include "Options.hpp"
 

-class CYContext;
+struct CYContext;

 
 struct CYThing {
     virtual ~CYThing() {
 
 struct CYThing {
     virtual ~CYThing() {


@@ -469,6 +469,27 @@ enum CYState {
     CYNewLine
 };
 
     CYNewLine
 };
 

+class CYStream :
+    public std::istream
+{
+  private:
+    class CYBuffer :
+        public std::streambuf
+    {
+      public:
+        CYBuffer(const char *start, const char *end) {
+            setg(const_cast<char *>(start), const_cast<char *>(start), const_cast<char *>(end));
+        }
+    } buffer_;
+
+  public:
+    CYStream(const char *start, const char *end) :
+        std::istream(&buffer_),
+        buffer_(start, end)
+    {
+    }
+};
+

 class CYDriver {
   public:
     void *scanner_;
 class CYDriver {
   public:
     void *scanner_;


@@ -482,11 +503,10 @@ class CYDriver {
         bool OpenBrace;
     } no_;
 
         bool OpenBrace;
     } no_;
 

-    const char *data_;
-    size_t size_;
-    FILE *file_;
+    std::istream &data_;

 
     bool strict_;
 
     bool strict_;

+    bool commented_;

 
     enum Condition {
         RegExpCondition,
 
     enum Condition {
         RegExpCondition,


@@ -539,7 +559,7 @@ class CYDriver {
     void ScannerDestroy();
 
   public:
     void ScannerDestroy();
 
   public:

-    CYDriver(const std::string &filename = "");
+    CYDriver(std::istream &data, const std::string &filename = "");

     ~CYDriver();
 
     Condition GetCondition();
     ~CYDriver();
 
     Condition GetCondition();