Reformatting

This commit is contained in:
Artur Meski
2018-03-28 21:00:44 +01:00
parent c90a87875a
commit 5f1a759c8f
18 changed files with 2204 additions and 2056 deletions

View File

@@ -19,7 +19,7 @@ YY_DECL;
// Conducting the whole scanning an parsing of RS
class rsin_driver
{
public:
public:
rsin_driver(void);
rsin_driver(RctSys *rs);
virtual ~rsin_driver();
@@ -27,10 +27,10 @@ public:
//std::map<std::string, int> variables;
FormRSCTL *rsctlform;
Options *opts;
// options in configuration file:
bool use_ctx_aut;
bool use_concentrations;
// options in configuration file:
bool use_ctx_aut;
bool use_concentrations;
// Handling the scanner
void scan_begin();
@@ -41,28 +41,38 @@ public:
std::string file;
bool trace_parsing;
void setOptions(Options *opts) { this->opts = opts; };
void addFormRSCTL(FormRSCTL *f) { rsctlform = f; };
void setOptions(Options *opts)
{
this->opts = opts;
};
void addFormRSCTL(FormRSCTL *f)
{
rsctlform = f;
};
FormRSCTL *getFormRSCTL(void);
void ensureOptionsAllowed(void);
void useContextAutomaton(void);
void useConcentrations(void) { ensureOptionsAllowed(); use_concentrations = true; };
void ensureReactionSystemReady(void);
void setupReactionSystem(void);
RctSys *getReactionSystem(void);
CtxAut *getCtxAut(void);
void ensureOptionsAllowed(void);
void useContextAutomaton(void);
void useConcentrations(void)
{
ensureOptionsAllowed();
use_concentrations = true;
};
void ensureReactionSystemReady(void);
void setupReactionSystem(void);
RctSys *getReactionSystem(void);
CtxAut *getCtxAut(void);
// Error handling.
void error(const yy::location &l, const std::string &m);
void error(const std::string &m);
private:
private:
RctSys *rs;
void initialise(void);
void initialise(void);
};
#endif