aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.clang-format65
-rw-r--r--.gitignore2
-rw-r--r--peru.yaml6
-rw-r--r--requirements.pip.dev.txt1
-rw-r--r--src_c/common.c388
-rw-r--r--src_c/common.h77
-rw-r--r--src_doit/__init__.py15
7 files changed, 553 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..8c67bcb
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,65 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: true
+AlignEscapedNewlinesLeft: false
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AlwaysBreakAfterDefinitionReturnType: false
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+BinPackArguments: true
+ColumnLimit: 80
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+IndentWrappedFunctionNames: false
+IndentFunctionDeclarationAfterType: false
+MaxEmptyLinesToKeep: 2
+KeepEmptyLinesAtTheStartOfBlocks: true
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: true
+Standard: Cpp11
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+BreakBeforeBraces: Attach
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpacesInAngles: false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterCStyleCast: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas: '^ IWYU pragma:'
+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+DisableFormat: false
+SortIncludes: false
+...
diff --git a/.gitignore b/.gitignore
index b4f8c83..f50b932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
/.doit.db
+/.peru
/build
/cache
+/deps
/node_modules
/src_py/opcut/json_schema_repo.json
/src_py/opcut/ui
diff --git a/peru.yaml b/peru.yaml
new file mode 100644
index 0000000..5bccd4e
--- /dev/null
+++ b/peru.yaml
@@ -0,0 +1,6 @@
+imports:
+ jsmn: deps/jsmn
+
+git module jsmn:
+ url: https://github.com/zserge/jsmn
+ pick: jsmn.h
diff --git a/requirements.pip.dev.txt b/requirements.pip.dev.txt
index 867abcf..e65fe71 100644
--- a/requirements.pip.dev.txt
+++ b/requirements.pip.dev.txt
@@ -5,6 +5,7 @@ doit ~= 0.33.1
flake8 ~= 3.9.2
furo >= 2021.10.9
hat-doit ~= 0.7.0
+peru >= 1.3.0
pytest ~= 6.2.5
pytest-asyncio ~= 0.15.1
pytest-cov ~= 2.12.1
diff --git a/src_c/common.c b/src_c/common.c
new file mode 100644
index 0000000..8088dd3
--- /dev/null
+++ b/src_c/common.c
@@ -0,0 +1,388 @@
+#define JSMN_PARENT_LINKS
+
+#include <stdlib.h>
+#include <string.h>
+#include <jsmn.h>
+#include "common.h"
+
+
+static inline bool is_token_val(char *json, jsmntok_t *token, char *val) {
+ return strncmp(val, json + token->start, token->end - tokens->start) == 0;
+}
+
+
+static int write_params(opcut_params_t *params, FILE *stream) {
+ if (fputs("{\"cut_width\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(params->cut_width, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"min_initial_usage\":", stream) < 0)
+ return OPCUT_ERROR;
+
+ if (write_bool(params->min_initial_usage, stream))
+ return OPCUT_ERROR;
+
+ if (fputs("\"panels\":[", stream) < 0)
+ return OPCUT_ERROR;
+
+ for (size_t i = 0; i < params->panels_len; ++i) {
+ if (write_panel(result->panels + i, stream))
+ return OPCUT_ERROR;
+
+ if (i < result->panels_len - 1) {
+ if (fputs(",", stream) < 0)
+ return OPCUT_ERROR
+ }
+ }
+
+ if (fputs("],\"items\":[", stream) < 0)
+ return OPCUT_ERROR;
+
+ for (size_t i = 0; i < params->items_len; ++i) {
+ if (write_item(result->items + i, stream))
+ return OPCUT_ERROR;
+
+ if (i < result->items_len - 1) {
+ if (fputs(",", stream) < 0)
+ return OPCUT_ERROR
+ }
+ }
+
+ if (fputs("]}", stream) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int write_used(opcut_used_t *used, FILE *stream) {
+ if (fputs("{\"panel\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_str(&(used->panel->id), stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"item\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_str(&(used->item->id), stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"x\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(used->x, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"y\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(used->y, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"rotate\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_bool(used->rotate, stream))
+ return OPCUT_ERROR;
+
+ if (fputs("}", stream) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int write_unused(opcut_unused_t *unused, FILE *stream) {
+ if (fputs("{\"panel\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_str(&(unused->panel->id), stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"width\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(unused->width, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"height\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(unused->height, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"x\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(unused->x, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"y\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(unused->y, stream))
+ return OPCUT_ERROR;
+
+ if (fputs("}", stream) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int write_panel(opcut_panel_t *panel, FILE *stream) {
+ if (fputs("{\"id\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_str(&(panel->id), stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"width\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(panel->width, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"height\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(panel->height, stream))
+ return OPCUT_ERROR;
+
+ if (fputs("}", stream) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int write_item(opcut_item_t *item, FILE *stream) {
+ if (fputs("{\"id\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_str(&(item->id), stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"width\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(item->width, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"height\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_number(item->height, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"can_rotate\":", fputs) < 0)
+ return OPCUT_ERROR;
+
+ if (write_bool(item->can_rotate, stream))
+ return OPCUT_ERROR;
+
+ if (fputs("}", stream) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int write_number(double val, FILE *stream) {
+ if (fprintf(stream, "%f", val) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int write_bool(bool val, FILE *stream) {
+ if (fputs((val ? "true" : "false"), stream) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int write_str(opcut_str_t *str, FILE *stream) {
+ if (fprintf(stream, "\"%*s\"", str->len, str->data) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
+
+
+static int read_params(char *json, opcut_params_t *params, jsmntok_t *tokens,
+ size_t *pos) {
+ jsmntok_t *params_token = tokens + ((*pos)++);
+ if (tokens_len < 1 || params_token->type != JSMN_OBJECT)
+ return OPCUT_ERROR;
+
+ params->cut_width = 0;
+ params->min_initial_usage = false;
+ params->panels = NULL;
+ params->panels_len = 0;
+ params->items = NULL;
+ params->items_len = 0;
+
+ for (size_t i = 0; i < params_token->size; ++i) {
+ jsmntok_t *key_token = tokens + ((*pos)++);
+ jsmntok_t *value_token = tokens + ((*pos)++);
+ if (key_token->type != JSMN_STRING)
+ goto error_cleanup;
+
+ if (is_token_val(json, key_token, "cut_width")) {
+ if (read_number(json, &(params->cut_width), value_token))
+ goto error_cleanup;
+
+ } else if (is_token_val(json, key_token, "min_initial_usage")) {
+ if (read_bool(json, &(params->min_initial_usage), value_token))
+ goto error_cleanup;
+
+ } else if (is_token_val(json, key_token, "panels")) {
+ if (value_token->type != JSMN_ARRAY)
+ goto error_cleanup;
+
+ if (params->panels) {
+ free(params->panels);
+ params->panels = NULL;
+ }
+
+ params->panels_len = value_token->size;
+ params->panels = malloc(value_token->size * sizeof(opcut_panel_t));
+ if (!params->panels)
+ goto error_cleanup;
+
+ for (size_t j = 0; j < params->panels_len; ++j) {
+ if (!read_panel(json, params->panels + j, tokens, pos))
+ goto error_cleanup;
+ }
+
+ } else if (is_token_val(json, key_token, "items")) {
+ if (value_token->type != JSMN_ARRAY)
+ goto error_cleanup;
+
+ if (params->items) {
+ free(params->items);
+ params->items = NULL;
+ }
+
+ params->items_len = value_token->size;
+ params->items = malloc(value_token->size * sizeof(opcut_item_t));
+ if (!params->items)
+ goto error_cleanup;
+
+ for (size_t j = 0; j < params->items_len; ++j) {
+ if (!read_item(json, params->items + j, tokens, pos))
+ goto error_cleanup;
+ }
+ }
+ }
+
+ return OPCUT_SUCCESS;
+
+error_cleanup:
+ if (params->panels) {
+ free(params->panels);
+ params->panels = NULL;
+ }
+
+ if (params->items) {
+ free(params->items);
+ params->items = NULL;
+ }
+
+ return OPCUT_ERROR;
+}
+
+
+static int read_panel(char *json, opcut_panel_t *panel, jsmntok_t *tokens,
+ size_t *pos) {}
+
+
+static int read_item(char *json, opcut_item_t *item, jsmntok_t *tokens,
+ size_t *pos) {}
+
+
+static int read_number(char *json, double *val, jsmntok_t *token) {}
+
+
+static int read_bool(char *json, bool *val, jsmntok_t *token) {}
+
+
+static int read_string(char *json, opcut_str_t *str, jsmntok_t *token) {}
+
+
+int opcut_params_init(opcut_params_t *params, opcut_str_t *json) {
+ jsmn_parser parser;
+ int tokens_len;
+
+ jsmn_init(&parser);
+ tokens_len = jsmn_parse(&parser, json, json_len, NULL, 0);
+ if (tokens_len < 0)
+ return OPCUT_ERROR;
+
+ jsmntok_t *tokens = malloc(tokens_len * sizeof(jsmntok_t));
+ if (!tokens)
+ return OPCUT_ERROR;
+
+ jsmn_init(&parser);
+ tokens_len = jsmn_parse(&parser, json->data, json->len, tokens, tokens_len);
+ if (tokens_len < 0)
+ return OPCUT_ERROR;
+
+ size_t pos = 0;
+ return read_params(json->data, params, tokens, &pos);
+}
+
+
+void opcut_params_destroy(opcut_params_t *params) {
+ if (params->panels)
+ free(params->panels);
+
+ if (params->items)
+ free(params->items);
+}
+
+
+int opcut_result_write(opcut_result_t *result, FILE *stream) {
+ if (fputs("{\"params\":", stream) < 0)
+ return OPCUT_ERROR;
+
+ if (write_params(result->params + i, stream))
+ return OPCUT_ERROR;
+
+ if (fputs(",\"used\":[", stream) < 0)
+ return OPCUT_ERROR;
+
+ for (size_t i = 0; i < result->used_len; ++i) {
+ if (write_used(result->used + i, stream))
+ return OPCUT_ERROR;
+
+ if (i < result->used_len - 1) {
+ if (fputs(",", stream) < 0)
+ return OPCUT_ERROR
+ }
+ }
+
+ if (fputs("],\"unused\":[", stream) < 0)
+ return OPCUT_ERROR;
+
+ for (size_t i = 0; i < result->unused_len; ++i) {
+ if (write_unused(result->unused + i, stream))
+ return OPCUT_ERROR;
+
+ if (i < result->unused_len - 1) {
+ if (fputs(",", stream) < 0)
+ return OPCUT_ERROR;
+ }
+ }
+
+ if (fputs("]}\n", stream) < 0)
+ return OPCUT_ERROR;
+
+ return OPCUT_SUCCESS;
+}
diff --git a/src_c/common.h b/src_c/common.h
new file mode 100644
index 0000000..e8eb9d1
--- /dev/null
+++ b/src_c/common.h
@@ -0,0 +1,77 @@
+#ifndef OPCUT_COMMON_H
+#define OPCUT_COMMON_H
+
+
+#import <stdbool.h>
+#import <stdio.h>
+
+#define OPCUT_SUCCESS 0
+#define OPCUT_ERROR -1
+#define OPCUT_UNSOLVABLE 1
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+ char *data;
+ size_t len;
+} opcut_str_t;
+
+typedef struct {
+ opcut_str_t id;
+ double width;
+ double height;
+} opcut_panel_t;
+
+typedef struct {
+ opcut_str_t id;
+ double width;
+ double height;
+ bool can_rotate;
+} opcut_item_t;
+
+typedef struct {
+ double cut_width;
+ bool min_initial_usage;
+ opcut_panel_t *panels;
+ size_t panels_len;
+ opcut_item_t *items;
+ size_t items_len;
+} opcut_params_t;
+
+typedef struct {
+ opcut_panel_t *panel;
+ opcut_item_t *item;
+ double x;
+ double y;
+ bool rotate;
+} opcut_used_t;
+
+typedef struct {
+ opcut_panel_t *panel;
+ double width;
+ double height;
+ double x;
+ double y;
+} opcut_unused_t;
+
+typedef struct {
+ opcut_params_t *params;
+ opcut_used_t *used;
+ size_t used_len;
+ opcut_unused_t *unused;
+ size_t unused_len;
+} opcut_result_t;
+
+
+int opcut_params_init(opcut_params_t *params, opcut_str_t *json);
+void opcut_params_destroy(opcut_params_t *params);
+int opcut_result_write(opcut_result_t *result, FILE *stream);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src_doit/__init__.py b/src_doit/__init__.py
index f1d9a2f..89ba32c 100644
--- a/src_doit/__init__.py
+++ b/src_doit/__init__.py
@@ -1,5 +1,6 @@
from pathlib import Path
import subprocess
+import sys
import tempfile
from hat import json
@@ -19,6 +20,7 @@ __all__ = ['task_clean_all',
'task_test',
'task_ui',
'task_deps',
+ 'task_format',
'task_json_schema_repo',
*dist.__all__]
@@ -104,7 +106,18 @@ def task_ui():
def task_deps():
"""Install dependencies"""
- return {'actions': ['yarn install --silent']}
+ return {'actions': ['yarn install --silent',
+ f'{sys.executable} -m peru sync']}
+
+
+def task_format():
+ """Format"""
+ files = [*Path('src_c').rglob('*.c'),
+ *Path('src_c').rglob('*.h')]
+ for f in files:
+ yield {'name': str(f),
+ 'actions': [f'clang-format -style=file -i {f}'],
+ 'file_dep': [f]}
def task_json_schema_repo():
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-02-11 13:15:20 +0000