huge

ckiwi/ckiwi.h

@@ -1,13 +1,38 @@
-#ifndef KIWI_CKIWI_H_
-#define KIWI_CKIWI_H_
+#ifndef LJKIWI_CKIWI_H_
+#define LJKIWI_CKIWI_H_
 
-#ifdef __cplusplus
-extern "C" {
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+   #undef LJKIWI_USE_FAM_1
 #else
-   #include <stdbool.h>
+   #define LJKIWI_USE_FAM_1
 #endif
 
-#define KIWI_REF_ISNULL(ref) ((ref).impl_ == NULL)
+#ifdef __cplusplus
+
+namespace kiwi {
+class Variable;
+class Constraint;
+}  // namespace kiwi
+
+extern "C" {
+
+typedef kiwi::Variable KiwiVar;
+typedef kiwi::Constraint KiwiConstraint;
+#else
+typedef struct KiwiVar KiwiVar;
+typedef struct KiwiConstraint KiwiConstraint;
+#endif
+
+typedef struct KiwiTypeInfo {
+   unsigned size;
+   unsigned align;
+} KiwiTypeInfo;
+
+#if __GNUC__
+   #pragma GCC visibility push(default)
+#endif
+
+extern KiwiTypeInfo kiwi_ti_KiwiVar, kiwi_ti_KiwiConstraint, kiwi_ti_KiwiSolver;
 
 // LuaJIT start
 enum KiwiErrKind {
@@ -26,18 +51,24 @@ enum KiwiErrKind {
 
 enum KiwiRelOp { KIWI_OP_LE, KIWI_OP_GE, KIWI_OP_EQ };
 
-typedef struct KiwiVarRefType* KiwiVarRef;
-typedef struct KiwiConstraintRefType* KiwiConstraintRef;
-
 typedef struct KiwiTerm {
-   KiwiVarRef var;
+   KiwiVar* var;
    double coefficient;
 } KiwiTerm;
 
 typedef struct KiwiExpression {
    double constant;
    int term_count;
-   KiwiTerm terms[1];  // LuaJIT: struct KiwiTerm terms_[?];
+   KiwiConstraint* owner;
+
+#if defined(LJKIWI_LUAJIT_DEF)
+   KiwiTerm terms_[?];
+#elif defined(LJKIWI_USE_FAM_1)
+   KiwiTerm terms_[1];  // LuaJIT: struct KiwiTerm terms_[?];
+#else
+   KiwiTerm terms_[];
+#endif
+
 } KiwiExpression;
 
 typedef struct KiwiErr {
@@ -46,56 +77,63 @@ typedef struct KiwiErr {
    bool must_free;
 } KiwiErr;
 
-typedef struct KiwiSolver
-    KiwiSolver;  // LuaJIT: typedef struct { unsigned error_mask; } KiwiSolver;
-KiwiVarRef kiwi_var_new(const char* name);
-void kiwi_var_del(KiwiVarRef var);
-KiwiVarRef kiwi_var_clone(KiwiVarRef var);
+struct KiwiSolver;
 
-const char* kiwi_var_name(KiwiVarRef var);
-void kiwi_var_set_name(KiwiVarRef var, const char* name);
-double kiwi_var_value(KiwiVarRef var);
-void kiwi_var_set_value(KiwiVarRef var, double value);
-bool kiwi_var_eq(KiwiVarRef var, KiwiVarRef other);
+void kiwi_var_construct(const char* name, void* mem);
+void kiwi_var_release(KiwiVar* var);
+void kiwi_var_retain(KiwiVar* var);
 
-void kiwi_expression_del_vars(KiwiExpression* expr);
+const char* kiwi_var_name(const KiwiVar* var);
+void kiwi_var_set_name(KiwiVar* var, const char* name);
+double kiwi_var_value(const KiwiVar* var);
+void kiwi_var_set_value(KiwiVar* var, double value);
+bool kiwi_var_eq(const KiwiVar* var, const KiwiVar* other);
 
-KiwiConstraintRef kiwi_constraint_new(
+void kiwi_expression_retain(KiwiExpression* expr);
+void kiwi_expression_destroy(KiwiExpression* expr);
+
+void kiwi_constraint_construct(
     const KiwiExpression* lhs,
     const KiwiExpression* rhs,
     enum KiwiRelOp op,
-    double strength
+    double strength,
+    void* mem
 );
-void kiwi_constraint_del(KiwiConstraintRef constraint);
-KiwiConstraintRef kiwi_constraint_clone(KiwiConstraintRef constraint);
+void kiwi_constraint_release(KiwiConstraint* c);
+void kiwi_constraint_retain(KiwiConstraint* c);
 
-double kiwi_constraint_strength(KiwiConstraintRef constraint);
-enum KiwiRelOp kiwi_constraint_op(KiwiConstraintRef constraint);
-bool kiwi_constraint_violated(KiwiConstraintRef constraint);
-int kiwi_constraint_expression(KiwiConstraintRef constraint, KiwiExpression* out, int out_size);
+double kiwi_constraint_strength(const KiwiConstraint* c);
+enum KiwiRelOp kiwi_constraint_op(const KiwiConstraint* c);
+bool kiwi_constraint_violated(const KiwiConstraint* c);
+int kiwi_constraint_expression(KiwiConstraint* c, KiwiExpression* out, int out_size);
 
-KiwiSolver* kiwi_solver_new(unsigned error_mask);
-void kiwi_solver_del(KiwiSolver* s);
+void kiwi_solver_construct(unsigned error_mask, void* mem);
+void kiwi_solver_destroy(KiwiSolver* s);
+unsigned kiwi_solver_get_error_mask(const KiwiSolver* s);
+void kiwi_solver_set_error_mask(KiwiSolver* s, unsigned mask);
 
-const KiwiErr* kiwi_solver_add_constraint(KiwiSolver* sp, KiwiConstraintRef constraint);
-const KiwiErr* kiwi_solver_remove_constraint(KiwiSolver* sp, KiwiConstraintRef constraint);
-bool kiwi_solver_has_constraint(const KiwiSolver* sp, KiwiConstraintRef constraint);
-const KiwiErr* kiwi_solver_add_edit_var(KiwiSolver* sp, KiwiVarRef var, double strength);
-const KiwiErr* kiwi_solver_remove_edit_var(KiwiSolver* sp, KiwiVarRef var);
-bool kiwi_solver_has_edit_var(const KiwiSolver* sp, KiwiVarRef var);
-const KiwiErr* kiwi_solver_suggest_value(KiwiSolver* sp, KiwiVarRef var, double value);
+const KiwiErr* kiwi_solver_add_constraint(KiwiSolver* s, const KiwiConstraint* constraint);
+const KiwiErr* kiwi_solver_remove_constraint(KiwiSolver* s, const KiwiConstraint* constraint);
+bool kiwi_solver_has_constraint(const KiwiSolver* s, const KiwiConstraint* constraint);
+const KiwiErr* kiwi_solver_add_edit_var(KiwiSolver* s, const KiwiVar* var, double strength);
+const KiwiErr* kiwi_solver_remove_edit_var(KiwiSolver* s, const KiwiVar* var);
+bool kiwi_solver_has_edit_var(const KiwiSolver* s, const KiwiVar* var);
+const KiwiErr* kiwi_solver_suggest_value(KiwiSolver* s, const KiwiVar* var, double value);
 void kiwi_solver_update_vars(KiwiSolver* sp);
 void kiwi_solver_reset(KiwiSolver* sp);
 void kiwi_solver_dump(const KiwiSolver* sp);
 char* kiwi_solver_dumps(const KiwiSolver* sp);
-
 // LuaJIT end
 
+#if __GNUC__
+   #pragma GCC visibility pop
+#endif
+
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
 
 // Local Variables:
 // mode: c++
 // End:
-#endif  // KIWI_CKIWI_H_
+#endif  // LJKIWI_CKIWI_H_