Commit 4507edd13bb02cf45e46deced0c6bcc57ce67c71
2024-07-18T16:35:07
ekc3: support raw blocks
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165
diff --git a/ekc3/ekc3.c b/ekc3/ekc3.c
index 72a7f41..639afe2 100644
--- a/ekc3/ekc3.c
+++ b/ekc3/ekc3.c
@@ -374,6 +374,31 @@ p_ekc3 * ekc3_init (p_ekc3 *ekc3)
return ekc3;
}
+s_str * ekc3_inspect_block (const s_block *block, s_str *dest)
+{
+ uw i = 0;
+ s_tag result = {0};
+ assert(block);
+ while (i < block->count) {
+ tag_clean(&result);
+ if (! eval_tag(block->tag + i, &result))
+ return NULL;
+ i++;
+ }
+ switch (result.type) {
+ case TAG_STR:
+ if (! str_init_copy(dest, &result.data.str))
+ return NULL;
+ break;
+ default:
+ if (! str_init_cast(dest, &g_sym_Str, &result))
+ return NULL;
+ break;
+ }
+ tag_clean(&result);
+ return dest;
+}
+
sw ekc3_render (const p_ekc3 *ekc3)
{
const s_list *l;
@@ -407,54 +432,6 @@ sw ekc3_render (const p_ekc3 *ekc3)
return result;
}
-sw ekc3_render_block (const s_block *block)
-{
- uw i = 0;
- sw r;
- s_tag result = {0};
- assert(block);
- while (i < block->count) {
- tag_clean(&result);
- if (! eval_tag(block->tag + i, &result))
- return -1;
- i++;
- }
- switch (result.type) {
- case TAG_STR:
- r = io_write_str(&result.data.str);
- break;
- default:
- r = io_inspect_tag(&result);
- }
- tag_clean(&result);
- return r;
-}
-
-s_str * ekc3_inspect_block (const s_block *block, s_str *dest)
-{
- uw i = 0;
- s_tag result = {0};
- assert(block);
- while (i < block->count) {
- tag_clean(&result);
- if (! eval_tag(block->tag + i, &result))
- return NULL;
- i++;
- }
- switch (result.type) {
- case TAG_STR:
- if (! str_init_copy(dest, &result.data.str))
- return NULL;
- break;
- default:
- if (! str_init_cast(dest, &g_sym_Str, &result))
- return NULL;
- break;
- }
- tag_clean(&result);
- return dest;
-}
-
sw ekc3_render_buf (s_buf *in)
{
p_ekc3 ekc3;
@@ -504,13 +481,48 @@ sw ekc3_render_file (const s_str *path)
return r;
}
+sw ekc3_render_raw_block (const s_block *block)
+{
+ uw i;
+ sw r;
+ s_tag result = {0};
+ assert(block);
+ i = 1;
+ while (i < block->count) {
+ tag_clean(&result);
+ if (! eval_tag(block->tag + i, &result))
+ return -1;
+ i++;
+ }
+ switch (result.type) {
+ case TAG_STR:
+ r = io_write_str(&result.data.str);
+ break;
+ default:
+ r = io_inspect_tag(&result);
+ }
+ tag_clean(&result);
+ return r;
+}
+
sw ekc3_render_tag (const s_tag *tag)
{
+ const s_block *block;
s_str escaped = {0};
s_str in = {0};
sw r;
switch(tag->type) {
case TAG_BLOCK:
+ block = &tag->data.block;
+ if (block->count > 1 &&
+ block->tag->type == TAG_IDENT &&
+ block->tag->data.ident.sym == sym_1("raw")) {
+ if ((r = ekc3_render_raw_block(block)) < 0) {
+ err_puts("ekc3_render_tag: ekc3_render_raw_block");
+ assert(! "ekc3_render_tag: ekc3_render_raw_block");
+ }
+ return r;
+ }
if (! ekc3_inspect_block(&tag->data.block, &in)) {
err_puts("ekc3_render_tag: ekc3_render_block_to_str");
assert(! "ekc3_render_tag: ekc3_render_block_to_str");
@@ -545,12 +557,3 @@ sw ekc3_render_tag (const s_tag *tag)
err_write_1("\n");
return -1;
}
-
-s_fn * ekc3_to_render_fn (const p_ekc3 *ekc3, s_fn *dest)
-{
- assert(ekc3);
- assert(dest);
- (void) ekc3;
- (void) dest;
- return NULL;
-}
diff --git a/test/ekc3/title.html.ekc3 b/test/ekc3/title.html.ekc3
index 7a86e6e..7175a13 100644
--- a/test/ekc3/title.html.ekc3
+++ b/test/ekc3/title.html.ekc3
@@ -6,6 +6,6 @@
<% title2 = title + " H1 (silent block)" %>
<h1><%= title2 %></h1>
<h1><%= title_h1 %></h1>
- <%= title_h2 %>
+ <%= raw title_h2 %>
</body>
</html>