Changeset 2184

Timestamp:

10/24/08 15:05:31 (3 months ago)

Author:

karpet

Message:

add raw tagstack to parser_data. this is to allow for metanames or properties with syntax like foo.bar.baz so that you can precisely identify data in dom context. the feature is not done, but this passes all tests so am committing as is for now

Files:

• libswish3/trunk/src/libswish3/libswish3.h (modified) (2 diffs)
• libswish3/trunk/src/libswish3/parser.c (modified) (20 diffs)

libswish3/trunk/src/libswish3/libswish3.h

@@ -100 +100 @@
-#define SWISH_PROP_DESCRIPTION     "swishdescription"
-#define SWISH_TOKENPOS_BUMPER      "\3"
+#define SWISH_DOT                  '.'
+#define SWISH_SPACE                ' '
-
-/* built-in id values */
@@ -357 +359 @@
-    swish_TagStack        *metastack;          // stacks for tracking the tag => metaname
-    swish_TagStack        *propstack;          // stacks for tracking the tag => property
+    swish_TagStack        *tagstack;           // stacks for tracking xml/html tag tree
-    xmlParserCtxtPtr       ctxt;               // so we can free at end
-    swish_TokenIterator   *token_iterator;     // token container

libswish3/trunk/src/libswish3/parser.c

@@ -211 +211 @@
-static xmlChar *flatten_tag_stack(
-    xmlChar *baked,
-
+
+
-);
-static void add_stack_to_prop_buf(
@@ -220 +221 @@
-    swish_TagStack *stack,
-    xmlChar *raw,
-
+
+
-);
-static swish_Tag *pop_tag_stack(
@@ -231 +233 @@
-static void free_swishTag(
-    swish_Tag * st
+);
+static void
+free_swishTagStack(
+    swish_TagStack *stack
-);
-
@@ -298 +304 @@
-
-    if (SWISH_DEBUG & SWISH_DEBUG_PARSER) {
-(%s)
+  parser->tag: %s
-        if (atts != NULL) {
-            SWISH_DEBUG_MSG(" has attributes [%d]", xmlStrlen((xmlChar *)atts));
@@ -679 +685 @@
-    swish_ParserData *parser_data;
-    parser_data = (swish_ParserData *)data;
+    
+    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
+        SWISH_DEBUG_MSG("<%s>", tag);
-
-    if (parser_data->tag != NULL)
@@ -684 +693 @@
-
-    parser_data->tag = build_tag(parser_data, (xmlChar *)tag, (xmlChar **)atts);
-
+
-    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
-        SWISH_DEBUG_MSG("checking config for '%s' in watched tags", parser_data->tag);
+
+/* all tags on tagstack */
+
+    if (parser_data->tag == NULL) {
+        push_tag_stack(parser_data->tagstack, (xmlChar *)tag, (xmlChar *)tag, SWISH_DOT);
+    }
+    else {
+        push_tag_stack(parser_data->tagstack, (xmlChar *)tag, parser_data->tag, SWISH_DOT);
+    }
-
-/*
@@ -698 +716 @@
-        xmlBufferEmpty(parser_data->prop_buf);
-
-
+, SWISH_SPACE
-
-        if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
@@ -714 +732 @@
-                     parser_data->metastack->head->context);
-
-
+, SWISH_SPACE
-    }
-
@@ -733 +751 @@
-    parser_data = (swish_ParserData *)data;
-
+    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
+        SWISH_DEBUG_MSG("</%s>", tag);
+        
-/*
-* lowercase all names for comparison against metanames (which are
@@ -744 +765 @@
-    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
-        SWISH_DEBUG_MSG(" endElement(%s) (%s)", (xmlChar *)tag, parser_data->tag);
+        
+    if (parser_data->tag == NULL)
+        return;
-
-    if ((st = pop_tag_stack_on_match(parser_data->propstack, (xmlChar *)tag)) != NULL) {
@@ -757 +781 @@
-        free_swishTag(st);
-    }
+    
+    // always pop the raw tagstack
+    st = pop_tag_stack(parser_data->tagstack);
+    free_swishTag(st);
-
-}
@@ -1041 +1069 @@
-    ptr->metastack->count = 0;
-    push_tag_stack(ptr->metastack, (xmlChar *)SWISH_DEFAULT_METANAME,
-
+, SWISH_SPACE
-
-    ptr->propstack = (swish_TagStack *)swish_xmalloc(sizeof(swish_TagStack));
@@ -1048 +1076 @@
-    ptr->propstack->temp = NULL;
-    ptr->propstack->count = 0;
-
+
+
+
+
+
+
+
+
-
-/*
@@ -1089 +1124 @@
-
-static void
+free_swishTagStack(
+    swish_TagStack *stack
+)
+{
+    swish_Tag *st;
+    
+    while ((st = pop_tag_stack(stack)) != NULL) {
+        if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
+            SWISH_DEBUG_MSG("%s %d POP %s [%s] [%s]", stack->name,
+                            stack->count, st->raw, st->baked, st->context);
+
+        free_swishTag(st);
+    }
+
+    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
+        SWISH_DEBUG_MSG("freeing stack %s", stack->name);
+
+    swish_xfree(stack);
+}
+
+static void
-free_parser_data(
-    swish_ParserData *ptr
-)
-{
-    swish_Tag *st;
-
-    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
@@ -1106 +1161 @@
-* Pop the stacks 
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
@@ -1965 +2000 @@
-
-    push_tag_stack(parser_data->metastack, (xmlChar *)SWISH_DEFAULT_METANAME,
-
+, SWISH_SPACE
-
-    if (SWISH_DEBUG & SWISH_DEBUG_PARSER)
@@ -2090 +2125 @@
-flatten_tag_stack(
-    xmlChar *baked,
-
+
+
-)
-{
@@ -2111 +2147 @@
-    for (; stack->temp != NULL; stack->temp = stack->temp->next) {
-        size =
-
+
+
+
+
+
+
-        tmp = swish_xmalloc(size);
-
+
+
-            > 0) {
-            if (flat != NULL)
@@ -2188 +2230 @@
-    swish_TagStack *stack,
-    xmlChar *raw,
-
+
+
-)
-{
@@ -2213 +2256 @@
-
-/*  create context */
-
+, flatten_join
-
-    if (SWISH_DEBUG & SWISH_DEBUG_PARSER) {