Changeset 2188

Timestamp:

11/03/08 21:44:48 (2 months ago)

Author:

karpet

Message:

first pass at the dom-specific property and metaname feature.

Files:

• libswish3/trunk/src/libswish3/libswish3.h (modified) (2 diffs)
• libswish3/trunk/src/libswish3/namedbuffer.c (modified) (3 diffs)
• libswish3/trunk/src/libswish3/parser.c (modified) (8 diffs)
• libswish3/trunk/src/t/001-wordcount.t (modified) (2 diffs)
• libswish3/trunk/src/t/003-properties.t (modified) (2 diffs)
• libswish3/trunk/src/test_configs/dom.conf (added)
• libswish3/trunk/src/test_docs/dom.xml (added)

libswish3/trunk/src/libswish3/libswish3.h

@@ -600 +600 @@
-                                         xmlBufferPtr buf, 
-                                         xmlChar * joiner,
-int
+boolean
-                                         int autovivify);
-void                swish_add_str_to_nb( swish_NamedBuffer * nb, 
@@ -607 +607 @@
-                                         unsigned int len,
-                                         xmlChar * joiner,
-int
+boolean
-                                         int autovivify);
-void                swish_append_buffer( xmlBufferPtr buf, xmlChar * txt, int len );

libswish3/trunk/src/libswish3/namedbuffer.c

@@ -149 +149 @@
-    xmlBufferPtr buf,
-    xmlChar *joiner,
-int
+boolean
-    int autovivify
-)
@@ -164 +164 @@
-    unsigned int len,
-    xmlChar *joiner,
-int
+boolean
-    int autovivify
-)
@@ -197 +197 @@
-
-    if (cleanwsp) {
-
+
-        nowhitesp = swish_str_skip_ws(str);
-        swish_str_trim_ws(nowhitesp);
-
+
-        swish_append_buffer(buf, nowhitesp, xmlStrlen(nowhitesp));
-    }

libswish3/trunk/src/libswish3/parser.c

@@ -684 +684 @@
-{
-    swish_ParserData *parser_data;
+    xmlChar *baked;
+    
-    parser_data = (swish_ParserData *)data;
-    
@@ -705 +707 @@
-        push_tag_stack(parser_data->domstack, (xmlChar *)tag, parser_data->tag, SWISH_DOT);
-    }
-
+
-/*
-* set property if this tag is configured for it 
-*/
-
+
+
+
+
-        if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
-            SWISH_DEBUG_MSG(" %s = new property", parser_data->tag);
@@ -715 +720 @@
-        add_stack_to_prop_buf(NULL, parser_data);       /* NULL means all properties in the stack are added */
-        xmlBufferEmpty(parser_data->prop_buf);
-
-
+
+
+
+
+
+
+
-
-        if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
@@ -725 +735 @@
-* likewise for metastack 
-*/
-
+
+
+
+
-        if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
-            SWISH_DEBUG_MSG(" %s = new metaname", parser_data->tag);
@@ -731 +744 @@
-        flush_buffer(parser_data, parser_data->metastack->head->baked,
-                     parser_data->metastack->head->context);
-
-
+
+
+
+
+
+
+
-    }
-
@@ -1083 +1101 @@
-    ptr->domstack->temp  = NULL;
-    ptr->domstack->count = 0;
-    push_tag_stack(ptr->domstack, (xmlChar *)".", (xmlChar *)".", SWISH_DOT);
-
-/*
-* no such property just to seed stack 
-*/
-
-/*
@@ -2155 +2168 @@
-        tmp = swish_xmalloc(size);
-                
-
-
+
+
+
+
-            if (flat != NULL)
-                swish_xfree(flat);
@@ -2178 +2193 @@
-{
-    swish_TagStack *stack;
-int
+boolean
-    swish_Property *prop;
-

libswish3/trunk/src/t/001-wordcount.t

@@ -3 +3 @@
-use strict;
-use warnings;
-5
+6
-use SwishTestUtils;
-
@@ -30 +30 @@
-    'inline.xml'       => 12,
-    'inline.html'      => 9,
+    'dom.xml'          => 3,
-
-);

libswish3/trunk/src/t/003-properties.t

@@ -2 +2 @@
-use strict;
-use warnings;
-2
+3
-use SwishTestUtils;
-
@@ -18 +18 @@
-);
-
+$buf = SwishTestUtils::run_lint_stderr( 'dom.xml', 'dom.conf' );
+
+# the dot . is the TOKENPOS_BUMPER delimiter
+like( $buf, qr!<doc\.one\.two>green.yellow</doc\.one\.two>!, "dom" );
+
-#diag($buf);