diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/mds-kbdc/functions.c | 293 | ||||
| -rw-r--r-- | src/mds-kbdc/functions.h | 51 | ||||
| -rw-r--r-- | src/mds-kbdc/mds-kbdc.c | 21 | ||||
| -rw-r--r-- | src/mds-kbdc/string.c | 84 | ||||
| -rw-r--r-- | src/mds-kbdc/string.h | 52 |
6 files changed, 483 insertions, 20 deletions
@@ -30,7 +30,7 @@ OBJ_mds-server_ = mds-server interception-condition client multicast \ OBJ_mds-registry_ = mds-registry util globals reexec registry signals \ slave -OBJ_mds-kbdc_ = mds-kbdc globals raw-data +OBJ_mds-kbdc_ = mds-kbdc globals raw-data functions string OBJ_mds-server = $(foreach O,$(OBJ_mds-server_),obj/mds-server/$(O).o) OBJ_mds-registry = $(foreach O,$(OBJ_mds-registry_),obj/mds-registry/$(O).o) diff --git a/src/mds-kbdc/functions.c b/src/mds-kbdc/functions.c new file mode 100644 index 0000000..0d608f1 --- /dev/null +++ b/src/mds-kbdc/functions.c @@ -0,0 +1,293 @@ +/** + * mds — A micro-display server + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This program 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. + * + * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "functions.h" + +#include <stdlib.h> + + + +/** + * Define useful data for built-in function with 2 parameters. + */ +#define define_2 \ + const char32_t* restrict a = va_arg(args, const char32_t*); \ + const char32_t* restrict b = va_arg(args, const char32_t*); \ + size_t an = string_length(a); \ + size_t bn = string_length(b); \ + size_t i, n = an > bn ? an : bn; \ + char32_t* restrict rc = malloc((n + 1) * sizeof(char32_t)); \ + if (rc == NULL) \ + return NULL; \ + rc[n] = -1 + +/** + * Define useful data for built-in function with 1 parameter. + */ +#define define_1 \ + const char32_t* restrict a = va_arg(args, const char32_t*); \ + size_t i, n = string_length(a); \ + char32_t* restrict rc = malloc((n + 1) * sizeof(char32_t)); \ + if (rc == NULL) \ + return NULL; \ + rc[n] = -1 + + +/** + * Definition of the built-in function add/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_add_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] + b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function sub/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_sub_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] - b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function mul/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_mul_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] * b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function div/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_div_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] / b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function mod/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_mod_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] % b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function rsh/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_rsh_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] << b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function lsh/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_lsh_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] >> b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function or/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_or_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] | b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function and/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_and_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] & b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function xor/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_xor_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] ^ b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function not/1. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_not_1(va_list args) +{ + define_1; + for (i = 0; i < n; i++) + rc[i] = !a[i]; + return rc; +} + + +/** + * Definition of the built-in function equals/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_equals_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] == b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function greater/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_greater_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] > b[i % bn]; + return rc; +} + + +/** + * Definition of the built-in function less/2. + * + * @param args The arguments passed to the function. + * @return The return value of the function, `NULL` on error. + */ +static char32_t* function_builtin_less_2(va_list args) +{ + define_2; + for (i = 0; i < n; i++) + rc[i] = a[i % an] < b[i % bn]; + return rc; +} + + +/* static char32_t* function_builtin_set_2(va_list args); (variable index value) */ +/* static char32_t* function_builtin_get_2(va_list args); (variable index) */ + + +#undef define_1 +#undef define_2 + + +/** + * Check whether a function is defined. + * + * @param name The name of the function. + * @param arg_count The number of arguments to pass to the function. + * @return Whether the function is defined for the selected number of arguments. + */ +int function_check_defined(const char32_t* restrict name, size_t arg_count) +{ + return 0; /* TODO */ +} + + +/** + * Invoke a function defined in the keyboard layout source code, or that is builtin. + * + * @param name The name of the function. + * @param arg_count The number of arguments to pass to the function. + * @param ...:char32_t* The arguments to pass, do not end with a sentinel. + * @return The return value of the function, `NULL` on error. + */ +char32_t* function_invoke(const char32_t* restrict name, size_t arg_count, ...) +{ + return NULL; /* TODO */ +} + diff --git a/src/mds-kbdc/functions.h b/src/mds-kbdc/functions.h new file mode 100644 index 0000000..158c0b1 --- /dev/null +++ b/src/mds-kbdc/functions.h @@ -0,0 +1,51 @@ +/** + * mds — A micro-display server + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This program 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. + * + * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef MDS_MDS_KBDC_FUNCTIONS_H +#define MDS_MDS_KBDC_FUNCTIONS_H + + +#include "string.h" + +#include <stddef.h> +#include <stdarg.h> + + +/** + * Check whether a function is defined. + * + * @param name The name of the function. + * @param arg_count The number of arguments to pass to the function. + * @return Whether the function is defined for the selected number of arguments. + */ +int function_check_defined(const char32_t* restrict name, size_t arg_count) __attribute__((nonnull)); + +/** + * Invoke a function defined in the keyboard layout source code, or that is builtin. + * + * @param name The name of the function. + * @param arg_count The number of arguments to pass to the function. + * @param ...:char32_t* The arguments to pass, do not end with a sentinel. + * @return The return value of the function, `NULL` on error. + */ +char32_t* function_invoke(const char32_t* restrict name, size_t arg_count, ...) __attribute__((nonnull)); + +/* TODO define functions, check if function is built in */ + + +#endif + diff --git a/src/mds-kbdc/mds-kbdc.c b/src/mds-kbdc/mds-kbdc.c index da1d9a4..2cc6cff 100644 --- a/src/mds-kbdc/mds-kbdc.c +++ b/src/mds-kbdc/mds-kbdc.c @@ -44,9 +44,9 @@ int main(int argc_, char** argv_) source_code_initialise(&source_code); fail_if (read_source_lines(pathname, &source_code) < 0); - + /* - + information language "LANGUAGE" # multiple is allowed country "COUNTRY" # multiple is allowed @@ -103,23 +103,6 @@ int main(int argc_, char** argv_) let \2 : \or(\2 64) end if - \add(a b) # a + b - \sub(a b) # a - b - \mul(a b) # a ⋅ b - \div(a b) # floor[a / b] - \mod(a b) # a mod b - \rsh(a b) # a ⋅ 2 ↑ b - \lsh(a b) # floor[a / 2 ↑ b] - \or(a b) # bitwise - \and(a b) # bitwise - \xor(a b) # bitwise - \not(a) # logical - \equals(a b) # a = b - \greater(a b) # a > b - \less(a b) # a < b - \set(variable index value) - \get(variable index) - */ source_code_destroy(&source_code); diff --git a/src/mds-kbdc/string.c b/src/mds-kbdc/string.c new file mode 100644 index 0000000..ca33b83 --- /dev/null +++ b/src/mds-kbdc/string.c @@ -0,0 +1,84 @@ +/** + * mds — A micro-display server + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This program 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. + * + * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "string.h" + +#include <libmdsserver/macros.h> + +#include <stdlib.h> + + + +/** + * Get the length of a string. + * + * @param string The string. + * @return The length of the string. + */ +size_t string_length(const char32_t* restrict string) +{ + size_t i = 0; + while (string[i] >= 0) + i++; + return i; +} + + +/** + * Convert a NUL-terminated UTF-8 string to a -1-terminated UTF-32 string. + * + * @param string The UTF-8 string. + * @return The string in UTF-32, `NULL` on error. + */ +char32_t* string_decode(const char* restrict string) +{ + size_t i, j, n, length = 0; + char32_t* rc; + + /* Get the length of the UTF-32 string, excluding termination. */ + for (i = 0; string[i]; i++) + if ((string[i] & 0xC0) != 0x80) + length++; + + /* Allocated UTF-32 string. */ + if (xmalloc(rc, length + 1, char32_t)) + return NULL; + + /* Convert to UTF-32. */ + for (i = j = n = 0; string[i]; i++) + { + char c = string[i]; + if (n) + { + rc[j] <<= 6, rc[j] |= c & 0x3F; + if (--n == 0) + j++; + } + else if ((c & 0xC0) == 0xC0) + { + while (c & 0x80) + n++, c = (char)(c << 1); + rc[j] = c >> n--; + } + else + rc[j++] = c & 255; + } + + /* -1-terminate and return. */ + return rc[length] = -1, rc; +} + diff --git a/src/mds-kbdc/string.h b/src/mds-kbdc/string.h new file mode 100644 index 0000000..6a5d528 --- /dev/null +++ b/src/mds-kbdc/string.h @@ -0,0 +1,52 @@ +/** + * mds — A micro-display server + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This program 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. + * + * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef MDS_MDS_KBDC_STRING_H +#define MDS_MDS_KBDC_STRING_H + + +#include <stdint.h> +#include <stddef.h> + + +/** + * Data type for a character in a decoded string. + */ +typedef int32_t char32_t; + + +/** + * Get the length of a string. + * + * @param string The string. + * @return The length of the string. + */ +size_t string_length(const char32_t* restrict string) __attribute__((pure, nonnull)); + +/** + * Convert a NUL-terminated UTF-8 string to a -1-terminated UTF-32 string. + * + * @param string The UTF-8 string. + * @return The string in UTF-32, `NULL` on error. + */ +char32_t* string_decode(const char* restrict string) __attribute__((nonnull)); + +/* TODO string_encode */ + + +#endif + |