@fugood/llama.node 1.4.15 → 1.5.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/binding.ts +1 -5
- package/lib/index.js +2 -2
- package/lib/index.ts +2 -2
- package/package.json +15 -15
- package/scripts/llama.cpp.patch +76 -61
- package/src/LlamaContext.cpp +20 -32
- package/src/llama.cpp/common/CMakeLists.txt +12 -0
- package/src/llama.cpp/common/arg.cpp +20 -0
- package/src/llama.cpp/common/chat.cpp +289 -34
- package/src/llama.cpp/common/chat.h +16 -13
- package/src/llama.cpp/common/common.cpp +0 -1
- package/src/llama.cpp/common/common.h +28 -25
- package/src/llama.cpp/common/jinja/caps.cpp +237 -0
- package/src/llama.cpp/common/jinja/caps.h +24 -0
- package/src/llama.cpp/common/jinja/lexer.cpp +341 -0
- package/src/llama.cpp/common/jinja/lexer.h +157 -0
- package/src/llama.cpp/common/jinja/parser.cpp +591 -0
- package/src/llama.cpp/common/jinja/parser.h +21 -0
- package/src/llama.cpp/common/jinja/runtime.cpp +865 -0
- package/src/llama.cpp/common/jinja/runtime.h +628 -0
- package/src/llama.cpp/common/jinja/string.cpp +207 -0
- package/src/llama.cpp/common/jinja/string.h +58 -0
- package/src/llama.cpp/common/jinja/utils.h +49 -0
- package/src/llama.cpp/common/jinja/value.cpp +1221 -0
- package/src/llama.cpp/common/jinja/value.h +464 -0
- package/src/llama.cpp/common/sampling.cpp +52 -19
- package/src/llama.cpp/ggml/include/ggml.h +39 -7
- package/src/llama.cpp/ggml/src/ggml-cpu/ggml-cpu.c +4 -0
- package/src/llama.cpp/ggml/src/ggml-cpu/ops.cpp +63 -37
- package/src/llama.cpp/ggml/src/ggml-cpu/simd-mappings.h +31 -0
- package/src/llama.cpp/ggml/src/ggml-cpu/vec.cpp +18 -0
- package/src/llama.cpp/include/llama-cpp.h +3 -1
- package/src/llama.cpp/include/llama.h +29 -2
- package/src/llama.cpp/src/llama-adapter.cpp +7 -13
- package/src/llama.cpp/src/llama-adapter.h +1 -3
- package/src/llama.cpp/src/llama-context.cpp +232 -144
- package/src/llama.cpp/src/llama-context.h +10 -0
- package/src/llama.cpp/src/llama-cparams.h +2 -0
- package/src/llama.cpp/src/llama-hparams.cpp +0 -36
- package/src/llama.cpp/src/llama-hparams.h +38 -1
- package/src/llama.cpp/src/llama-kv-cache.cpp +201 -59
- package/src/llama.cpp/src/llama-kv-cache.h +0 -2
- package/src/llama.cpp/src/llama-mmap.cpp +5 -1
- package/src/llama.cpp/src/llama-model-loader.cpp +21 -7
- package/src/llama.cpp/src/llama-model.cpp +5 -1
- package/src/llama.cpp/src/llama-model.h +3 -2
- package/src/llama.cpp/src/llama-sampling.cpp +170 -13
|
@@ -0,0 +1,237 @@
|
|
|
1
|
+
#include "value.h"
|
|
2
|
+
#include "runtime.h"
|
|
3
|
+
#include "caps.h"
|
|
4
|
+
|
|
5
|
+
// note: the json dependency is only for defining input in a convenient way
|
|
6
|
+
// we can remove it in the future when we figure out a better way to define inputs using jinja::value
|
|
7
|
+
#include <nlohmann/json.hpp>
|
|
8
|
+
|
|
9
|
+
#include <functional>
|
|
10
|
+
#include <sstream>
|
|
11
|
+
|
|
12
|
+
#define FILENAME "jinja-caps"
|
|
13
|
+
|
|
14
|
+
using json = nlohmann::ordered_json;
|
|
15
|
+
|
|
16
|
+
namespace jinja {
|
|
17
|
+
|
|
18
|
+
using caps_json_fn = std::function<json()>;
|
|
19
|
+
using caps_analyze_fn = std::function<void(bool, value &, value &)>;
|
|
20
|
+
|
|
21
|
+
static void caps_try_execute(jinja::program & prog,
|
|
22
|
+
const caps_json_fn & messages_fn,
|
|
23
|
+
const caps_json_fn & tools_fn,
|
|
24
|
+
const caps_analyze_fn & analyze_fn) {
|
|
25
|
+
context ctx;
|
|
26
|
+
ctx.is_get_stats = true;
|
|
27
|
+
jinja::global_from_json(ctx, json{
|
|
28
|
+
{"messages", messages_fn()},
|
|
29
|
+
{"tools", tools_fn()},
|
|
30
|
+
{"bos_token", ""},
|
|
31
|
+
{"eos_token", ""},
|
|
32
|
+
{"add_generation_prompt", true}
|
|
33
|
+
}, true);
|
|
34
|
+
|
|
35
|
+
auto messages = ctx.get_val("messages");
|
|
36
|
+
auto tools = ctx.get_val("tools");
|
|
37
|
+
|
|
38
|
+
bool success = false;
|
|
39
|
+
try {
|
|
40
|
+
jinja::runtime runtime(ctx);
|
|
41
|
+
runtime.execute(prog);
|
|
42
|
+
success = true;
|
|
43
|
+
} catch (const std::exception & e) {
|
|
44
|
+
JJ_DEBUG("Exception during execution: %s", e.what());
|
|
45
|
+
// ignore exceptions during capability analysis
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
analyze_fn(success, messages, tools);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
// for debugging only
|
|
52
|
+
static void caps_print_stats(value & v, const std::string & path) {
|
|
53
|
+
std::string ops;
|
|
54
|
+
for (const auto & name : v->stats.ops) {
|
|
55
|
+
ops += name + " ";
|
|
56
|
+
}
|
|
57
|
+
JJ_DEBUG("Value %s, type: %s %s, ops: %s",
|
|
58
|
+
path.c_str(),
|
|
59
|
+
v->type().c_str(),
|
|
60
|
+
v->stats.used ? "(used)" : "",
|
|
61
|
+
ops.c_str());
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
std::string caps::to_string() const {
|
|
65
|
+
std::ostringstream ss;
|
|
66
|
+
ss << "Caps(\n";
|
|
67
|
+
ss << " requires_typed_content=" << requires_typed_content << "\n";
|
|
68
|
+
ss << " supports_tools=" << supports_tools << "\n";
|
|
69
|
+
ss << " supports_tool_calls=" << supports_tool_calls << "\n";
|
|
70
|
+
ss << " supports_parallel_tool_calls=" << supports_parallel_tool_calls << "\n";
|
|
71
|
+
ss << " supports_system_role=" << supports_system_role << "\n";
|
|
72
|
+
ss << ")";
|
|
73
|
+
return ss.str();
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
caps caps_get(jinja::program & prog) {
|
|
77
|
+
caps result;
|
|
78
|
+
|
|
79
|
+
static const auto has_op = [](value & v, const std::string & op_name) {
|
|
80
|
+
return v->stats.ops.find(op_name) != v->stats.ops.end();
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
// case: typed content requirement
|
|
84
|
+
caps_try_execute(
|
|
85
|
+
prog,
|
|
86
|
+
[&]() {
|
|
87
|
+
// messages
|
|
88
|
+
return json::array({
|
|
89
|
+
{
|
|
90
|
+
{"role", "user"},
|
|
91
|
+
{"content", "content"}
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
},
|
|
95
|
+
[&]() {
|
|
96
|
+
// tools
|
|
97
|
+
return json{nullptr};
|
|
98
|
+
},
|
|
99
|
+
[&](bool, value & messages, value &) {
|
|
100
|
+
auto & content = messages->at(0)->at("content");
|
|
101
|
+
caps_print_stats(content, "messages[0].content");
|
|
102
|
+
if (has_op(content, "selectattr") || has_op(content, "array_access")) {
|
|
103
|
+
// accessed as an array
|
|
104
|
+
result.requires_typed_content = true;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
);
|
|
108
|
+
|
|
109
|
+
|
|
110
|
+
// case: system prompt support
|
|
111
|
+
caps_try_execute(
|
|
112
|
+
prog,
|
|
113
|
+
[&]() {
|
|
114
|
+
// messages
|
|
115
|
+
return json::array({
|
|
116
|
+
{
|
|
117
|
+
{"role", "system"},
|
|
118
|
+
{"content", "System message"}
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
{"role", "user"},
|
|
122
|
+
{"content", "User message"}
|
|
123
|
+
},
|
|
124
|
+
});
|
|
125
|
+
},
|
|
126
|
+
[&]() {
|
|
127
|
+
// tools
|
|
128
|
+
return json::array();
|
|
129
|
+
},
|
|
130
|
+
[&](bool, value & messages, value &) {
|
|
131
|
+
auto & content = messages->at(0)->at("content");
|
|
132
|
+
caps_print_stats(content, "messages[0].content");
|
|
133
|
+
if (!content->stats.used) {
|
|
134
|
+
result.supports_system_role = false;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
);
|
|
138
|
+
|
|
139
|
+
// case: tools support
|
|
140
|
+
caps_try_execute(
|
|
141
|
+
prog,
|
|
142
|
+
[&]() {
|
|
143
|
+
// messages
|
|
144
|
+
return json::array({
|
|
145
|
+
{
|
|
146
|
+
{"role", "user"},
|
|
147
|
+
{"content", "User message"},
|
|
148
|
+
},
|
|
149
|
+
{
|
|
150
|
+
{"role", "assistant"},
|
|
151
|
+
{"content", "Assistant message"},
|
|
152
|
+
{"tool_calls", json::array({
|
|
153
|
+
{
|
|
154
|
+
{"id", "call1"},
|
|
155
|
+
{"type", "function"},
|
|
156
|
+
{"function", {
|
|
157
|
+
{"name", "tool1"},
|
|
158
|
+
{"arguments", {
|
|
159
|
+
{"arg", "value"}
|
|
160
|
+
}}
|
|
161
|
+
}}
|
|
162
|
+
},
|
|
163
|
+
{
|
|
164
|
+
{"id", "call2"},
|
|
165
|
+
{"type", "function"},
|
|
166
|
+
{"function", {
|
|
167
|
+
{"name", "tool2"},
|
|
168
|
+
{"arguments", {
|
|
169
|
+
{"arg", "value"}
|
|
170
|
+
}}
|
|
171
|
+
}}
|
|
172
|
+
}
|
|
173
|
+
})}
|
|
174
|
+
},
|
|
175
|
+
{
|
|
176
|
+
{"role", "user"},
|
|
177
|
+
{"content", "User message"},
|
|
178
|
+
},
|
|
179
|
+
});
|
|
180
|
+
},
|
|
181
|
+
[&]() {
|
|
182
|
+
// tools
|
|
183
|
+
return json::array({
|
|
184
|
+
{
|
|
185
|
+
{"name", "tool"},
|
|
186
|
+
{"type", "function"},
|
|
187
|
+
{"function", {
|
|
188
|
+
{"name", "tool"},
|
|
189
|
+
{"description", "Tool description"},
|
|
190
|
+
{"parameters", {
|
|
191
|
+
{"type", "object"},
|
|
192
|
+
{"properties", {
|
|
193
|
+
{"arg", {
|
|
194
|
+
{"type", "string"},
|
|
195
|
+
{"description", "Arg description"},
|
|
196
|
+
}},
|
|
197
|
+
}},
|
|
198
|
+
{"required", json::array({ "arg" })},
|
|
199
|
+
}},
|
|
200
|
+
}},
|
|
201
|
+
},
|
|
202
|
+
});
|
|
203
|
+
},
|
|
204
|
+
[&](bool success, value & messages, value & tools) {
|
|
205
|
+
if (!success) {
|
|
206
|
+
result.supports_tool_calls = false;
|
|
207
|
+
result.supports_tools = false;
|
|
208
|
+
return;
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
auto & tool_name = tools->at(0)->at("function")->at("name");
|
|
212
|
+
caps_print_stats(tool_name, "tools[0].function.name");
|
|
213
|
+
if (!tool_name->stats.used) {
|
|
214
|
+
result.supports_tools = false;
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
auto & tool_calls = messages->at(1)->at("tool_calls");;
|
|
218
|
+
caps_print_stats(tool_calls, "messages[1].tool_calls");
|
|
219
|
+
if (!tool_calls->stats.used) {
|
|
220
|
+
result.supports_tool_calls = false;
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
// check for second tool call usage
|
|
224
|
+
auto & tool_call_1 = tool_calls->at(1)->at("function");
|
|
225
|
+
caps_print_stats(tool_call_1, "messages[1].tool_calls[1].function");
|
|
226
|
+
if (!tool_call_1->stats.used) {
|
|
227
|
+
result.supports_parallel_tool_calls = false;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
);
|
|
231
|
+
|
|
232
|
+
JJ_DEBUG("%s\n", result.to_string().c_str());
|
|
233
|
+
|
|
234
|
+
return result;
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
} // namespace jinja
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
#pragma once
|
|
2
|
+
|
|
3
|
+
#include "runtime.h"
|
|
4
|
+
|
|
5
|
+
#include <string>
|
|
6
|
+
|
|
7
|
+
namespace jinja {
|
|
8
|
+
|
|
9
|
+
struct caps {
|
|
10
|
+
bool supports_tools = true;
|
|
11
|
+
bool supports_tool_calls = true;
|
|
12
|
+
bool supports_system_role = true;
|
|
13
|
+
bool supports_parallel_tool_calls = true;
|
|
14
|
+
|
|
15
|
+
bool requires_typed_content = false; // default: use string content
|
|
16
|
+
|
|
17
|
+
// for debugging
|
|
18
|
+
std::string to_string() const;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
caps caps_get(jinja::program & prog);
|
|
22
|
+
void debug_print_caps(const caps & c);
|
|
23
|
+
|
|
24
|
+
} // namespace jinja
|
|
@@ -0,0 +1,341 @@
|
|
|
1
|
+
#include "lexer.h"
|
|
2
|
+
#include "runtime.h"
|
|
3
|
+
|
|
4
|
+
#include <cctype>
|
|
5
|
+
#include <functional>
|
|
6
|
+
#include <map>
|
|
7
|
+
#include <string>
|
|
8
|
+
#include <vector>
|
|
9
|
+
|
|
10
|
+
#define FILENAME "jinja-lexer"
|
|
11
|
+
|
|
12
|
+
namespace jinja {
|
|
13
|
+
|
|
14
|
+
static void string_lstrip(std::string & s, const char * chars) {
|
|
15
|
+
size_t start = s.find_first_not_of(chars);
|
|
16
|
+
if (start == std::string::npos) {
|
|
17
|
+
s.clear();
|
|
18
|
+
} else {
|
|
19
|
+
s.erase(0, start);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
static void string_rstrip(std::string & s, const char * chars) {
|
|
24
|
+
size_t end = s.find_last_not_of(chars);
|
|
25
|
+
if (end == std::string::npos) {
|
|
26
|
+
s.clear();
|
|
27
|
+
} else {
|
|
28
|
+
s.erase(end + 1);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
lexer_result lexer::tokenize(const std::string & source) {
|
|
33
|
+
std::vector<token> tokens;
|
|
34
|
+
|
|
35
|
+
// NOTE: do NOT transform the source string (i.e. preprocessing), as we need to keep
|
|
36
|
+
// the original character positions for error reporting etc.
|
|
37
|
+
std::string src = source;
|
|
38
|
+
|
|
39
|
+
if (source.empty()) {
|
|
40
|
+
return {tokens, src};
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
// Normalize \r\n or \r to \n
|
|
44
|
+
for (std::string::size_type pos = 0; (pos = src.find("\r\n", pos)) != std::string::npos; ) {
|
|
45
|
+
src.erase(pos, 1);
|
|
46
|
+
++pos;
|
|
47
|
+
}
|
|
48
|
+
for (std::string::size_type pos = 0; (pos = src.find("\r", pos)) != std::string::npos; ) {
|
|
49
|
+
src.replace(pos, 1, 1, '\n');
|
|
50
|
+
++pos;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// In the default configuration:
|
|
54
|
+
// - a single trailing newline is stripped if present
|
|
55
|
+
// - other whitespace (spaces, tabs, newlines etc.) is returned unchanged
|
|
56
|
+
if (source.back() == '\n') {
|
|
57
|
+
src.pop_back();
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
size_t pos = 0;
|
|
61
|
+
size_t start_pos = 0;
|
|
62
|
+
size_t curly_bracket_depth = 0;
|
|
63
|
+
|
|
64
|
+
using pred = std::function<bool(char)>;
|
|
65
|
+
auto consume_while = [&](const pred & predicate) -> std::string {
|
|
66
|
+
std::string str;
|
|
67
|
+
while (predicate(src[pos])) {
|
|
68
|
+
// check for escape char
|
|
69
|
+
if (src[pos] == '\\') {
|
|
70
|
+
// consume backslash
|
|
71
|
+
++pos;
|
|
72
|
+
// check for end of input
|
|
73
|
+
if (pos >= src.size()) {
|
|
74
|
+
throw lexer_exception("unexpected end of input after escape character", source, pos);
|
|
75
|
+
}
|
|
76
|
+
// add escaped char
|
|
77
|
+
char escaped_char = src[pos++];
|
|
78
|
+
if (escape_chars.find(escaped_char) == escape_chars.end()) {
|
|
79
|
+
throw lexer_exception(std::string("unknown escape character \\") + escaped_char, source, pos);
|
|
80
|
+
}
|
|
81
|
+
char unescaped_char = escape_chars.at(escaped_char);
|
|
82
|
+
str += unescaped_char;
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
str += src[pos++];
|
|
87
|
+
if (pos > src.size()) {
|
|
88
|
+
throw lexer_exception("unexpected end of input during consume_while", source, pos);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return str;
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
auto consume_numeric = [&]() -> std::string {
|
|
95
|
+
std::string num = consume_while(is_integer);
|
|
96
|
+
if (pos < src.size() && src[pos] == '.' && pos + 1 < src.size() && is_integer(src[pos + 1])) {
|
|
97
|
+
++pos; // Consume '.'
|
|
98
|
+
std::string frac = consume_while(is_integer);
|
|
99
|
+
num += "." + frac;
|
|
100
|
+
}
|
|
101
|
+
return num;
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
auto next_pos_is = [&](std::initializer_list<char> chars, size_t n = 1) -> bool {
|
|
105
|
+
if (pos + n >= src.size()) return false;
|
|
106
|
+
for (char c : chars) {
|
|
107
|
+
if (src[pos + n] == c) return true;
|
|
108
|
+
}
|
|
109
|
+
return false;
|
|
110
|
+
};
|
|
111
|
+
|
|
112
|
+
// note: default config for chat template: lstrip_blocks = true, trim_blocks = true
|
|
113
|
+
|
|
114
|
+
// text\n[space]{block} --> text\n{block}
|
|
115
|
+
bool opt_lstrip_blocks = true;
|
|
116
|
+
|
|
117
|
+
// {block}\n[space]text --> {block}[space]text
|
|
118
|
+
bool opt_trim_blocks = true;
|
|
119
|
+
|
|
120
|
+
// options set dynamically based on current/last block
|
|
121
|
+
bool is_lstrip_block = false; // example: {%-
|
|
122
|
+
bool is_rstrip_block = false; // example: -%}
|
|
123
|
+
|
|
124
|
+
while (pos < src.size()) {
|
|
125
|
+
start_pos = pos;
|
|
126
|
+
// JJ_DEBUG("lexer main loop at pos %zu: '%s...'", pos, src.substr(pos, 10).c_str());
|
|
127
|
+
|
|
128
|
+
// First, consume all text that is outside of a Jinja statement or expression
|
|
129
|
+
token::type last_token_type = tokens.empty()
|
|
130
|
+
? token::close_statement // initial state
|
|
131
|
+
: tokens.back().t;
|
|
132
|
+
if (last_token_type == token::close_statement ||
|
|
133
|
+
last_token_type == token::close_expression ||
|
|
134
|
+
last_token_type == token::comment) {
|
|
135
|
+
|
|
136
|
+
bool last_block_can_rm_newline = false;
|
|
137
|
+
is_rstrip_block = false;
|
|
138
|
+
if (pos > 3) {
|
|
139
|
+
char c0 = src[pos - 3];
|
|
140
|
+
char c1 = src[pos - 2];
|
|
141
|
+
char c2 = src[pos - 1];
|
|
142
|
+
// strip if: -[%}#]}text
|
|
143
|
+
is_rstrip_block = c0 == '-'
|
|
144
|
+
&& (c1 == '%' || c1 == '}' || c1 == '#')
|
|
145
|
+
&& c2 == '}';
|
|
146
|
+
// match behavior of hf.js: exclude {{ and }} cases, regex: ([#%-]})
|
|
147
|
+
last_block_can_rm_newline = (c1 == '#' || c1 == '%' || c1 == '-') && c2 == '}';
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
size_t start = pos;
|
|
151
|
+
size_t end = start;
|
|
152
|
+
while (pos < src.size() &&
|
|
153
|
+
// Keep going until we hit the next Jinja statement or expression
|
|
154
|
+
!(
|
|
155
|
+
src[pos] == '{' &&
|
|
156
|
+
next_pos_is( {'%', '{', '#'} )
|
|
157
|
+
)) {
|
|
158
|
+
end = ++pos;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
// equivalent to hf.js code: template.replace(/^[ \t]*({[#%-])/gm, "$1");
|
|
162
|
+
if (opt_lstrip_blocks && src[pos] == '{' && next_pos_is({'%', '#', '-'})) {
|
|
163
|
+
size_t current = end;
|
|
164
|
+
while (current > start) {
|
|
165
|
+
char c = src[current - 1];
|
|
166
|
+
if (current == 1) {
|
|
167
|
+
end = 0; // Trim from the start of the string
|
|
168
|
+
break;
|
|
169
|
+
}
|
|
170
|
+
if (c == '\n') {
|
|
171
|
+
end = current; // Trim from the start of the line
|
|
172
|
+
break;
|
|
173
|
+
}
|
|
174
|
+
if (!std::isspace(static_cast<unsigned char>(c))) {
|
|
175
|
+
break; // Found non-whitespace before newline, keep
|
|
176
|
+
}
|
|
177
|
+
--current;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
std::string text = src.substr(start, end - start);
|
|
182
|
+
|
|
183
|
+
// equivalent to hf.js code: template.replace(/([#%-]})\n/g, "$1");
|
|
184
|
+
if (opt_trim_blocks && last_block_can_rm_newline) {
|
|
185
|
+
if (!text.empty() && text.front() == '\n') {
|
|
186
|
+
text.erase(text.begin());
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
if (is_rstrip_block) {
|
|
191
|
+
// example: {last_block}[space]text
|
|
192
|
+
// doing lstrip on text, effectively rstrip the LAST block
|
|
193
|
+
// JJ_DEBUG("RSTRIP block detected, current text: '%s'", text.c_str());
|
|
194
|
+
string_lstrip(text, " \t\r\n");
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
is_lstrip_block = src[pos] == '{' && next_pos_is({'{', '%', '#'}) && next_pos_is({'-'}, 2);
|
|
198
|
+
if (is_lstrip_block) {
|
|
199
|
+
// example: text[space]{current_block}
|
|
200
|
+
// doing rstrip on text, effectively lstrip the CURRENT block
|
|
201
|
+
// JJ_DEBUG("LSTRIP block detected, current text: '%s'", text.c_str());
|
|
202
|
+
string_rstrip(text, " \t\r\n");
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
if (!text.empty()) {
|
|
206
|
+
// JJ_DEBUG("consumed text: '%s'", text.c_str());
|
|
207
|
+
tokens.push_back({token::text, text, start_pos});
|
|
208
|
+
continue;
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
// Possibly consume a comment
|
|
213
|
+
// TODO: handle lstrip/rstrip for comments? (not important for now)
|
|
214
|
+
if (src[pos] == '{' && next_pos_is( {'#'} )) {
|
|
215
|
+
start_pos = pos;
|
|
216
|
+
pos += 2; // Skip the opening {#
|
|
217
|
+
std::string comment;
|
|
218
|
+
while (!(src[pos] == '#' && next_pos_is( {'}'} ))) {
|
|
219
|
+
if (pos + 2 >= src.size()) {
|
|
220
|
+
throw lexer_exception("missing end of comment tag", source, pos);
|
|
221
|
+
}
|
|
222
|
+
comment += src[pos++];
|
|
223
|
+
}
|
|
224
|
+
JJ_DEBUG("consumed comment: '%s'", comment.c_str());
|
|
225
|
+
tokens.push_back({token::comment, comment, start_pos});
|
|
226
|
+
pos += 2; // Skip the closing #}
|
|
227
|
+
continue;
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
if (src[pos] == '-' && (
|
|
231
|
+
last_token_type == token::open_expression ||
|
|
232
|
+
last_token_type == token::open_statement)
|
|
233
|
+
) {
|
|
234
|
+
JJ_DEBUG("lexer main loop at pos %zu: '%s...'", pos, src.substr(pos, 10).c_str());
|
|
235
|
+
pos++; // consume '-' in {%- or {{-
|
|
236
|
+
if (pos >= src.size()) break;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
// Consume (and ignore) all whitespace inside Jinja statements or expressions
|
|
240
|
+
consume_while([](char c) { return std::isspace(static_cast<unsigned char>(c)); });
|
|
241
|
+
|
|
242
|
+
if (pos >= src.size()) break;
|
|
243
|
+
|
|
244
|
+
char ch = src[pos];
|
|
245
|
+
|
|
246
|
+
bool is_closing_block = ch == '-' && next_pos_is( {'%', '}'} );
|
|
247
|
+
|
|
248
|
+
// Check for unary operators
|
|
249
|
+
if (!is_closing_block && (ch == '-' || ch == '+')) {
|
|
250
|
+
start_pos = pos;
|
|
251
|
+
token::type last_token_type = tokens.empty() ? token::eof : tokens.back().t;
|
|
252
|
+
if (last_token_type == token::text || last_token_type == token::eof) {
|
|
253
|
+
throw lexer_exception(std::string("unexpected character: ") + ch, source, pos);
|
|
254
|
+
}
|
|
255
|
+
switch (last_token_type) {
|
|
256
|
+
case token::identifier:
|
|
257
|
+
case token::numeric_literal:
|
|
258
|
+
case token::string_literal:
|
|
259
|
+
case token::close_paren:
|
|
260
|
+
case token::close_square_bracket:
|
|
261
|
+
// Part of a binary operator
|
|
262
|
+
// a - 1, 1 - 1, true - 1, "apple" - 1, (1) - 1, a[1] - 1
|
|
263
|
+
// Continue parsing normally
|
|
264
|
+
break;
|
|
265
|
+
default: {
|
|
266
|
+
// Is part of a unary operator
|
|
267
|
+
// (-1), [-1], (1 + -1), not -1, -apple
|
|
268
|
+
++pos; // Consume the operator
|
|
269
|
+
|
|
270
|
+
// Check for numbers following the unary operator
|
|
271
|
+
std::string num = consume_numeric();
|
|
272
|
+
std::string value = std::string(1, ch) + num;
|
|
273
|
+
token::type t = num.empty() ? token::unary_operator : token::numeric_literal;
|
|
274
|
+
// JJ_DEBUG("consumed unary operator or numeric literal: '%s'", value.c_str());
|
|
275
|
+
tokens.push_back({t, value, start_pos});
|
|
276
|
+
continue;
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
// Try to match one of the tokens in the mapping table
|
|
282
|
+
bool matched = false;
|
|
283
|
+
for (const auto & [seq, typ] : ordered_mapping_table) {
|
|
284
|
+
start_pos = pos;
|
|
285
|
+
// Inside an object literal, don't treat "}}" as expression-end
|
|
286
|
+
if (seq == "}}" && curly_bracket_depth > 0) {
|
|
287
|
+
continue;
|
|
288
|
+
}
|
|
289
|
+
if (pos + seq.size() <= src.size() && src.substr(pos, seq.size()) == seq) {
|
|
290
|
+
tokens.push_back({typ, seq, start_pos});
|
|
291
|
+
if (typ == token::open_expression) {
|
|
292
|
+
curly_bracket_depth = 0;
|
|
293
|
+
} else if (typ == token::open_curly_bracket) {
|
|
294
|
+
++curly_bracket_depth;
|
|
295
|
+
} else if (typ == token::close_curly_bracket) {
|
|
296
|
+
--curly_bracket_depth;
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
pos += seq.size();
|
|
300
|
+
matched = true;
|
|
301
|
+
break; // continue main loop
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
if (matched) continue; // continue main loop
|
|
305
|
+
|
|
306
|
+
// Strings
|
|
307
|
+
if (ch == '\'' || ch == '"') {
|
|
308
|
+
start_pos = pos;
|
|
309
|
+
++pos; // Skip opening quote
|
|
310
|
+
std::string str = consume_while([ch](char c) { return c != ch; });
|
|
311
|
+
// JJ_DEBUG("consumed string literal: '%s'", str.c_str());
|
|
312
|
+
tokens.push_back({token::string_literal, str, start_pos});
|
|
313
|
+
++pos; // Skip closing quote
|
|
314
|
+
continue;
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
// Numbers
|
|
318
|
+
if (is_integer(ch)) {
|
|
319
|
+
start_pos = pos;
|
|
320
|
+
std::string num = consume_numeric();
|
|
321
|
+
// JJ_DEBUG("consumed numeric literal: '%s'", num.c_str());
|
|
322
|
+
tokens.push_back({token::numeric_literal, num, start_pos});
|
|
323
|
+
continue;
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
// Identifiers
|
|
327
|
+
if (is_word(ch)) {
|
|
328
|
+
start_pos = pos;
|
|
329
|
+
std::string word = consume_while(is_word);
|
|
330
|
+
// JJ_DEBUG("consumed identifier: '%s'", word.c_str());
|
|
331
|
+
tokens.push_back({token::identifier, word, start_pos});
|
|
332
|
+
continue;
|
|
333
|
+
}
|
|
334
|
+
|
|
335
|
+
throw lexer_exception(std::string("unexpected character: ") + ch, source, pos);
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
return {std::move(tokens), src};
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
} // namespace jinja
|