Changeset 1145

Timestamp:

Apr 4, 2007 10:15:27 AM (17 years ago)

Author:

bennylp

Message:

Ticket #208: Allow single quotes for attributes in XML (thanks Tory Patnoe)

Location:

pjproject/trunk/pjlib-util

Files:

• include/pjlib-util/scanner.h (modified) (1 diff)
• src/pjlib-util/scanner.c (modified) (4 diffs)
• src/pjlib-util/xml.c (modified) (1 diff)

pjproject/trunk/pjlib-util/include/pjlib-util/scanner.h

@@ -351 +351 @@
 
 /** 
+ * Get characters between quotes. If current input doesn't match begin_quote,
+ * syntax error will be thrown. Note that the resulting string will contain
+ * the enclosing quote.
+ *
+ * @param scanner       The scanner.
+ * @param begin_quotes  The character array to begin the quotes. For example,
+ *                      the two characters " and '.
+ * @param end_quotes    The character array to end the quotes. The position
+ *                      found in the begin_quotes array will be used to match
+ *                      the end quotes. So if the begin_quotes was the array
+ *                      of "'< the end_quotes should be "'>. If begin_array
+ *                      matched the ' then the end_quotes will look for ' to
+ *                      match at the end.
+ * @param qsize         The size of the begin_quotes and end_quotes arrays.
+ * @param out           String to store the result.
+ */
+PJ_DECL(void) pj_scan_get_quotes(pj_scanner *scanner,
+                                 const char *begin_quotes,
+                                 const char *end_quotes, int qsize,
+                                 pj_str_t *out);
+
+
+/**
  * Get N characters from the scanner.
  *

pjproject/trunk/pjlib-util/src/pjlib-util/scanner.c

@@ -340 +340 @@
 
 PJ_DEF(void) pj_scan_get_quote( pj_scanner *scanner,
-                                 int begin_quote, int end_quote, 
-                                 pj_str_t *out)
-{
-    register char *s = scanner->curptr;
-    
+                                int begin_quote, int end_quote, 
+                                pj_str_t *out)
+{
+    pj_scan_get_quotes(scanner, (char*)&begin_quote, (char*)&end_quote, 1, out);
+}
+
+PJ_DEF(void) pj_scan_get_quotes(pj_scanner *scanner,
+                                const char *begin_quote, const char *end_quote,
+                                int qsize, pj_str_t *out)
+{
+    register char *s = scanner->curptr;
+    int qpair = -1;
+    int i;
+
+    pj_assert(qsize > 0);
+
     /* Check and eat the begin_quote. */
-    if (*s != begin_quote) {
+    for (i = 0; i < qsize; ++i) {
+        if (*s == begin_quote[i]) {
+            qpair = i;
+            break;
+        }
+    }
+    if (qpair == -1) {
         pj_scan_syntax_err(scanner);
         return;
@@ -356 +373 @@
     do {
         /* loop until end_quote is found. */
-        while (*s && *s != '\n' && *s != end_quote) {
+        while (*s && *s != '\n' && *s != end_quote[qpair]) {
             ++s;
         }
 
         /* check that no backslash character precedes the end_quote. */
-        if (*s == end_quote) {
+        if (*s == end_quote[qpair]) {
             if (*(s-1) == '\\') {
                 if (s-2 == scanner->begin) {
@@ -390 +407 @@
 
     /* Check and eat the end quote. */
-    if (*s != end_quote) {
+    if (*s != end_quote[qpair]) {
         pj_scan_syntax_err(scanner);
         return;
@@ -404 +421 @@
     }
 }
+
 
 PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner,

pjproject/trunk/pjlib-util/src/pjlib-util/xml.c

@@ -109 +109 @@
         if (*scanner->curptr == '=') {
             pj_scan_get_char( scanner );
-            pj_scan_get_quote(scanner, '"', '"', &attr->value);
+            pj_scan_get_quotes(scanner, "\"'", "\"'", 2, &attr->value);
             /* remove quote characters */
             ++attr->value.ptr;