Removed all libsql support. (0.40.4)
This commit is contained in:
parent
45dbcde527
commit
74a003236d
13 changed files with 6 additions and 226 deletions
|
|
@ -257,14 +257,6 @@ static const char *opcode_name(OpCode op) {
|
|||
return "SQLITE_EXEC";
|
||||
case OP_SQLITE_QUERY:
|
||||
return "SQLITE_QUERY";
|
||||
case OP_LIBSQL_OPEN:
|
||||
return "LIBSQL_OPEN";
|
||||
case OP_LIBSQL_CLOSE:
|
||||
return "LIBSQL_CLOSE";
|
||||
case OP_LIBSQL_EXEC:
|
||||
return "LIBSQL_EXEC";
|
||||
case OP_LIBSQL_QUERY:
|
||||
return "LIBSQL_QUERY";
|
||||
case OP_PCSC_ESTABLISH:
|
||||
return "PCSC_ESTABLISH";
|
||||
case OP_PCSC_RELEASE:
|
||||
|
|
|
|||
|
|
@ -162,11 +162,6 @@ typedef enum {
|
|||
OP_SQLITE_EXEC, // pops sql, handle; pushes sqlite rc (0=OK)
|
||||
OP_SQLITE_QUERY, // pops sql, handle; pushes array<map>
|
||||
|
||||
// libsql (optional, independent)
|
||||
OP_LIBSQL_OPEN, // pops url/path; pushes handle (>0) or 0
|
||||
OP_LIBSQL_CLOSE, // pops handle; pushes Nil
|
||||
OP_LIBSQL_EXEC, // pops sql, handle; pushes rc (0=OK)
|
||||
OP_LIBSQL_QUERY, // pops sql, handle; pushes array<map>
|
||||
|
||||
// PCSC (smart card) opcodes
|
||||
OP_PCSC_ESTABLISH, // returns context id (>0) or 0
|
||||
|
|
|
|||
85
src/parser.c
85
src/parser.c
|
|
@ -2093,91 +2093,6 @@ static int emit_primary(Bytecode *bc, const char *src, size_t len, size_t *pos)
|
|||
free(name);
|
||||
return 1;
|
||||
}
|
||||
/* libsql builtins (independent extension) */
|
||||
if (strcmp(name, "libsql_open") == 0) {
|
||||
(*pos)++; /* '(' */
|
||||
if (!emit_expression(bc, src, len, pos)) {
|
||||
parser_fail(*pos, "libsql_open expects (url_or_path)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!consume_char(src, len, pos, ')')) {
|
||||
parser_fail(*pos, "Expected ')' after libsql_open arg");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
bytecode_add_instruction(bc, OP_LIBSQL_OPEN, 0);
|
||||
free(name);
|
||||
return 1;
|
||||
}
|
||||
if (strcmp(name, "libsql_close") == 0) {
|
||||
(*pos)++; /* '(' */
|
||||
if (!emit_expression(bc, src, len, pos)) {
|
||||
parser_fail(*pos, "libsql_close expects (handle)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!consume_char(src, len, pos, ')')) {
|
||||
parser_fail(*pos, "Expected ')' after libsql_close arg");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
bytecode_add_instruction(bc, OP_LIBSQL_CLOSE, 0);
|
||||
free(name);
|
||||
return 1;
|
||||
}
|
||||
if (strcmp(name, "libsql_exec") == 0) {
|
||||
(*pos)++; /* '(' */
|
||||
if (!emit_expression(bc, src, len, pos)) {
|
||||
parser_fail(*pos, "libsql_exec expects (handle, sql)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!consume_char(src, len, pos, ',')) {
|
||||
parser_fail(*pos, "libsql_exec expects (handle, sql)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!emit_expression(bc, src, len, pos)) {
|
||||
parser_fail(*pos, "libsql_exec expects (handle, sql)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!consume_char(src, len, pos, ')')) {
|
||||
parser_fail(*pos, "Expected ')' after libsql_exec args");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
bytecode_add_instruction(bc, OP_LIBSQL_EXEC, 0);
|
||||
free(name);
|
||||
return 1;
|
||||
}
|
||||
if (strcmp(name, "libsql_query") == 0) {
|
||||
(*pos)++; /* '(' */
|
||||
if (!emit_expression(bc, src, len, pos)) {
|
||||
parser_fail(*pos, "libsql_query expects (handle, sql)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!consume_char(src, len, pos, ',')) {
|
||||
parser_fail(*pos, "libsql_query expects (handle, sql)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!emit_expression(bc, src, len, pos)) {
|
||||
parser_fail(*pos, "libsql_query expects (handle, sql)");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
if (!consume_char(src, len, pos, ')')) {
|
||||
parser_fail(*pos, "Expected ')' after libsql_query args");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
bytecode_add_instruction(bc, OP_LIBSQL_QUERY, 0);
|
||||
free(name);
|
||||
return 1;
|
||||
}
|
||||
if (strcmp(name, "curl_post") == 0) {
|
||||
(*pos)++; /* '(' */
|
||||
if (!emit_expression(bc, src, len, pos)) {
|
||||
|
|
|
|||
9
src/vm.c
9
src/vm.c
|
|
@ -65,7 +65,6 @@
|
|||
/* Note: INI opcode handlers are included below; changes in vm/ini/ .c files
|
||||
* require vm.c to rebuild. */
|
||||
#include "external/json.c"
|
||||
#include "external/libsql.c"
|
||||
#include "external/openssl.c"
|
||||
#include "external/pcre2.c"
|
||||
#include "external/pcsc.c"
|
||||
|
|
@ -884,13 +883,7 @@ void vm_run(VM *vm, Bytecode *entry) {
|
|||
}
|
||||
#endif
|
||||
|
||||
/* libsql ops (independent) */
|
||||
#ifdef FUN_WITH_LIBSQL
|
||||
#include "vm/libsql/close.c"
|
||||
#include "vm/libsql/exec.c"
|
||||
#include "vm/libsql/open.c"
|
||||
#include "vm/libsql/query.c"
|
||||
#endif
|
||||
/* libsql support removed */
|
||||
|
||||
/* PCRE2 ops */
|
||||
#ifdef FUN_WITH_PCRE2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue