Roxen.git/ server/ etc/ modules/ RXML.pmod/ module.pmod

2001-06-25

2001-06-25 15:20:22 by Martin Stjernholm <mast@lysator.liu.se>

• efaa112f318aad476c2378ce1c93c8b9cfe3a95d (28 lines) (+21/-7) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixed [bug 1750 (#1750)] where the flags variable couldn't be changed in
parse_frame, which usually showed as a "Cannot re-assign functions or
constants." backtrace in the <cond> tag.

Don't encode results when p-code is encoded. Fixed encoding of
CompiledError objects.

Rev: server/etc/modules/RXML.pmod/module.pmod:1.172

2:   //   // Created 1999-07-30 by Martin Stjernholm.   // - // $Id: module.pmod,v 1.171 2001/06/22 01:06:19 marcus Exp $ + // $Id: module.pmod,v 1.172 2001/06/25 15:20:22 mast Exp $      // Kludge: Must use "RXML.refs" somewhere for the whole module to be   // loaded correctly.
3485:    mixed _encode()    {    return (["_content_type":content_type, "_content":content, -  "_result_type":result_type, "_result":result, "_args":args, -  "_vars":this_object()->vars, +  "_result_type":result_type, "_args":args,    "_raw_tag_text":this_object()->raw_tag_text]);    }   
3495:    content_type = cookie->_content_type;    content = cookie->_content;    result_type = cookie->_result_type; -  result = cookie->_result; +     args = cookie->_args; -  if(cookie->_vars) -  this_object()->vars = cookie->_vars; +     if(cookie->_raw_tag_text)    this_object()->raw_tag_text = cookie->_raw_tag_text;    }
3787:   final class parse_frame   {    inherit Frame; -  constant flags = FLAG_UNPARSED; +  int flags = FLAG_UNPARSED;    mapping(string:mixed) args = ([]);       void create (Type type, string to_parse)
5504:    bt->current_var = current_var;    throw (bt);    } +  +  mixed _encode() +  { +  return ({type, msg, current_var});    }    -  +  void _decode (mixed v) +  { +  [type, msg, current_var] = v; +  } +  +  MARK_OBJECT; +  string _sprintf() {return "RXML.CompiledError" + OBJ_COUNT;} + } +    class PikeCompile   //! Helper class to paste together a Pike program from strings.   {
5848:    return PCode;    else if(what == "VarRef")    return VarRef; +  else if (what == "CompiledError") +  return CompiledError;    else if(what[..1]=="f:" && 2 == sscanf(what[3..], "%s\n%s", t, ts) &&    (tagset = all_tagsets[ts]) &&    (tag = tagset->get_local_tag(t, what[2]=='p')))
5886:    return "PCode";    else if(what == VarRef)    return "VarRef"; +  else if (what == CompiledError) +  return "CompiledError";    else if(what->is_RXML_Frame && saved_id[what])    return "f:"+saved_id[what];    }