Changeset 36 for pjproject/main/pjlib/include/pj++/scanner.hpp

Timestamp:

Nov 9, 2005 3:37:19 PM (19 years ago)

Author:

bennylp

Message:

Rework pjlib++

File:

• pjproject/main/pjlib/include/pj++/scanner.hpp (modified) (5 diffs)

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

@@ -5 +5 @@
 #define __PJPP_SCANNER_H__
 
-#include <pj/scanner.h>
+#include <pjlib-util/scanner.h>
 #include <pj++/string.hpp>
 
-class PJ_CharSpec
+class Pj_Char_Spec
 {
 public:
-    PJ_CharSpec() { pj_cs_init(cs__); }
+    Pj_Char_Spec() { pj_cs_init(cs__); }
 
     void set(int c) { pj_cs_set(cs__, c); }
@@ -37 +37 @@
 };
 
-class PJ_Scanner
+class Pj_Scanner
 {
 public:
-    PJ_Scanner() {}
+    Pj_Scanner() {}
 
     enum
@@ -68 +68 @@
     int peek_char() const
     {
-        return *scanner_.current;
+        return *scanner_.curptr;
     }
 
-    int peek(const PJ_CharSpec *cs, PJ_String *out)
+    int peek(const Pj_Char_Spec *cs, Pj_String *out)
     {
         return pj_scan_peek(&scanner_,  cs->cs_(), out);
     }
 
-    int peek_n(pj_size_t len, PJ_String *out)
+    int peek_n(pj_size_t len, Pj_String *out)
     {
         return pj_scan_peek_n(&scanner_, len, out);
     }
 
-    int peek_until(const PJ_CharSpec *cs, PJ_String *out)
+    int peek_until(const Pj_Char_Spec *cs, Pj_String *out)
     {
         return pj_scan_peek_until(&scanner_, cs->cs_(), out);
     }
 
-    void get(const PJ_CharSpec *cs, PJ_String *out)
+    void get(const Pj_Char_Spec *cs, Pj_String *out)
     {
         pj_scan_get(&scanner_, cs->cs_(), out);
     }
 
-    void get_n(unsigned N, PJ_String *out)
+    void get_n(unsigned N, Pj_String *out)
     {
         pj_scan_get_n(&scanner_, N, out);
@@ -101 +101 @@
     }
 
-    void get_quote(int begin_quote, int end_quote, PJ_String *out)
+    void get_quote(int begin_quote, int end_quote, Pj_String *out)
     {
         pj_scan_get_quote(&scanner_, begin_quote, end_quote, out);
@@ -111 +111 @@
     }
 
-    void get_until(const PJ_CharSpec *cs, PJ_String *out)
+    void get_until(const Pj_Char_Spec *cs, Pj_String *out)
     {
         pj_scan_get_until(&scanner_, cs->cs_(), out);
     }
 
-    void get_until_ch(int until_ch, PJ_String *out)
+    void get_until_ch(int until_ch, Pj_String *out)
     {
         pj_scan_get_until_ch(&scanner_, until_ch, out);
     }
 
-    void get_until_chr(const char *spec, PJ_String *out)
+    void get_until_chr(const char *spec, Pj_String *out)
     {
         pj_scan_get_until_chr(&scanner_, spec, out);