Changeset 2187

Show
Ignore:
Timestamp:
11/01/08 13:54:06 (2 months ago)
Author:
karpet
Message:

change some var and sub names for clarity

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • libswish3/trunk/bindings/perl/Makefile.PL

    r2179 r2187  
    1919    DEFINE => '',    # e.g., '-DHAVE_SOMETHING' 
    2020    INC => 
    21         '-I/usr/local/include -I/usr/local/include/libxml2 -I/usr/include -I/usr/include/libxml2 -I.', 
     21        '-I/usr/local/include -I/usr/local/include/libxml2 -I/usr/include -I/usr/include/libxml2 -I. -I../../src/libswish3', 
    2222 
    2323    # Un-comment this if you add C files to link with later: 

  • libswish3/trunk/src/libswish3/libswish3.h

    r2184 r2187  
    359359    swish_TagStack        *metastack;          // stacks for tracking the tag => metaname 
    360360    swish_TagStack        *propstack;          // stacks for tracking the tag => property 
    361     swish_TagStack        *tagstack;           // stacks for tracking xml/html tag tree 
     361    swish_TagStack        *domstack;           // stacks for tracking xml/html dom tree 
    362362    xmlParserCtxtPtr       ctxt;               // so we can free at end 
    363363    swish_TokenIterator   *token_iterator;     // token container 

  • libswish3/trunk/src/libswish3/parser.c

    r2184 r2187  
    142142    const xmlChar *tag 
    143143); 
    144 static xmlChar *build_tag( 
     144static xmlChar *bake_tag( 
    145145    swish_ParserData *parser_data, 
    146146    xmlChar *tag, 
    …… 
    293293*/ 
    294294static xmlChar * 
    295 build_tag( 
     295bake_tag( 
    296296    swish_ParserData *parser_data, 
    297297    xmlChar *tag, 
    …… 
    692692        swish_xfree(parser_data->tag); 
    693693 
    694     parser_data->tag = build_tag(parser_data, (xmlChar *)tag, (xmlChar **)atts); 
     694    parser_data->tag = bake_tag(parser_data, (xmlChar *)tag, (xmlChar **)atts); 
    695695         
    696696    if (SWISH_DEBUG & SWISH_DEBUG_PARSER) 
    697697        SWISH_DEBUG_MSG("checking config for '%s' in watched tags", parser_data->tag); 
    698698 
    699 /* all tags on tagstack */ 
     699/* all tags on domstack */ 
    700700 
    701701    if (parser_data->tag == NULL) { 
    702         push_tag_stack(parser_data->tagstack, (xmlChar *)tag, (xmlChar *)tag, SWISH_DOT); 
     702        push_tag_stack(parser_data->domstack, (xmlChar *)tag, (xmlChar *)tag, SWISH_DOT); 
    703703    } 
    704704    else { 
    705         push_tag_stack(parser_data->tagstack, (xmlChar *)tag, parser_data->tag, SWISH_DOT); 
     705        push_tag_stack(parser_data->domstack, (xmlChar *)tag, parser_data->tag, SWISH_DOT); 
    706706    } 
    707707 
    …… 
    761761        swish_xfree(parser_data->tag); 
    762762 
    763     parser_data->tag = build_tag(parser_data, (xmlChar *)tag, NULL); 
     763    parser_data->tag = bake_tag(parser_data, (xmlChar *)tag, NULL); 
    764764 
    765765    if (SWISH_DEBUG & SWISH_DEBUG_PARSER) 
    …… 
    782782    } 
    783783     
    784     // always pop the raw tagstack 
    785     st = pop_tag_stack(parser_data->tagstack); 
     784    // always pop the raw domstack 
     785    st = pop_tag_stack(parser_data->domstack); 
    786786    free_swishTag(st); 
    787787 
    …… 
    10781078    push_tag_stack(ptr->propstack, (xmlChar *)"_", (xmlChar *)"_", SWISH_SPACE); 
    10791079     
    1080     ptr->tagstack  = (swish_TagStack *)swish_xmalloc(sizeof(swish_TagStack)); 
    1081     ptr->tagstack->name  = "TagStack"; 
    1082     ptr->tagstack->head  = NULL; 
    1083     ptr->tagstack->temp  = NULL; 
    1084     ptr->tagstack->count = 0; 
    1085     push_tag_stack(ptr->tagstack, (xmlChar *)".", (xmlChar *)".", SWISH_DOT); 
     1080    ptr->domstack  = (swish_TagStack *)swish_xmalloc(sizeof(swish_TagStack)); 
     1081    ptr->domstack->name  = "DOMStack"; 
     1082    ptr->domstack->head  = NULL; 
     1083    ptr->domstack->temp  = NULL; 
     1084    ptr->domstack->count = 0; 
     1085    push_tag_stack(ptr->domstack, (xmlChar *)".", (xmlChar *)".", SWISH_DOT); 
    10861086 
    10871087/* 
    …… 
    11631163    free_swishTagStack(ptr->metastack); 
    11641164    free_swishTagStack(ptr->propstack); 
    1165     free_swishTagStack(ptr->tagstack); 
     1165    free_swishTagStack(ptr->domstack); 
    11661166     
    11671167/* free named buffers */