[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] dynamic-modules eae5da9 20/22: yaml module: add `yaml-pars
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] dynamic-modules eae5da9 20/22: yaml module: add `yaml-parse-string'. |
Date: |
Thu, 27 Nov 2014 02:01:56 +0000 |
branch: dynamic-modules
commit eae5da99db78c541ce9f29607d57feeb1cff6049
Author: Aurélien Aptel <address@hidden>
Date: Sun Nov 23 21:34:17 2014 +0100
yaml module: add `yaml-parse-string'.
---
modules/yaml/yaml.c | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/modules/yaml/yaml.c b/modules/yaml/yaml.c
index 4096205..6d2647f 100644
--- a/modules/yaml/yaml.c
+++ b/modules/yaml/yaml.c
@@ -56,7 +56,7 @@ parse_element (struct context *ctx)
case YAML_SCALAR_EVENT:
res = parse_scalar (ctx, &e);
if (s)
- Fputhash (make_string (s, strlen (s)), res, ctx->anchors);
+ Fputhash (make_string (s, strlen (s)), res, ctx->anchors);
break;
case YAML_SEQUENCE_START_EVENT:
@@ -143,6 +143,25 @@ context_init (struct context *ctx)
ctx->anchors = Fmake_hash_table (2, args);
}
+EXFUN (Fyaml_parse_string, 1);
+DEFUN ("yaml-parse-string", Fyaml_parse_string, Syaml_parse_string, 1, 1, 0,
+ doc: "Parse STRING as yaml.")
+ (Lisp_Object string)
+{
+ struct context ctx;
+ Lisp_Object res = Qnil;
+
+ context_init (&ctx);
+
+ yaml_parser_initialize (&ctx.p);
+ yaml_parser_set_input_string (&ctx.p, SDATA (string), SBYTES (string));
+ res = parse_element (&ctx);
+ yaml_parser_delete (&ctx.p);
+
+ return res;
+}
+
+
EXFUN (Fyaml_parse, 0);
DEFUN ("yaml-parse", Fyaml_parse, Syaml_parse, 0, 0, 0,
doc: "Parse current buffer as yaml.")
@@ -206,6 +225,7 @@ void init ()
DEFSYM (Qyaml, "yaml");
defsubr (&Syaml_parse_file);
+ defsubr (&Syaml_parse_string);
defsubr (&Syaml_parse);
Fprovide (Qyaml, Qnil);
- [Emacs-diffs] dynamic-modules c0eb5a6 05/22: change Subr doc field from char* to Lisp_Object., (continued)
- [Emacs-diffs] dynamic-modules c0eb5a6 05/22: change Subr doc field from char* to Lisp_Object., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules e374b97 11/22: opaque: add comments., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 1be7b68 10/22: new module: opaque, Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules db69d49 12/22: new module: elisp, Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 106c15b 14/22: curl: use url arg., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 334564f 15/22: fix docstring., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules ada5c5e 13/22: new module: curl. basic URL fetcher working., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 399d8ec 16/22: make `load' look for and handle dynamic modules., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 01e2303 17/22: update modules examples with `provide' call., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 6334cf7 18/22: use `load-module-suffixes' as a source of module suffixes., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules eae5da9 20/22: yaml module: add `yaml-parse-string'.,
Teodor Zlatanov <=
- [Emacs-diffs] dynamic-modules 4efd6a2 21/22: yaml module: rename `yaml-parse' to `yaml-parse-buffer'., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 9313182 22/22: configure.ac: dynamic modules off by default., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 18920eb 19/22: new yaml parsing module using libyaml, Teodor Zlatanov, 2014/11/26