mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-23 22:20:24 -08:00
Fixes Bug#15880. This patch also makes Q constants (e.g., Qnil) constant addresses from the C point of view. * make-docfile.c: Revamp to generate table of symbols, too. Include <stdbool.h>. (xstrdup): New function. (main): Don't process the same file twice. (SYMBOL): New constant in enum global_type. (struct symbol): Turn 'value' member into a union, either v.value for int or v.svalue for string. All uses changed. (add_global): New arg svalue, which overrides value, so that globals can have a string value. (close_emacs_global): New arg num_symbols; all uses changed. Output lispsym decl. (write_globals): Output symbol globals too. Output more ATTRIBUTE_CONST, now that Qnil etc. are C constants. Output defsym_name table. (scan_c_file): Move most of guts into ... (scan_c_stream): ... new function. Scan for DEFSYMs and record symbols found. Don't read past EOF if file doesn't end in newline. * alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle: * casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c: * composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c: * frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c: * image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c: * macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m: * nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c: * search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c: * xselect.c, xsettings.c, xterm.c: Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs). These names are now defined automatically by make-docfile. * alloc.c (init_symbol): New function. (Fmake_symbol): Use it. (c_symbol_p): New function. (valid_lisp_object_p, purecopy): Use it. * alloc.c (marked_pinned_symbols): Use make_lisp_symbol instead of make_lisp_ptr. (garbage_collect_1): Mark lispsym symbols. (CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro. (mark_object): Use it. (sweep_symbols): Sweep lispsym symbols. (symbol_uses_obj): New function. (which_symbols): Use it. Work for lispsym symbols, too. (init_alloc_once): Initialize Vpurify_flag here; no need to wait, since Qt's address is already known now. (syms_of_alloc): Add lispsym count to symbols_consed. * buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0), when testing whether storage is all bits zero. * dispextern (struct image_type): * font.c (font_property_table): * frame.c (struct frame_parm_table, frame_parms): * keyboard.c (scroll_bar_parts, struct event_head): * xdisp.c (struct props): Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and Lisp_Object *, since Qfoo is no longer an object whose address can be taken. All uses changed. * eval.c (run_hook): New function. Most uses of Frun_hooks changed to use it, so that they no longer need to take the address of a Lisp sym. (syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable. * frame.c (syms_of_frame): Add defsyms for the frame_parms table. * keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here. DEFSYM Qdeactivate_mark before the corresponding var. * keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line instead of interning their symbols; this avoids duplicates. (LISP_INITIALLY, TAG_PTR) (DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT): New macros. (LISP_INITIALLY_ZERO): Use it. (enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol) (EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*): Move decls up, to avoid forward uses. Include globals.h earlier, too. (make_lisp_symbol): New function. (XSETSYMBOL): Use it. (DEFSYM): Now just a placeholder for make-docfile. * lread.c (DEFINE_SYMBOLS): Define, for globals.h. (intern_sym): New function, with body taken from old intern_driver. (intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t. All uses changed. (define_symbol): New function. (init_obarray): Define the C symbols taken from lispsym. Use plain DEFSYM for Qt and Qnil. * syntax.c (init_syntax_once): No need to worry about Qchar_table_extra_slots.
296 lines
7.4 KiB
C
296 lines
7.4 KiB
C
/* Interface to libxml2.
|
||
Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
||
|
||
This file is part of GNU Emacs.
|
||
|
||
GNU Emacs is free software: you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation, either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
GNU Emacs is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include <config.h>
|
||
|
||
#ifdef HAVE_LIBXML2
|
||
|
||
#include <libxml/tree.h>
|
||
#include <libxml/parser.h>
|
||
#include <libxml/HTMLparser.h>
|
||
|
||
#include "lisp.h"
|
||
#include "character.h"
|
||
#include "buffer.h"
|
||
|
||
|
||
#ifdef WINDOWSNT
|
||
|
||
# include <windows.h>
|
||
# include "w32.h"
|
||
|
||
DEF_DLL_FN (htmlDocPtr, htmlReadMemory,
|
||
(const char *, int, const char *, const char *, int));
|
||
DEF_DLL_FN (xmlDocPtr, xmlReadMemory,
|
||
(const char *, int, const char *, const char *, int));
|
||
DEF_DLL_FN (xmlNodePtr, xmlDocGetRootElement, (xmlDocPtr));
|
||
DEF_DLL_FN (void, xmlFreeDoc, (xmlDocPtr));
|
||
DEF_DLL_FN (void, xmlCleanupParser, (void));
|
||
DEF_DLL_FN (void, xmlCheckVersion, (int));
|
||
|
||
static int
|
||
libxml2_loaded_p (void)
|
||
{
|
||
Lisp_Object found = Fassq (Qlibxml2_dll, Vlibrary_cache);
|
||
|
||
if (CONSP (found))
|
||
return EQ (XCDR (found), Qt) ? 1 : 0;
|
||
return 0;
|
||
}
|
||
|
||
# undef htmlReadMemory
|
||
# undef xmlCheckVersion
|
||
# undef xmlCleanupParser
|
||
# undef xmlDocGetRootElement
|
||
# undef xmlFreeDoc
|
||
# undef xmlReadMemory
|
||
|
||
# define htmlReadMemory fn_htmlReadMemory
|
||
# define xmlCheckVersion fn_xmlCheckVersion
|
||
# define xmlCleanupParser fn_xmlCleanupParser
|
||
# define xmlDocGetRootElement fn_xmlDocGetRootElement
|
||
# define xmlFreeDoc fn_xmlFreeDoc
|
||
# define xmlReadMemory fn_xmlReadMemory
|
||
|
||
static bool
|
||
load_dll_functions (HMODULE library)
|
||
{
|
||
LOAD_DLL_FN (library, htmlReadMemory);
|
||
LOAD_DLL_FN (library, xmlReadMemory);
|
||
LOAD_DLL_FN (library, xmlDocGetRootElement);
|
||
LOAD_DLL_FN (library, xmlFreeDoc);
|
||
LOAD_DLL_FN (library, xmlCleanupParser);
|
||
LOAD_DLL_FN (library, xmlCheckVersion);
|
||
return true;
|
||
}
|
||
|
||
#else /* !WINDOWSNT */
|
||
|
||
static int
|
||
libxml2_loaded_p (void)
|
||
{
|
||
return 1;
|
||
}
|
||
|
||
#endif /* !WINDOWSNT */
|
||
|
||
static int
|
||
init_libxml2_functions (void)
|
||
{
|
||
#ifdef WINDOWSNT
|
||
if (libxml2_loaded_p ())
|
||
return 1;
|
||
else
|
||
{
|
||
HMODULE library;
|
||
|
||
if (!(library = w32_delayed_load (Qlibxml2_dll)))
|
||
{
|
||
message1 ("libxml2 library not found");
|
||
return 0;
|
||
}
|
||
|
||
if (! load_dll_functions (library))
|
||
goto bad_library;
|
||
|
||
Vlibrary_cache = Fcons (Fcons (Qlibxml2_dll, Qt), Vlibrary_cache);
|
||
return 1;
|
||
}
|
||
|
||
bad_library:
|
||
Vlibrary_cache = Fcons (Fcons (Qlibxml2_dll, Qnil), Vlibrary_cache);
|
||
|
||
return 0;
|
||
#else /* !WINDOWSNT */
|
||
return 1;
|
||
#endif /* !WINDOWSNT */
|
||
}
|
||
|
||
static Lisp_Object
|
||
make_dom (xmlNode *node)
|
||
{
|
||
if (node->type == XML_ELEMENT_NODE)
|
||
{
|
||
Lisp_Object result = list1 (intern ((char *) node->name));
|
||
xmlNode *child;
|
||
xmlAttr *property;
|
||
Lisp_Object plist = Qnil;
|
||
|
||
/* First add the attributes. */
|
||
property = node->properties;
|
||
while (property != NULL)
|
||
{
|
||
if (property->children &&
|
||
property->children->content)
|
||
{
|
||
char *content = (char *) property->children->content;
|
||
plist = Fcons (Fcons (intern ((char *) property->name),
|
||
build_string (content)),
|
||
plist);
|
||
}
|
||
property = property->next;
|
||
}
|
||
result = Fcons (Fnreverse (plist), result);
|
||
|
||
/* Then add the children of the node. */
|
||
child = node->children;
|
||
while (child != NULL)
|
||
{
|
||
result = Fcons (make_dom (child), result);
|
||
child = child->next;
|
||
}
|
||
|
||
return Fnreverse (result);
|
||
}
|
||
else if (node->type == XML_TEXT_NODE || node->type == XML_CDATA_SECTION_NODE)
|
||
{
|
||
if (node->content)
|
||
return build_string ((char *) node->content);
|
||
else
|
||
return Qnil;
|
||
}
|
||
else if (node->type == XML_COMMENT_NODE)
|
||
{
|
||
if (node->content)
|
||
return list3 (intern ("comment"), Qnil,
|
||
build_string ((char *) node->content));
|
||
else
|
||
return Qnil;
|
||
}
|
||
else
|
||
return Qnil;
|
||
}
|
||
|
||
static Lisp_Object
|
||
parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, Lisp_Object discard_comments, int htmlp)
|
||
{
|
||
xmlDoc *doc;
|
||
Lisp_Object result = Qnil;
|
||
const char *burl = "";
|
||
ptrdiff_t istart, iend, istart_byte, iend_byte;
|
||
|
||
xmlCheckVersion (LIBXML_VERSION);
|
||
|
||
validate_region (&start, &end);
|
||
|
||
istart = XINT (start);
|
||
iend = XINT (end);
|
||
istart_byte = CHAR_TO_BYTE (istart);
|
||
iend_byte = CHAR_TO_BYTE (iend);
|
||
|
||
if (istart < GPT && GPT < iend)
|
||
move_gap_both (iend, iend_byte);
|
||
|
||
if (! NILP (base_url))
|
||
{
|
||
CHECK_STRING (base_url);
|
||
burl = SSDATA (base_url);
|
||
}
|
||
|
||
if (htmlp)
|
||
doc = htmlReadMemory ((char *) BYTE_POS_ADDR (istart_byte),
|
||
iend_byte - istart_byte, burl, "utf-8",
|
||
HTML_PARSE_RECOVER|HTML_PARSE_NONET|
|
||
HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR|
|
||
HTML_PARSE_NOBLANKS);
|
||
else
|
||
doc = xmlReadMemory ((char *) BYTE_POS_ADDR (istart_byte),
|
||
iend_byte - istart_byte, burl, "utf-8",
|
||
XML_PARSE_NONET|XML_PARSE_NOWARNING|
|
||
XML_PARSE_NOBLANKS |XML_PARSE_NOERROR);
|
||
|
||
if (doc != NULL)
|
||
{
|
||
Lisp_Object r = Qnil;
|
||
if (NILP(discard_comments))
|
||
{
|
||
/* If the document has toplevel comments, then this should
|
||
get us the nodes and the comments. */
|
||
xmlNode *n = doc->children;
|
||
|
||
while (n) {
|
||
if (!NILP (r))
|
||
result = Fcons (r, result);
|
||
r = make_dom (n);
|
||
n = n->next;
|
||
}
|
||
}
|
||
|
||
if (NILP (result)) {
|
||
/* The document doesn't have toplevel comments or we discarded
|
||
them. Get the tree the proper way. */
|
||
xmlNode *node = xmlDocGetRootElement (doc);
|
||
if (node != NULL)
|
||
result = make_dom (node);
|
||
} else
|
||
result = Fcons (intern ("top"),
|
||
Fcons (Qnil, Fnreverse (Fcons (r, result))));
|
||
|
||
xmlFreeDoc (doc);
|
||
}
|
||
|
||
return result;
|
||
}
|
||
|
||
void
|
||
xml_cleanup_parser (void)
|
||
{
|
||
if (libxml2_loaded_p ())
|
||
xmlCleanupParser ();
|
||
}
|
||
|
||
DEFUN ("libxml-parse-html-region", Flibxml_parse_html_region,
|
||
Slibxml_parse_html_region,
|
||
2, 4, 0,
|
||
doc: /* Parse the region as an HTML document and return the parse tree.
|
||
If BASE-URL is non-nil, it is used to expand relative URLs.
|
||
If DISCARD-COMMENTS is non-nil, all HTML comments are discarded. */)
|
||
(Lisp_Object start, Lisp_Object end, Lisp_Object base_url, Lisp_Object discard_comments)
|
||
{
|
||
if (init_libxml2_functions ())
|
||
return parse_region (start, end, base_url, discard_comments, 1);
|
||
return Qnil;
|
||
}
|
||
|
||
DEFUN ("libxml-parse-xml-region", Flibxml_parse_xml_region,
|
||
Slibxml_parse_xml_region,
|
||
2, 4, 0,
|
||
doc: /* Parse the region as an XML document and return the parse tree.
|
||
If BASE-URL is non-nil, it is used to expand relative URLs.
|
||
If DISCARD-COMMENTS is non-nil, all HTML comments are discarded. */)
|
||
(Lisp_Object start, Lisp_Object end, Lisp_Object base_url, Lisp_Object discard_comments)
|
||
{
|
||
if (init_libxml2_functions ())
|
||
return parse_region (start, end, base_url, discard_comments, 0);
|
||
return Qnil;
|
||
}
|
||
|
||
|
||
/***********************************************************************
|
||
Initialization
|
||
***********************************************************************/
|
||
void
|
||
syms_of_xml (void)
|
||
{
|
||
defsubr (&Slibxml_parse_html_region);
|
||
defsubr (&Slibxml_parse_xml_region);
|
||
|
||
DEFSYM (Qlibxml2_dll, "libxml2");
|
||
}
|
||
|
||
#endif /* HAVE_LIBXML2 */
|