private constructors (prevent allocation outside of add_ident)

master
Daniel Kolesa 2016-08-29 18:23:51 +01:00
parent fd6eca6529
commit f411b33e4d
1 changed files with 11 additions and 9 deletions

View File

@ -209,12 +209,12 @@ struct OSTD_EXPORT CsIvar: CsVar {
CsInt get_value() const; CsInt get_value() const;
void set_value(CsInt val); void set_value(CsInt val);
private:
CsIvar( CsIvar(
ostd::ConstCharRange n, CsInt m, CsInt x, CsInt v, ostd::ConstCharRange n, CsInt m, CsInt x, CsInt v,
CsVarCb f = CsVarCb(), int flags = 0 CsVarCb f = CsVarCb(), int flags = 0
); );
private:
CsInt p_storage, p_minval, p_maxval, p_overrideval; CsInt p_storage, p_minval, p_maxval, p_overrideval;
}; };
@ -227,12 +227,12 @@ struct OSTD_EXPORT CsFvar: CsVar {
CsFloat get_value() const; CsFloat get_value() const;
void set_value(CsFloat val); void set_value(CsFloat val);
private:
CsFvar( CsFvar(
ostd::ConstCharRange n, CsFloat m, CsFloat x, CsFloat v, ostd::ConstCharRange n, CsFloat m, CsFloat x, CsFloat v,
CsVarCb f = CsVarCb(), int flags = 0 CsVarCb f = CsVarCb(), int flags = 0
); );
private:
CsFloat p_storage, p_minval, p_maxval, p_overrideval; CsFloat p_storage, p_minval, p_maxval, p_overrideval;
}; };
@ -243,6 +243,7 @@ struct OSTD_EXPORT CsSvar: CsVar {
void set_value(ostd::ConstCharRange val); void set_value(ostd::ConstCharRange val);
void set_value(CsString &&val); void set_value(CsString &&val);
private:
CsSvar( CsSvar(
ostd::ConstCharRange n, ostd::ConstCharRange v, CsVarCb f = CsVarCb(), ostd::ConstCharRange n, ostd::ConstCharRange v, CsVarCb f = CsVarCb(),
int flags = 0 int flags = 0
@ -252,18 +253,13 @@ struct OSTD_EXPORT CsSvar: CsVar {
int flags = 0 int flags = 0
); );
private:
CsString p_storage, p_overrideval; CsString p_storage, p_overrideval;
}; };
struct OSTD_EXPORT CsAlias: CsIdent { struct OSTD_EXPORT CsAlias: CsIdent {
CsValue val_v; friend struct CsState;
CsAlias(ostd::ConstCharRange n, char *a, int flags); CsValue val_v;
CsAlias(ostd::ConstCharRange n, CsInt a, int flags);
CsAlias(ostd::ConstCharRange n, CsFloat a, int flags);
CsAlias(ostd::ConstCharRange n, int flags);
CsAlias(ostd::ConstCharRange n, CsValue const &v, int flags);
void set_value(CsValue const &v) { void set_value(CsValue const &v) {
val_v = v; val_v = v;
@ -309,6 +305,12 @@ struct OSTD_EXPORT CsAlias: CsIdent {
} }
private: private:
CsAlias(ostd::ConstCharRange n, char *a, int flags);
CsAlias(ostd::ConstCharRange n, CsInt a, int flags);
CsAlias(ostd::ConstCharRange n, CsFloat a, int flags);
CsAlias(ostd::ConstCharRange n, int flags);
CsAlias(ostd::ConstCharRange n, CsValue const &v, int flags);
CsBytecode *p_acode; CsBytecode *p_acode;
CsIdentStack *p_astack; CsIdentStack *p_astack;
}; };