Changeset 122 for pjproject/trunk/pjlib/include/pj++/scanner.hpp

Timestamp:

Jan 18, 2006 11:32:27 PM (18 years ago)

Author:

bennylp

Message:

Fixed minor warnings/mismatched comments mainly in pjlib++

File:

• pjproject/trunk/pjlib/include/pj++/scanner.hpp (modified) (6 diffs)

pjproject/trunk/pjlib/include/pj++/scanner.hpp

@@ -23 +23 @@
 #include <pj++/string.hpp>
 
-class Pj_Char_Spec
+class Pj_Cis;
+class Pj_Cis_Buffer;
+class Pj_Scanner;
+
+class Pj_Cis_Buffer
 {
+    friend class Pj_Cis;
+
 public:
-    Pj_Char_Spec() { pj_cs_init(cs__); }
-
-    void set(int c) { pj_cs_set(cs__, c); }
-    void add_range(int begin, int end) { pj_cs_add_range(cs__, begin, end); }
-    void add_alpha() { pj_cs_add_alpha(cs__); }
-    void add_num() { pj_cs_add_num(cs__); }
-    void add_str(const char *str) { pj_cs_add_str(cs__, str); }
-    void del_range(int begin, int end) { pj_cs_del_range(cs__, begin, end); }
-    void del_str(const char *str) { pj_cs_del_str(cs__, str); }
-    void invert() { pj_cs_invert(cs__); }
-    int  match(int c) { return pj_cs_match(cs__, c); }
-
-    pj_char_spec_element_t *cs_()
-    {
-        return cs__;
-    }
-
-    const pj_char_spec_element_t *cs_() const
-    {
-        return cs__;
+    Pj_Cis_Buffer() 
+    { 
+        pj_cis_buf_init(&buf_); 
     }
 
 private:
-    pj_char_spec cs__;
+    pj_cis_buf_t buf_;
 };
+
+
+class Pj_Cis
+{
+    friend class Pj_Scanner;
+
+public:
+    Pj_Cis(Pj_Cis_Buffer *buf)
+    {
+        pj_cis_init(&buf->buf_, &cis_);
+    }
+
+    Pj_Cis(const Pj_Cis &rhs)
+    {
+        pj_cis_dup(&cis_, (pj_cis_t*)&rhs.cis_);
+    }
+
+    void add_range(int start, int end)
+    {
+        pj_cis_add_range(&cis_, start, end);
+    }
+
+    void add_alpha()
+    {
+        pj_cis_add_alpha(&cis_);
+    }
+
+    void add_num()
+    {
+        pj_cis_add_num(&cis_);
+    }
+
+    void add_str(const char *str)
+    {
+        pj_cis_add_str(&cis_, str);
+    }
+
+    void add_cis(const Pj_Cis &rhs)
+    {
+        pj_cis_add_cis(&cis_, &rhs.cis_);
+    }
+
+    void del_range(int start, int end)
+    {
+        pj_cis_del_range(&cis_, start, end);
+    }
+
+    void del_str(const char *str)
+    {
+        pj_cis_del_str(&cis_, str);
+    }
+
+    void invert()
+    {
+        pj_cis_invert(&cis_);
+    }
+
+    bool match(int c) const
+    {
+        return pj_cis_match(&cis_, c) != 0;
+    }
+
+private:
+    pj_cis_t cis_;
+};
+
+
 
 class Pj_Scanner
@@ -86 +142 @@
     }
 
-    int peek(const Pj_Char_Spec *cs, Pj_String *out)
-    {
-        return pj_scan_peek(&scanner_,  cs->cs_(), out);
+    int peek(const Pj_Cis *cis, Pj_String *out)
+    {
+        return pj_scan_peek(&scanner_,  &cis->cis_, out);
     }
 
@@ -96 +152 @@
     }
 
-    int peek_until(const Pj_Char_Spec *cs, Pj_String *out)
-    {
-        return pj_scan_peek_until(&scanner_, cs->cs_(), out);
-    }
-
-    void get(const Pj_Char_Spec *cs, Pj_String *out)
-    {
-        pj_scan_get(&scanner_, cs->cs_(), out);
+    int peek_until(const Pj_Cis *cis, Pj_String *out)
+    {
+        return pj_scan_peek_until(&scanner_, &cis->cis_, out);
+    }
+
+    void get(const Pj_Cis *cis, Pj_String *out)
+    {
+        pj_scan_get(&scanner_, &cis->cis_, out);
     }
 
@@ -126 +182 @@
     }
 
-    void get_until(const Pj_Char_Spec *cs, Pj_String *out)
-    {
-        pj_scan_get_until(&scanner_, cs->cs_(), out);
+    void get_until(const Pj_Cis *cis, Pj_String *out)
+    {
+        pj_scan_get_until(&scanner_, &cis->cis_, out);
     }
 
@@ -161 +217 @@
     }
 
-    void save_state(State *state)
+    void save_state(State *state) const
     {
         pj_scan_save_state(&scanner_, state);
@@ -178 +234 @@
     int get_pos_col() const
     {
-        return scanner_.col;
+        return pj_scan_get_col(&scanner_);
     }