Branch: Tag:

2001-06-28

2001-06-28 19:17:09 by Martin Stjernholm <mast@lysator.liu.se>

Don't zero out other flags when setting flags in do_enter; there might
e.g. be a FLAG_DEBUG there that gets lost then.

Rev: server/modules/tags/rxmltags.pike:1.249

7:   #define _rettext RXML_CONTEXT->misc[" _rettext"]   #define _ok RXML_CONTEXT->misc[" _ok"]    - constant cvs_version = "$Id: rxmltags.pike,v 1.248 2001/06/25 22:02:37 nilsson Exp $"; + constant cvs_version = "$Id: rxmltags.pike,v 1.249 2001/06/28 19:17:09 mast Exp $";   constant thread_safe = 1;   constant language = roxen->language;   
266:       array do_enter (RequestID id)    { -  if (args->value || args->from) flags = RXML.FLAG_EMPTY_ELEMENT; +  if (args->value || args->from) flags |= RXML.FLAG_EMPTY_ELEMENT;    if (args->type) content_type = args->type (RXML.PXml);    }   
463:       array do_enter (RequestID id)    { -  if (args->value || args->expr || args->from) flags = RXML.FLAG_EMPTY_ELEMENT; +  if (args->value || args->expr || args->from) flags |= RXML.FLAG_EMPTY_ELEMENT;    if (args->type) content_type = args->type (RXML.PXml);    }   
2096:    void create(string _name, int tag) {    name=_name;    lookup_name = "tag\0" + name; -  if(tag) flags=RXML.FLAG_EMPTY_ELEMENT; +  if(tag) flags |= RXML.FLAG_EMPTY_ELEMENT;    }       mixed _encode()
2621:    if(and)    return 0;    } - // else if (compat_level > "2.1") - // parse_error ("Unknown if test %O.\n", s); +     if(ifval) {    do_iterate = 1;    return 0;