diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-12-02 22:14:52 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-12-02 22:14:52 +0100 |
commit | c01e5156561d89c878c8b71929ddb7f4711baf27 (patch) | |
tree | f3b37ed35dfc3933b67b767e801ad9d0279d15b3 | |
parent | mds-kbdc: use absolute and relative paths (diff) | |
download | mds-c01e5156561d89c878c8b71929ddb7f4711baf27.tar.gz mds-c01e5156561d89c878c8b71929ddb7f4711baf27.tar.bz2 mds-c01e5156561d89c878c8b71929ddb7f4711baf27.tar.xz |
mds-kbdc: beginning of actual compilation
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | src/mds-kbdc/compile-layout.c | 158 | ||||
-rw-r--r-- | src/mds-kbdc/compile-layout.h | 35 | ||||
-rw-r--r-- | src/mds-kbdc/mds-kbdc.c | 3 |
4 files changed, 196 insertions, 2 deletions
@@ -33,7 +33,7 @@ OBJ_mds-registry_ = mds-registry util globals reexec registry signals \ OBJ_mds-kbdc_ = mds-kbdc globals raw-data functions string tree \ make-tree parse-error simplify-tree parsed \ process-includes validate-tree eliminate-dead-code \ - paths include-stack + paths include-stack compile-layout 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/compile-layout.c b/src/mds-kbdc/compile-layout.c new file mode 100644 index 0000000..84893a4 --- /dev/null +++ b/src/mds-kbdc/compile-layout.c @@ -0,0 +1,158 @@ +/** + * 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 "compile-layout.h" + +#include "include-stack.h" + + + +/** + * Tree type constant shortener + */ +#define C(TYPE) MDS_KBDC_TREE_TYPE_##TYPE + +/** + * Add an error with “included from here”-notes to the error list + * + * @param NODE:const mds_kbdc_tree_t* The node the triggered the error + * @param PTR:size_t The number of “included from here”-notes + * @param SEVERITY:identifier * in `MDS_KBDC_PARSE_ERROR_*` to indicate severity + * @param ...:const char*, ... Error description format string and arguments + * @scope error:mds_kbdc_parse_error_t* Variable where the new error will be stored + */ +#define NEW_ERROR(NODE, PTR, SEVERITY, ...) \ + NEW_ERROR_WITH_INCLUDES(NODE, PTR, SEVERITY, __VA_ARGS__) + + + +/** + * Variable whether the latest created error is stored + */ +static mds_kbdc_parse_error_t* error; + +/** + * The parameter of `compile_layout` + */ +static mds_kbdc_parsed_t* restrict result; + + + +/** + * Compile a subtree + * + * @param tree The tree to compile + * @return Zero on success, -1 on error + */ +static int compile_subtree(mds_kbdc_tree_t* restrict tree); + + + +/** + * Compile an include-statement + * + * @param tree The tree to compile + * @return Zero on success, -1 on error + */ +static int compile_include(mds_kbdc_tree_include_t* restrict tree) +{ + void* data; + int r; + if (mds_kbdc_include_stack_push(tree, &data)) + return -1; + r = compile_subtree(tree->inner); + mds_kbdc_include_stack_pop(data); + return r; +} + + +/** + * Compile a subtree + * + * @param tree The tree to compile + * @return Zero on success, -1 on error + */ +static int compile_subtree(mds_kbdc_tree_t* restrict tree) +{ +#define t(expr) if (r = (expr), r < 0) return r +#define c(type) t (compile_##type(&(tree->type))) +#define c_(type) t (compile_##type(&(tree->type##_))) + int r; + again: + if (tree == NULL) + return 0; + + switch (tree->type) + { + case C(INFORMATION): + t (compile_subtree(tree->information.inner)); + break; + case C(INFORMATION_LANGUAGE): break; + case C(INFORMATION_COUNTRY): break; + case C(INFORMATION_VARIANT): break; + case C(INCLUDE): + c(include); + break; + case C(FUNCTION): break; + case C(MACRO): break; + case C(ASSUMPTION): + t ((includes_ptr == 0) && compile_subtree(tree->assumption.inner)); + break; + case C(ASSUMPTION_HAVE): break; + case C(ASSUMPTION_HAVE_CHARS): break; + case C(ASSUMPTION_HAVE_RANGE): break; + case C(FOR): break; + case C(IF): break; + case C(LET): break; + case C(MAP): break; + case C(MACRO_CALL): break; + case C(RETURN): break; + case C(BREAK): break; + case C(CONTINUE): break; + default: + break; + } + + tree = tree->next; + goto again; + pfail: + return -1; +#undef c_ +#undef c +#undef t +} + + +/** + * Compile the layout code + * + * @param result_ `result` from `eliminate_dead_code`, will be updated + * @return -1 if an error occursed that cannot be stored in `result`, zero otherwise + */ +int compile_layout(mds_kbdc_parsed_t* restrict result_) +{ + int r; + mds_kbdc_include_stack_begin(result = result_); + r = compile_subtree(result_->tree); + return mds_kbdc_include_stack_end(), r; +} + + + +#undef NEW_ERROR +#undef C + diff --git a/src/mds-kbdc/compile-layout.h b/src/mds-kbdc/compile-layout.h new file mode 100644 index 0000000..677c48c --- /dev/null +++ b/src/mds-kbdc/compile-layout.h @@ -0,0 +1,35 @@ +/** + * 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_COMPILE_LAYOUT_H +#define MDS_MDS_KBDC_COMPILE_LAYOUT_H + + +#include "parsed.h" + + +/** + * Compile the layout code + * + * @param result `result` from `eliminate_dead_code`, will be updated + * @return -1 if an error occursed that cannot be stored in `result`, zero otherwise + */ +int compile_layout(mds_kbdc_parsed_t* restrict result); + + +#endif + diff --git a/src/mds-kbdc/mds-kbdc.c b/src/mds-kbdc/mds-kbdc.c index 65960dd..4262f5d 100644 --- a/src/mds-kbdc/mds-kbdc.c +++ b/src/mds-kbdc/mds-kbdc.c @@ -23,6 +23,7 @@ #include "process-includes.h" #include "validate-tree.h" #include "eliminate-dead-code.h" +#include "compile-layout.h" #include <libmdsserver/macros.h> @@ -76,7 +77,7 @@ int main(int argc_, char** argv_) process (process_includes(&result)); process (validate_tree(&result)); process (eliminate_dead_code(&result)); - /* TODO process (compile_layout(&result)); */ + process (compile_layout(&result)); /* TODO process (assemble_layout(&result)); */ stop: mds_kbdc_tree_print(result.tree, stderr); |