diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-04-10 21:48:31 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-04-10 21:48:31 (GMT) |
| commit | 5180e4666a314db36a15d953fdfa38af4f285758 (patch) | |
| tree | 412e127800aa6d57b4a1f675e4bd206b418f62a8 /src | |
| parent | 6c7886228f574939ad20ec740543d2aa172bdf42 (diff) | |
| download | uscxml-5180e4666a314db36a15d953fdfa38af4f285758.zip uscxml-5180e4666a314db36a15d953fdfa38af4f285758.tar.gz uscxml-5180e4666a314db36a15d953fdfa38af4f285758.tar.bz2 | |
More work on promela DM
Diffstat (limited to 'src')
9 files changed, 1255 insertions, 853 deletions
diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp index f75677e..593aadc 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp @@ -27,10 +27,8 @@ #include <glog/logging.h> #include <cctype> -// #include "PromelaAssignParser.h" -//#include "PromelaExprParser.h" -// #include "PromelaStmntParser.h" #include "PromelaParser.h" +#include "parser/promela.tab.hpp" #ifdef BUILD_AS_PLUGINS #include <Pluma/Connector.hpp> @@ -58,6 +56,7 @@ PromelaDataModel::~PromelaDataModel() { boost::shared_ptr<DataModelImpl> PromelaDataModel::create(InterpreterImpl* interpreter) { boost::shared_ptr<PromelaDataModel> dm = boost::shared_ptr<PromelaDataModel>(new PromelaDataModel()); dm->_interpreter = interpreter; + dm->_lastMType = 0; return dm; } @@ -92,7 +91,8 @@ void PromelaDataModel::setEvent(const Event& event) { } Data PromelaDataModel::getStringAsData(const std::string& content) { - return expressionToAST(content); + Data data(content, Data::VERBATIM); + return data; } @@ -112,7 +112,9 @@ void PromelaDataModel::setForeach(const std::string& item, } void PromelaDataModel::eval(const Element<std::string>& scriptElem, const std::string& expr) { - expressionToAST(expr); + PromelaParser parser(expr, PromelaParser::PROMELA_STMNT); + evaluateStmnt(parser.ast); +// parser.dump(); } bool PromelaDataModel::evalAsBool(const std::string& expr) { @@ -120,195 +122,167 @@ bool PromelaDataModel::evalAsBool(const std::string& expr) { } bool PromelaDataModel::evalAsBool(const Arabica::DOM::Node<std::string>& node, const std::string& expr) { - PromelaParser ast(expr); -// std::cout << Data::toJSON(ast) << std::endl; - return false; - // return evalAST(expressionToAST(expr)); + PromelaParser parser(expr, PromelaParser::PROMELA_EXPR); +// parser.dump(); + return evaluateExpr(parser.ast) > 0; +} + +std::string PromelaDataModel::evalAsString(const std::string& expr) { + return expr; } -Data PromelaDataModel::expressionToAST(const std::string& expr) { - // see: http://en.wikipedia.org/wiki/Shunting-yard_algorithm (not used, prefix notation for now) - Data ast; - - std::string tok_value; - std::list<Token> tokens; - size_t start = 0; - - for (int i = 0; i < expr.size();) { - if (expr[i] == '(' || expr[i] == ')' || expr[i] == '!' || iswspace(expr[i]) || expr[i] == ',' || i + 1 == expr.size()) { -#if 0 - std::cout << ":" << expr << std::endl << ":"; - for (int c = 0; c < expr.size(); c++) { - if (c == start) { - std::cout << "s"; - } else if(c == i) { - std::cout << "^"; +void PromelaDataModel::assign(const Element<std::string>& assignElem, + const Node<std::string>& node, + const std::string& content) { + PromelaParser parser(content, PromelaParser::PROMELA_DECL); + declare(parser.ast); +// parser.dump(); +// std::cout << Data::toJSON(_variables) << std::endl; +} + +void PromelaDataModel::declare(void* ast) { + PromelaParserNode* node = (PromelaParserNode*)ast; + if (false) { + } else if (node->type == DECL) { + std::list<PromelaParserNode*>::iterator opIter = node->operands.begin(); + PromelaParserNode* vis = *opIter++; + PromelaParserNode* type = *opIter++; + PromelaParserNode* varlist = *opIter++; + + for (std::list<PromelaParserNode*>::iterator nameIter = varlist->operands.begin(); + nameIter != varlist->operands.end(); + nameIter++) { + Data variable; + variable.compound["vis"] = Data(vis->value, Data::VERBATIM); + variable.compound["type"] = Data(type->value, Data::VERBATIM); + + if (false) { + } else if ((*nameIter)->type == NAME) { + // plain variables without initial assignment + + if (type->value == "mtype") { + variable.compound["value"] = Data(_lastMType++, Data::INTERPRETED); } else { - std::cout << " "; + variable.compound["value"] = Data(0, Data::INTERPRETED); } - } - std::cout << std::endl;; -#endif - - Token token; - if (i > 0 && start < i - 1) { - token.start = start; - token.end = i; - - if (i + 1 == expr.size() && !(expr[i] == '(' || expr[i] == ')' || expr[i] == '!')) - token.end++; -// std::cout << expr.substr(token.start, token.end - token.start) << std::endl; - - tokens.push_back(token); - } - if (expr[i] == '(' || expr[i] == ')' || expr[i] == '!') { - token.start = i; - token.end = i + 1; -// std::cout << expr.substr(token.start, token.end - token.start) << std::endl; + _variables.compound[(*nameIter)->value] = variable; + + } else if ((*nameIter)->type == ASGN) { + // initially assigned variables + + std::list<PromelaParserNode*>::iterator opIterAsgn = (*nameIter)->operands.begin(); + PromelaParserNode* name = *opIterAsgn++; + PromelaParserNode* expr = *opIterAsgn++; + + variable.compound["value"] = evaluateExpr(expr); + + assert(opIterAsgn == (*nameIter)->operands.end()); + _variables.compound[name->value] = variable; + } else if ((*nameIter)->type == VAR_ARRAY) { + // variable arrays + + std::list<PromelaParserNode*>::iterator opIterAsgn = (*nameIter)->operands.begin(); + PromelaParserNode* name = *opIterAsgn++; + int size = evaluateExpr(*opIterAsgn++); + + variable.compound["size"] = size; + for (int i = 0; i < size; i++) { + variable.compound["value"].array.push_back(Data(0, Data::INTERPRETED)); + } + + assert(opIterAsgn == (*nameIter)->operands.end()); + _variables.compound[name->value] = variable; - tokens.push_back(token); - i++; + } else { + assert(false); } - if (expr[i] == ',') { - i++; - } - if (i + 1 == expr.size()) - break; - - if (iswspace(expr[i])) { - while(iswspace(expr[++i])); // skip remaining whitespaces - } - start = i; - } else { - i++; } - } - - std::list<Data*> dataStack; - std::list<Token> tokenStack; - dataStack.push_back(&ast); - - for (std::list<Token>::iterator tokIter = tokens.begin(); - tokIter != tokens.end(); - tokIter++) { - std::string token = expr.substr(tokIter->start, tokIter->end - tokIter->start); -// std::cout << token << std::endl; - - if (false) { - } else if (token == "(") { - dataStack.back()->type = Data::INTERPRETED; - } else if (token == ")") { - dataStack.pop_back(); - } else if (token == "and") { - dataStack.back()->array.push_back(Data("", Data::VERBATIM)); - dataStack.push_back(&(dataStack.back()->array.back().compound["and"])); - dataStack.back()->type = Data::VERBATIM; - continue; - } else if (token == "or") { - dataStack.back()->array.push_back(Data("", Data::VERBATIM)); - dataStack.push_back(&(dataStack.back()->array.back().compound["or"])); - dataStack.back()->type = Data::VERBATIM; - continue; - } else if (token == "!" || token == "not") { - dataStack.back()->array.push_back(Data("", Data::VERBATIM)); - dataStack.push_back(&(dataStack.back()->array.back().compound["not"])); - dataStack.back()->type = Data::VERBATIM; - continue; - } else { - // treat everything else as a variable - dataStack.back()->array.push_back(Data(token, Data::VERBATIM)); - } - - // pop back if not bracketed - while (dataStack.back()->type == Data::VERBATIM) { - dataStack.pop_back(); + assert(opIter == node->operands.end()); + } else if (node->type == DECLLIST) { + for (std::list<PromelaParserNode*>::iterator declIter = node->operands.begin(); + declIter != node->operands.end(); + declIter++) { + declare(*declIter); } - } - -// std::cout << Data::toJSON(ast) << std::endl << std::endl; - - return ast; } -bool PromelaDataModel::evalAST(const Data ast) { - -#if 0 - std::cout << "===========" << std::endl; - std::cout << Data::toJSON(ast) << std::endl; - std::cout << "===========" << std::endl; -#endif - - // atomic term - if (ast.atom.size() > 0) { - // is it the event name? TODO: Use some prefix here! - if (InterpreterImpl::nameMatch(ast.atom, _event.name)) - return true; - - if (_variables.find(ast.atom) != _variables.end()) { - return _variables[ast.atom]; - } - return false; +int PromelaDataModel::evaluateExpr(void* ast) { + PromelaParserNode* node = (PromelaParserNode*)ast; + std::list<PromelaParserNode*>::iterator opIter = node->operands.begin(); + switch (node->type) { + case CONST: + return strTo<int>(node->value); + case NAME: + return getVariable(node); + case PLUS: + return evaluateExpr(*opIter++) + evaluateExpr(*opIter++); + case MINUS: + return evaluateExpr(*opIter++) - evaluateExpr(*opIter++); + case DIVIDE: + return evaluateExpr(*opIter++) / evaluateExpr(*opIter++); + case MODULO: + return evaluateExpr(*opIter++) % evaluateExpr(*opIter++); + case EQ: + return evaluateExpr(*opIter++) == evaluateExpr(*opIter++); + case LT: + return evaluateExpr(*opIter++) < evaluateExpr(*opIter++); + case LE: + return evaluateExpr(*opIter++) <= evaluateExpr(*opIter++); + case GT: + return evaluateExpr(*opIter++) > evaluateExpr(*opIter++); + case GE: + return evaluateExpr(*opIter++) >= evaluateExpr(*opIter++); + case TIMES: + return evaluateExpr(*opIter++) * evaluateExpr(*opIter++); + case LSHIFT: + return evaluateExpr(*opIter++) << evaluateExpr(*opIter++); + case RSHIFT: + return evaluateExpr(*opIter++) >> evaluateExpr(*opIter++); + default: + assert(false); } +} - const std::list<Data>* arrayPtr = &(ast.array); - - // no operator is implied 'and' - std::string op = "and"; - if (ast.compound.size() > 0) { - op = ast.compound.begin()->first; - arrayPtr = &(ast.compound.at(op).array); - } - - for (std::list<Data>::const_iterator termIter = arrayPtr->begin(); - termIter != arrayPtr->end(); - termIter++) { - bool result = evalAST(*termIter); - if (false) { - } else if (op == "and" && !result) { - return false; - } else if (op == "or" && result) { - return true; - } else if (op == "not" && result) { - return false; +void PromelaDataModel::evaluateStmnt(void* ast) { + PromelaParserNode* node = (PromelaParserNode*)ast; + std::list<PromelaParserNode*>::iterator opIter = node->operands.begin(); + switch (node->type) { + case ASGN: { + PromelaParserNode* name = *opIter++; + PromelaParserNode* expr = *opIter++; + setVariable(name, evaluateExpr(expr)); + break; + } + case STMNT: { + while(opIter != node->operands.end()) { + evaluateStmnt(*opIter++); + } + break; } + default: + assert(false); } - return true; -} - -std::string PromelaDataModel::evalAsString(const std::string& expr) { - return ""; } -void PromelaDataModel::assign(const Element<std::string>& assignElem, - const Node<std::string>& node, - const std::string& content) { - Data ast = expressionToAST(content); - assign(true, ast); +void PromelaDataModel::setVariable(void* ast, int value) { + PromelaParserNode* node = (PromelaParserNode*)ast; + _variables.compound[node->value].compound["value"] = Data(value, Data::VERBATIM); } -void PromelaDataModel::assign(bool truth, Data ast) { - for (std::list<Data>::iterator arrIter = ast.array.begin(); - arrIter != ast.array.end(); - arrIter++) { - if (false) { - } else if (arrIter->atom.size() > 0) { - // simple atom to true - _variables[arrIter->atom] = truth; - } else if (arrIter->hasKey("not")) { - // for convenience, we support bracketed "nots" - assign(false, arrIter->compound["not"]); - } else { - Event exceptionEvent; - exceptionEvent.data.compound["ast"] = ast; - exceptionEvent.data.compound["exception"] = Data("Assignments can only contain atoms and negations", Data::VERBATIM); - exceptionEvent.name = "error.execution"; - exceptionEvent.eventType = Event::PLATFORM; - throw exceptionEvent; - } +int PromelaDataModel::getVariable(void* ast) { + PromelaParserNode* node = (PromelaParserNode*)ast; + + if (_variables.compound.find(node->value) == _variables.compound.end()) { + uscxml::Event exc; + exc.data.compound["exception"] = uscxml::Data("No variable " + node->value + " was declared", uscxml::Data::VERBATIM); + exc.name = "error.execution"; + exc.eventType = uscxml::Event::PLATFORM; + throw exc; } + return strTo<int>(_variables[node->value]["value"]); } - + void PromelaDataModel::assign(const std::string& location, const Data& data) { // used for e.g. to assign command line parameters std::cout << "Ignoring " << location << " = " << Data::toJSON(data) << std::endl; @@ -325,7 +299,7 @@ void PromelaDataModel::init(const std::string& location, const Data& data) { } bool PromelaDataModel::isDeclared(const std::string& expr) { - return _variables.find(expr) != _variables.end(); + return _variables.compound.find(expr) != _variables.compound.end(); } diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h index d332db1..aaafa9b 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h +++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h @@ -82,21 +82,20 @@ public: protected: - struct Token { - size_t start; - size_t end; - }; - - Data expressionToAST(const std::string& expr); - bool evalAST(const Data ast); - - void assign(bool truth, Data ast); - + void declare(void* ast); + int evaluateExpr(void* ast); + void evaluateStmnt(void* ast); + + void setVariable(void* ast, int value); + int getVariable(void* ast); + + int _lastMType; + Event _event; std::string _name; std::string _sessionId; - std::map<std::string, bool> _variables; + Data _variables; }; diff --git a/src/uscxml/plugins/datamodel/promela/PromelaParser.cpp b/src/uscxml/plugins/datamodel/promela/PromelaParser.cpp index 5bfc2a7..ba89e14 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaParser.cpp +++ b/src/uscxml/plugins/datamodel/promela/PromelaParser.cpp @@ -9,12 +9,16 @@ int promela_lex_init (void**); \ int promela_lex_destroy (void*); \ void promela_error (uscxml::PromelaParser* ctx, void* yyscanner, const char* err) { - std::cout << err << std::endl; + uscxml::Event exceptionEvent; + exceptionEvent.data.compound["exception"] = uscxml::Data(err, uscxml::Data::VERBATIM); + exceptionEvent.name = "error.execution"; + exceptionEvent.eventType = uscxml::Event::PLATFORM; + throw exceptionEvent; } namespace uscxml { -PromelaParser::PromelaParser(const std::string& expr) { +PromelaParser::PromelaParser(const std::string& expr, Type expectedType) { input_length = expr.length() + 5; // plus some zero terminators input = (char*) calloc(1, input_length); memcpy(input, expr.c_str(), expr.length()); @@ -23,13 +27,36 @@ PromelaParser::PromelaParser(const std::string& expr) { // promela_assign_set_extra(ast, &scanner); promela__scan_buffer(input, input_length, scanner); promela_parse(this, scanner); + + if (type != expectedType) { + std::stringstream ss; + ss << "Promela syntax type mismatch: Expected " << typeToDesc(expectedType) << " but got " << typeToDesc(type); + + uscxml::Event exceptionEvent; + exceptionEvent.data.compound["exception"] = uscxml::Data(ss.str(), uscxml::Data::VERBATIM); + exceptionEvent.name = "error.execution"; + exceptionEvent.eventType = uscxml::Event::PLATFORM; + throw exceptionEvent; + } } + PromelaParser::~PromelaParser() { free(input); promela_lex_destroy(scanner); } std::string PromelaParser::typeToDesc(int type) { + switch (type) { + case PROMELA_EXPR: return "expression"; + case PROMELA_DECL: return "declarations"; + case PROMELA_STMNT: return "statements"; + default: + break; + } + return ""; +} + +std::string PromelaParserNode::typeToDesc(int type) { switch(type) { case PLUS: return "PLUS"; case MINUS: return "MINUS"; @@ -51,6 +78,21 @@ std::string PromelaParser::typeToDesc(int type) { case RSHIFT: return "RSHIFT"; case NEG: return "NEG"; case ASGN: return "ASGN"; + case INCR: return "INCR"; + case DECR: return "DECR"; + case VAR_ARRAY: return "VAR_ARRAY"; + case DECL: return "DECL"; + case STMNT: return "STMNT"; + case TYPE: return "TYPE"; + case NAME: return "NAME"; + case CONST: return "CONST"; + case PRINT: return "PRINT"; + case SHOW: return "SHOW"; + case EXPR: return "EXPR"; + case VARLIST: return "VARLIST"; + case DECLLIST: return "DECLLIST"; + case NAMELIST: return "NAMELIST"; + default: return std::string("UNK(") + toStr(type) + ")"; } diff --git a/src/uscxml/plugins/datamodel/promela/PromelaParser.h b/src/uscxml/plugins/datamodel/promela/PromelaParser.h index c45bcc2..6daa154 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaParser.h +++ b/src/uscxml/plugins/datamodel/promela/PromelaParser.h @@ -5,6 +5,8 @@ #define PROMELA_H_9AB78YB1 #include <stdlib.h> +#include <stdarg.h> + #include "uscxml/Message.h" #define GRAMMAR_COMMON(name, uc_name) \ @@ -17,11 +19,39 @@ int promela_##name##_lex_destroy (void*); \ namespace uscxml { +class PromelaParser; + struct PromelaParserNode { PromelaParserNode() : type(0) {} int type; std::string value; std::list<PromelaParserNode*> operands; + + void merge(PromelaParserNode* node) { + for (std::list<PromelaParserNode*>::iterator iter = node->operands.begin(); + iter != node->operands.end(); iter++) { + operands.push_back(*iter); + } + } + + void push(PromelaParserNode* node) { + operands.push_back(node); + } + + void dump(int indent = 0) { + std::string padding; + for (int i = 0; i < indent; i++) { + padding += " "; + } + std::cout << padding << typeToDesc(type) << ": " << value << std::endl; + for (std::list<PromelaParserNode*>::iterator iter = operands.begin(); + iter != operands.end(); iter++) { + (*iter)->dump(indent + 1); + } + } + + static std::string typeToDesc(int type); + }; class PromelaParser { @@ -32,27 +62,26 @@ public: PROMELA_STMNT }; - PromelaParser(const std::string& expr); + static std::string typeToDesc(int type); + + PromelaParser(const std::string& expr, Type expectedType); virtual ~PromelaParser(); - virtual PromelaParserNode* uniOp(int type, PromelaParserNode* oper) { + virtual PromelaParserNode* node(int type, int nrArgs, ...) { PromelaParserNode* newNode = new PromelaParserNode(); newNode->type = type; - newNode->operands.push_back(oper); - return newNode; - } - - virtual PromelaParserNode* binOp(int type, PromelaParserNode* left, PromelaParserNode* right) { - PromelaParserNode* newNode = new PromelaParserNode(); - newNode->type = type; - newNode->operands.push_back(left); - newNode->operands.push_back(right); + va_list ap; + va_start(ap, nrArgs); + for(int i = 1; i <= nrArgs; i++) { + newNode->operands.push_back(va_arg(ap, PromelaParserNode*)); + } return newNode; } - virtual PromelaParserNode* value(const char* value) { + virtual PromelaParserNode* value(int type, const char* value) { PromelaParserNode* newNode = new PromelaParserNode(); newNode->value = value; + newNode->type = type; return newNode; } @@ -68,23 +97,9 @@ public: std::cout << "Promela Statement" << std::endl; break; } - dump(ast); + ast->dump(); } - void dump(PromelaParserNode* node, int indent = 0) { - std::string padding; - for (int i = 0; i < indent; i++) { - padding += " "; - } - std::cout << padding << typeToDesc(node->type) << ": " << node->value << std::endl; - for (std::list<PromelaParserNode*>::iterator iter = node->operands.begin(); - iter != node->operands.end(); iter++) { - dump(*iter, indent + 1); - } - } - - virtual std::string typeToDesc(int type); - PromelaParserNode* ast; Type type; diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.l b/src/uscxml/plugins/datamodel/promela/parser/promela.l index 4332c6b..d82df4e 100644 --- a/src/uscxml/plugins/datamodel/promela/parser/promela.l +++ b/src/uscxml/plugins/datamodel/promela/parser/promela.l @@ -20,20 +20,24 @@ DIGIT [0-9] ID [_a-zA-Z][_a-zA-Z0-9]* +L [a-zA-Z_] %% bit|bool|byte|int|mtype|short|unsigned { - //printf("TYPE: %s\n", yytext); yylval->value = strdup(yytext); return TYPE; } len { return LEN; } false|skip|true { yylval->value = strdup(yytext); return CONST; } +printf { return PRINT; } +printm { return PRINTM; } "!" { return NEG; } "~" { return COMPL; } +"++" { return INCR; } +"--" { return DECR; } "*" { return TIMES; } "/" { return DIVIDE; } @@ -62,19 +66,27 @@ false|skip|true { yylval->value = strdup(yytext); return CONST; } "||" { return OR; } "." { return DOT; } +"," { return COMMA; } +";" { return SEMI; } -"(" { return LBRACKET; } -")" { return RBRACKET; } +"(" { return '('; } +")" { return ')'; } + +"[" { return '['; } +"]" { return ']'; } + +"{" { return '{'; } +"}" { return '}'; } "=" { return ASGN; } +L?\"(\\.|[^\\"])*\" { yylval->value = strdup(yytext); return(STRING); } + {DIGIT}+ { yylval->value = strdup(yytext); return CONST; } {ID} { yylval->value = strdup(yytext); return NAME; } \'(\\.|[^'])*\' { } -"{"[^}\n]*"}" /* eat up one-line comments */ - [ \t\n]+ /* eat up whitespace */ . { /*printf( "Unrecognized character: %s\n", yytext ); */ } diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp b/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp index 122a408..f4f9f83 100644 --- a/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp +++ b/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp @@ -434,8 +434,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); yyg->yy_c_buf_p = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 34 -#define YY_END_OF_BUFFER 35 +#define YY_NUM_RULES 44 +#define YY_END_OF_BUFFER 45 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -443,17 +443,20 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[84] = +static yyconst flex_int16_t yy_accept[102] = { 0, - 0, 0, 35, 33, 32, 32, 4, 8, 19, 33, - 25, 26, 6, 9, 10, 24, 7, 28, 15, 27, - 16, 29, 20, 29, 29, 29, 29, 29, 29, 29, - 29, 33, 21, 5, 32, 17, 22, 0, 30, 0, - 28, 11, 13, 18, 14, 12, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 0, 31, - 23, 0, 30, 0, 1, 29, 29, 29, 2, 29, - 29, 29, 29, 29, 29, 29, 29, 3, 29, 29, - 29, 29, 0 + 0, 0, 45, 43, 42, 42, 6, 43, 12, 23, + 43, 31, 32, 10, 13, 29, 14, 28, 11, 39, + 30, 19, 37, 20, 40, 40, 33, 34, 24, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 35, 25, + 36, 7, 42, 21, 0, 38, 0, 26, 0, 41, + 0, 8, 9, 39, 15, 17, 22, 18, 16, 40, + 0, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 27, 0, 41, 0, 1, 40, 40, + 40, 2, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 3, 40, 40, 40, 4, 5, 40, 40, + + 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -461,17 +464,17 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 4, 1, 1, 1, 5, 6, 7, 8, - 9, 10, 11, 1, 12, 13, 14, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 1, 1, 16, - 17, 18, 1, 1, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 1, 20, 1, 21, 19, 1, 22, 23, 19, 24, - - 25, 26, 27, 28, 29, 19, 30, 31, 32, 33, - 34, 35, 19, 36, 37, 38, 39, 19, 19, 19, - 40, 19, 41, 42, 43, 44, 1, 1, 1, 1, + 1, 2, 4, 5, 1, 1, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 1, 18, 19, + 20, 21, 1, 1, 22, 22, 22, 22, 22, 22, + 22, 22, 22, 22, 22, 23, 22, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, + 24, 25, 26, 27, 22, 1, 28, 29, 22, 30, + + 31, 32, 33, 34, 35, 22, 36, 37, 38, 39, + 40, 41, 22, 42, 43, 44, 45, 22, 22, 22, + 46, 22, 47, 48, 49, 50, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -488,91 +491,106 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[45] = +static yyconst flex_int32_t yy_meta[51] = { 0, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 1, 1, 1, 3, 1, - 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 1, 1, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, + 1, 2, 2, 1, 1, 1, 1, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[88] = +static yyconst flex_int16_t yy_base[106] = { 0, - 0, 0, 123, 124, 43, 45, 105, 124, 115, 42, - 124, 124, 124, 124, 124, 124, 124, 105, 34, 102, - 35, 0, 124, 25, 96, 84, 91, 77, 27, 78, - 80, 69, 69, 124, 58, 124, 124, 49, 124, 60, - 95, 124, 124, 124, 124, 124, 0, 71, 74, 69, - 75, 67, 71, 63, 68, 72, 61, 62, 55, 124, - 124, 51, 57, 63, 0, 66, 71, 58, 0, 59, - 57, 53, 57, 52, 54, 53, 38, 0, 48, 41, - 48, 48, 124, 83, 65, 86, 89 + 0, 0, 141, 142, 49, 51, 120, 50, 142, 132, + 48, 142, 142, 142, 126, 142, 123, 142, 142, 119, + 142, 38, 115, 39, 0, 129, 142, 142, 142, 26, + 105, 93, 100, 86, 87, 28, 86, 88, 142, 78, + 142, 142, 65, 142, 58, 142, 122, 142, 57, 142, + 66, 142, 142, 107, 142, 142, 142, 142, 142, 0, + 65, 79, 82, 77, 83, 75, 79, 71, 81, 75, + 79, 68, 69, 142, 63, 68, 76, 0, 74, 79, + 66, 0, 67, 61, 57, 57, 66, 61, 64, 63, + 48, 45, 0, 54, 48, 46, 0, 0, 50, 48, + + 142, 101, 103, 75, 105 } ; -static yyconst flex_int16_t yy_def[88] = +static yyconst flex_int16_t yy_def[106] = { 0, - 83, 1, 83, 83, 83, 83, 83, 83, 83, 84, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 85, 83, 85, 85, 85, 85, 85, 85, 85, - 85, 86, 83, 83, 83, 83, 83, 84, 83, 87, - 83, 83, 83, 83, 83, 83, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 86, 83, - 83, 84, 84, 87, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 0, 83, 83, 83, 83 + 101, 1, 101, 101, 101, 101, 101, 102, 101, 101, + 103, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 104, 104, 101, 101, 101, 104, + 104, 104, 104, 104, 104, 104, 104, 104, 101, 101, + 101, 101, 101, 101, 102, 101, 102, 101, 103, 101, + 105, 101, 101, 101, 101, 101, 101, 101, 101, 104, + 102, 104, 104, 104, 104, 104, 104, 104, 104, 104, + 104, 104, 104, 101, 103, 103, 105, 104, 104, 104, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, + + 0, 101, 101, 101, 101 } ; -static yyconst flex_int16_t yy_nxt[169] = +static yyconst flex_int16_t yy_nxt[193] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 4, - 23, 22, 24, 22, 22, 25, 22, 22, 26, 22, - 27, 28, 22, 22, 22, 22, 29, 30, 31, 22, - 32, 33, 4, 34, 35, 35, 35, 35, 39, 42, - 43, 45, 46, 48, 55, 39, 56, 39, 49, 35, - 35, 40, 38, 39, 50, 38, 63, 47, 40, 63, - 40, 65, 82, 81, 80, 65, 40, 65, 78, 64, - 79, 78, 64, 38, 38, 38, 59, 78, 59, 62, - 62, 62, 77, 76, 75, 65, 65, 60, 74, 73, - - 72, 71, 70, 69, 65, 68, 67, 66, 65, 41, - 61, 60, 58, 57, 54, 53, 52, 51, 44, 41, - 37, 36, 83, 3, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83 + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 4, 28, 29, 25, 30, 25, + 25, 31, 25, 25, 32, 25, 33, 34, 25, 25, + 35, 25, 36, 37, 38, 25, 39, 40, 41, 42, + 43, 43, 43, 43, 46, 50, 55, 56, 58, 59, + 62, 70, 46, 71, 50, 63, 43, 43, 49, 46, + 50, 64, 51, 76, 47, 50, 60, 78, 49, 97, + 100, 51, 47, 76, 99, 98, 96, 51, 78, 47, + 77, 95, 51, 78, 93, 94, 93, 93, 92, 91, + + 77, 45, 45, 49, 49, 75, 75, 90, 89, 78, + 78, 88, 87, 86, 85, 84, 83, 82, 78, 81, + 80, 79, 78, 54, 101, 74, 73, 72, 69, 68, + 67, 66, 65, 61, 57, 54, 53, 52, 48, 44, + 101, 3, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101 + } ; -static yyconst flex_int16_t yy_chk[169] = +static yyconst flex_int16_t yy_chk[193] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 5, 5, 6, 6, 10, 19, - 19, 21, 21, 24, 29, 38, 29, 62, 24, 35, - 35, 10, 40, 63, 24, 64, 40, 85, 38, 64, - 62, 82, 81, 80, 79, 77, 63, 76, 75, 40, - 74, 73, 64, 84, 84, 84, 86, 72, 86, 87, - 87, 87, 71, 70, 68, 67, 66, 59, 58, 57, - - 56, 55, 54, 53, 52, 51, 50, 49, 48, 41, - 33, 32, 31, 30, 28, 27, 26, 25, 20, 18, - 9, 7, 3, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 5, 5, 6, 6, 8, 11, 22, 22, 24, 24, + 30, 36, 45, 36, 49, 30, 43, 43, 51, 61, + 75, 30, 11, 51, 8, 76, 104, 100, 77, 95, + 99, 49, 45, 77, 96, 95, 94, 75, 92, 61, + 51, 91, 76, 90, 89, 88, 87, 86, 85, 84, + + 77, 102, 102, 103, 103, 105, 105, 83, 81, 80, + 79, 73, 72, 71, 70, 69, 68, 67, 66, 65, + 64, 63, 62, 54, 47, 40, 38, 37, 35, 34, + 33, 32, 31, 26, 23, 20, 17, 15, 10, 7, + 3, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101 + } ; -static yyconst flex_int16_t yy_rule_linenum[34] = +static yyconst flex_int16_t yy_rule_linenum[44] = { 0, - 26, 32, 33, 35, 36, 38, 39, 40, 42, 43, - 45, 46, 48, 49, 50, 51, 53, 54, 56, 57, - 58, 61, 62, 64, 66, 67, 69, 71, 72, 74, - 76, 78, 80 + 27, 32, 33, 34, 35, 37, 38, 39, 40, 42, + 43, 44, 46, 47, 49, 50, 52, 53, 54, 55, + 57, 58, 60, 61, 62, 65, 66, 68, 69, 70, + 72, 73, 75, 76, 78, 79, 81, 83, 85, 86, + 88, 90, 92 } ; /* The intent behind this definition is that it'll catch @@ -592,7 +610,7 @@ static yyconst flex_int16_t yy_rule_linenum[34] = #include "promela.tab.hpp" #define YYSTYPE PROMELA_STYPE -#line 596 "promela.lex.yy.cpp" +#line 614 "promela.lex.yy.cpp" #define INITIAL 0 @@ -890,10 +908,10 @@ YY_DECL struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* %% [7.0] user's declarations go here */ -#line 24 "promela.l" +#line 25 "promela.l" -#line 897 "promela.lex.yy.cpp" +#line 915 "promela.lex.yy.cpp" yylval = yylval_param; @@ -958,13 +976,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 84 ) + if ( yy_current_state >= 102 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 83 ); + while ( yy_current_state != 101 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -983,13 +1001,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 34 ) + else if ( yy_act < 44 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], yytext ); - else if ( yy_act == 34 ) + else if ( yy_act == 44 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", yytext ); - else if ( yy_act == 35 ) + else if ( yy_act == 45 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -1007,9 +1025,8 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 26 "promela.l" +#line 27 "promela.l" { - //printf("TYPE: %s\n", yytext); yylval->value = strdup(yytext); return TYPE; } @@ -1026,162 +1043,213 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 35 "promela.l" -{ return NEG; } +#line 34 "promela.l" +{ return PRINT; } YY_BREAK case 5: YY_RULE_SETUP -#line 36 "promela.l" -{ return COMPL; } +#line 35 "promela.l" +{ return PRINTM; } YY_BREAK case 6: YY_RULE_SETUP -#line 38 "promela.l" -{ return TIMES; } +#line 37 "promela.l" +{ return NEG; } YY_BREAK case 7: YY_RULE_SETUP -#line 39 "promela.l" -{ return DIVIDE; } +#line 38 "promela.l" +{ return COMPL; } YY_BREAK case 8: YY_RULE_SETUP -#line 40 "promela.l" -{ return MODULO; } +#line 39 "promela.l" +{ return INCR; } YY_BREAK case 9: YY_RULE_SETUP -#line 42 "promela.l" -{ return PLUS; } +#line 40 "promela.l" +{ return DECR; } YY_BREAK case 10: YY_RULE_SETUP -#line 43 "promela.l" -{ return MINUS; } +#line 42 "promela.l" +{ return TIMES; } YY_BREAK case 11: YY_RULE_SETUP -#line 45 "promela.l" -{ return LSHIFT; } +#line 43 "promela.l" +{ return DIVIDE; } YY_BREAK case 12: YY_RULE_SETUP -#line 46 "promela.l" -{ return RSHIFT; } +#line 44 "promela.l" +{ return MODULO; } YY_BREAK case 13: YY_RULE_SETUP -#line 48 "promela.l" -{ return LE; } +#line 46 "promela.l" +{ return PLUS; } YY_BREAK case 14: YY_RULE_SETUP -#line 49 "promela.l" -{ return GE; } +#line 47 "promela.l" +{ return MINUS; } YY_BREAK case 15: YY_RULE_SETUP -#line 50 "promela.l" -{ return LT; } +#line 49 "promela.l" +{ return LSHIFT; } YY_BREAK case 16: YY_RULE_SETUP -#line 51 "promela.l" -{ return GT; } +#line 50 "promela.l" +{ return RSHIFT; } YY_BREAK case 17: YY_RULE_SETUP -#line 53 "promela.l" -{ return NE; } +#line 52 "promela.l" +{ return LE; } YY_BREAK case 18: YY_RULE_SETUP -#line 54 "promela.l" -{ return EQ; } +#line 53 "promela.l" +{ return GE; } YY_BREAK case 19: YY_RULE_SETUP -#line 56 "promela.l" -{ return BITAND; } +#line 54 "promela.l" +{ return LT; } YY_BREAK case 20: YY_RULE_SETUP -#line 57 "promela.l" -{ return BITXOR; } +#line 55 "promela.l" +{ return GT; } YY_BREAK case 21: YY_RULE_SETUP -#line 58 "promela.l" -{ return BITOR; } +#line 57 "promela.l" +{ return NE; } YY_BREAK case 22: YY_RULE_SETUP -#line 61 "promela.l" -{ return AND; } +#line 58 "promela.l" +{ return EQ; } YY_BREAK case 23: YY_RULE_SETUP -#line 62 "promela.l" -{ return OR; } +#line 60 "promela.l" +{ return BITAND; } YY_BREAK case 24: YY_RULE_SETUP -#line 64 "promela.l" -{ return DOT; } +#line 61 "promela.l" +{ return BITXOR; } YY_BREAK case 25: YY_RULE_SETUP -#line 66 "promela.l" -{ return LBRACKET; } +#line 62 "promela.l" +{ return BITOR; } YY_BREAK case 26: YY_RULE_SETUP -#line 67 "promela.l" -{ return RBRACKET; } +#line 65 "promela.l" +{ return AND; } YY_BREAK case 27: YY_RULE_SETUP -#line 69 "promela.l" -{ return ASGN; } +#line 66 "promela.l" +{ return OR; } YY_BREAK case 28: YY_RULE_SETUP -#line 71 "promela.l" -{ yylval->value = strdup(yytext); return CONST; } +#line 68 "promela.l" +{ return DOT; } YY_BREAK case 29: YY_RULE_SETUP -#line 72 "promela.l" -{ yylval->value = strdup(yytext); return NAME; } +#line 69 "promela.l" +{ return COMMA; } YY_BREAK case 30: -/* rule 30 can match eol */ YY_RULE_SETUP -#line 74 "promela.l" -{ } +#line 70 "promela.l" +{ return SEMI; } YY_BREAK case 31: YY_RULE_SETUP -#line 76 "promela.l" -/* eat up one-line comments */ +#line 72 "promela.l" +{ return '('; } YY_BREAK case 32: -/* rule 32 can match eol */ YY_RULE_SETUP -#line 78 "promela.l" -/* eat up whitespace */ +#line 73 "promela.l" +{ return ')'; } YY_BREAK case 33: YY_RULE_SETUP -#line 80 "promela.l" -{ /*printf( "Unrecognized character: %s\n", yytext ); */ } +#line 75 "promela.l" +{ return '['; } YY_BREAK case 34: YY_RULE_SETUP +#line 76 "promela.l" +{ return ']'; } + YY_BREAK +case 35: +YY_RULE_SETUP +#line 78 "promela.l" +{ return '{'; } + YY_BREAK +case 36: +YY_RULE_SETUP +#line 79 "promela.l" +{ return '}'; } + YY_BREAK +case 37: +YY_RULE_SETUP #line 81 "promela.l" +{ return ASGN; } + YY_BREAK +case 38: +/* rule 38 can match eol */ +YY_RULE_SETUP +#line 83 "promela.l" +{ yylval->value = strdup(yytext); return(STRING); } + YY_BREAK +case 39: +YY_RULE_SETUP +#line 85 "promela.l" +{ yylval->value = strdup(yytext); return CONST; } + YY_BREAK +case 40: +YY_RULE_SETUP +#line 86 "promela.l" +{ yylval->value = strdup(yytext); return NAME; } + YY_BREAK +case 41: +/* rule 41 can match eol */ +YY_RULE_SETUP +#line 88 "promela.l" +{ } + YY_BREAK +case 42: +/* rule 42 can match eol */ +YY_RULE_SETUP +#line 90 "promela.l" +/* eat up whitespace */ + YY_BREAK +case 43: +YY_RULE_SETUP +#line 92 "promela.l" +{ /*printf( "Unrecognized character: %s\n", yytext ); */ } + YY_BREAK +case 44: +YY_RULE_SETUP +#line 93 "promela.l" ECHO; YY_BREAK -#line 1185 "promela.lex.yy.cpp" +#line 1253 "promela.lex.yy.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1497,7 +1565,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 84 ) + if ( yy_current_state >= 102 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1531,11 +1599,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 84 ) + if ( yy_current_state >= 102 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 83); + yy_is_jam = (yy_current_state == 101); return yy_is_jam ? 0 : yy_current_state; } @@ -2485,4 +2553,4 @@ void promela_free (void * ptr , yyscan_t yyscanner) /* %ok-for-header */ -#line 81 "promela.l" +#line 93 "promela.l" diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp b/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp index 5762dd4..10bef82 100644 --- a/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp +++ b/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp @@ -118,7 +118,7 @@ using namespace uscxml; # define PROMELA_DEBUG 0 # endif # else /* ! defined YYDEBUG */ -# define PROMELA_DEBUG 0 +# define PROMELA_DEBUG 1 # endif /* ! defined YYDEBUG */ #endif /* ! defined PROMELA_DEBUG */ #if PROMELA_DEBUG @@ -131,66 +131,78 @@ extern int promela_debug; /* Put the tokens into the symbol table, so that GDB and other debuggers know about them. */ enum promela_tokentype { - LBRACKET = 258, - RBRACKET = 259, - LEN = 260, - TYPEDEF = 261, - MTYPE = 262, - INLINE = 263, - RETURN = 264, - LABEL = 265, - OF = 266, - GOTO = 267, - BREAK = 268, - ELSE = 269, - SEMI = 270, - ARROW = 271, - IF = 272, - FI = 273, - DO = 274, - OD = 275, - FOR = 276, - SELECT = 277, - IN = 278, - SEP = 279, - DOTDOT = 280, - HIDDEN = 281, - SHOW = 282, - ISLOCAL = 283, - CONST = 284, - TYPE = 285, - XU = 286, - NAME = 287, - UNAME = 288, - PNAME = 289, - INAME = 290, - STRING = 291, - CLAIM = 292, - TRACE = 293, - INIT = 294, - LTL = 295, - ASGN = 296, - AND = 297, - OR = 298, - BITAND = 299, - BITXOR = 300, - BITOR = 301, - NE = 302, - EQ = 303, - LE = 304, - GE = 305, - LT = 306, - GT = 307, - RSHIFT = 308, - LSHIFT = 309, - MINUS = 310, - PLUS = 311, - MODULO = 312, - DIVIDE = 313, - TIMES = 314, - COMPL = 315, - NEG = 316, - DOT = 317 + VAR_ARRAY = 258, + VARLIST = 259, + DECL = 260, + DECLLIST = 261, + STMNT = 262, + COLON = 263, + EXPR = 264, + NAMELIST = 265, + ASSERT = 266, + PRINT = 267, + PRINTM = 268, + LEN = 269, + STRING = 270, + TYPEDEF = 271, + MTYPE = 272, + INLINE = 273, + RETURN = 274, + LABEL = 275, + OF = 276, + GOTO = 277, + BREAK = 278, + ELSE = 279, + SEMI = 280, + ARROW = 281, + IF = 282, + FI = 283, + DO = 284, + OD = 285, + FOR = 286, + SELECT = 287, + IN = 288, + SEP = 289, + DOTDOT = 290, + HIDDEN = 291, + SHOW = 292, + ISLOCAL = 293, + CONST = 294, + TYPE = 295, + XU = 296, + NAME = 297, + UNAME = 298, + PNAME = 299, + INAME = 300, + CLAIM = 301, + TRACE = 302, + INIT = 303, + LTL = 304, + COMMA = 305, + ASGN = 306, + AND = 307, + OR = 308, + BITAND = 309, + BITXOR = 310, + BITOR = 311, + NE = 312, + EQ = 313, + LE = 314, + GE = 315, + LT = 316, + GT = 317, + RSHIFT = 318, + LSHIFT = 319, + MINUS = 320, + PLUS = 321, + MODULO = 322, + DIVIDE = 323, + TIMES = 324, + DECR = 325, + INCR = 326, + COMPL = 327, + NEG = 328, + DOT = 329 }; #endif @@ -199,14 +211,14 @@ extern int promela_debug; typedef union PROMELA_STYPE { /* Line 387 of yacc.c */ -#line 37 "promela.ypp" +#line 38 "promela.ypp" uscxml::PromelaParserNode* node; char* value; /* Line 387 of yacc.c */ -#line 210 "promela.tab.cpp" +#line 222 "promela.tab.cpp" } PROMELA_STYPE; # define PROMELA_STYPE_IS_TRIVIAL 1 # define promela_stype PROMELA_STYPE /* obsolescent; will be withdrawn */ @@ -233,7 +245,7 @@ int promela_parse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 237 "promela.tab.cpp" +#line 249 "promela.tab.cpp" #ifdef short # undef short @@ -460,22 +472,22 @@ union yyalloc #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 23 +#define YYFINAL 33 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 205 +#define YYLAST 304 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 77 +#define YYNTOKENS 81 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 16 +#define YYNNTS 23 /* YYNRULES -- Number of rules. */ -#define YYNRULES 61 +#define YYNRULES 83 /* YYNRULES -- Number of states. */ -#define YYNSTATES 110 +#define YYNSTATES 146 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 317 +#define YYMAXUTOK 329 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -486,16 +498,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 76, 2, 2, - 66, 67, 74, 73, 70, 72, 65, 75, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 71, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 11, 12, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 63, 2, 64, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 68, 2, 69, 2, 2, 2, 2, + 2, 13, 2, 14, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 15, 2, 16, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -509,64 +521,76 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62 + 5, 6, 7, 8, 9, 10, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80 }; #if PROMELA_DEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const yytype_uint8 yyprhs[] = +static const yytype_uint16 yyprhs[] = { - 0, 0, 3, 5, 7, 9, 11, 16, 17, 21, - 22, 25, 29, 33, 37, 41, 45, 49, 53, 57, - 61, 65, 69, 73, 77, 81, 85, 89, 93, 97, - 101, 104, 107, 112, 114, 116, 117, 119, 121, 123, - 127, 131, 138, 140, 144, 146, 150, 152, 156, 158, - 162, 167, 169, 172, 176, 180, 184, 188, 192, 196, - 198, 201 + 0, 0, 3, 5, 7, 9, 11, 13, 18, 19, + 23, 24, 27, 31, 35, 39, 43, 47, 51, 55, + 59, 63, 67, 71, 75, 79, 83, 87, 91, 95, + 99, 103, 106, 109, 114, 116, 118, 119, 121, 123, + 125, 129, 133, 140, 142, 145, 149, 151, 155, 157, + 161, 163, 167, 172, 174, 177, 181, 185, 189, 193, + 197, 201, 203, 206, 209, 211, 214, 218, 220, 224, + 227, 230, 236, 241, 246, 249, 251, 252, 261, 262, + 264, 265, 268, 270 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 78, 0, -1, 87, -1, 84, -1, 81, -1, 32, - -1, 32, 63, 84, 64, -1, -1, 80, 82, 83, - -1, -1, 65, 81, -1, 3, 84, 4, -1, 84, - 56, 84, -1, 84, 55, 84, -1, 84, 59, 84, - -1, 84, 58, 84, -1, 84, 57, 84, -1, 84, - 44, 84, -1, 84, 45, 84, -1, 84, 46, 84, - -1, 84, 52, 84, -1, 84, 51, 84, -1, 84, - 50, 84, -1, 84, 49, 84, -1, 84, 48, 84, - -1, 84, 47, 84, -1, 84, 42, 84, -1, 84, - 43, 84, -1, 84, 54, 84, -1, 84, 53, 84, - -1, 61, 84, -1, 55, 84, -1, 5, 66, 79, - 67, -1, 79, -1, 29, -1, -1, 26, -1, 27, - -1, 28, -1, 85, 30, 88, -1, 85, 33, 88, - -1, 85, 30, 41, 68, 92, 69, -1, 86, -1, - 86, 15, 87, -1, 89, -1, 89, 70, 88, -1, - 90, -1, 90, 41, 84, -1, 32, -1, 32, 71, - 29, -1, 32, 63, 91, 64, -1, 29, -1, 72, - 91, -1, 66, 91, 67, -1, 91, 73, 91, -1, - 91, 72, 91, -1, 91, 74, 91, -1, 91, 75, - 91, -1, 91, 76, 91, -1, 32, -1, 92, 32, - -1, 92, 70, -1 + 82, 0, -1, 91, -1, 88, -1, 97, -1, 85, + -1, 48, -1, 48, 13, 88, 14, -1, -1, 84, + 86, 87, -1, -1, 80, 85, -1, 11, 88, 12, + -1, 88, 72, 88, -1, 88, 71, 88, -1, 88, + 75, 88, -1, 88, 74, 88, -1, 88, 73, 88, + -1, 88, 60, 88, -1, 88, 61, 88, -1, 88, + 62, 88, -1, 88, 68, 88, -1, 88, 67, 88, + -1, 88, 66, 88, -1, 88, 65, 88, -1, 88, + 64, 88, -1, 88, 63, 88, -1, 88, 58, 88, + -1, 88, 59, 88, -1, 88, 70, 88, -1, 88, + 69, 88, -1, 79, 88, -1, 71, 88, -1, 20, + 11, 83, 12, -1, 83, -1, 45, -1, -1, 42, + -1, 43, -1, 44, -1, 89, 46, 92, -1, 89, + 49, 92, -1, 89, 46, 57, 15, 96, 16, -1, + 90, -1, 90, 31, -1, 90, 31, 91, -1, 93, + -1, 93, 56, 92, -1, 94, -1, 94, 57, 88, + -1, 48, -1, 48, 8, 45, -1, 48, 13, 95, + 14, -1, 45, -1, 71, 95, -1, 11, 95, 12, + -1, 95, 72, 95, -1, 95, 71, 95, -1, 95, + 75, 95, -1, 95, 74, 95, -1, 95, 73, 95, + -1, 48, -1, 96, 48, -1, 96, 56, -1, 98, + -1, 98, 31, -1, 98, 31, 97, -1, 99, -1, + 83, 57, 88, -1, 83, 77, -1, 83, 76, -1, + 18, 11, 21, 102, 12, -1, 19, 11, 83, 12, + -1, 19, 11, 45, 12, -1, 17, 88, -1, 88, + -1, -1, 83, 57, 51, 100, 11, 101, 12, 99, + -1, -1, 103, -1, -1, 56, 103, -1, 88, -1, + 88, 56, 103, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 75, 75, 79, 84, 87, 88, 91, 91, 95, - 96, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 121, 122, 123, 127, 128, 129, 130, 133, - 134, 135, 138, 139, 143, 144, 147, 148, 151, 152, - 153, 156, 157, 158, 159, 160, 161, 162, 163, 166, - 167, 168 + 0, 84, 84, 88, 92, 98, 101, 102, 105, 105, + 109, 110, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 142, 143, 144, 148, 149, 150, 151, + 154, 155, 156, 159, 160, 161, 171, 172, 175, 176, + 179, 180, 181, 184, 185, 186, 187, 188, 189, 190, + 191, 194, 195, 203, 206, 207, 208, 211, 214, 215, + 216, 217, 218, 219, 220, 221, 222, 222, 225, 226, + 229, 230, 233, 234 }; #endif @@ -575,18 +599,19 @@ static const yytype_uint8 yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "LBRACKET", "RBRACKET", "LEN", "TYPEDEF", - "MTYPE", "INLINE", "RETURN", "LABEL", "OF", "GOTO", "BREAK", "ELSE", - "SEMI", "ARROW", "IF", "FI", "DO", "OD", "FOR", "SELECT", "IN", "SEP", - "DOTDOT", "HIDDEN", "SHOW", "ISLOCAL", "CONST", "TYPE", "XU", "NAME", - "UNAME", "PNAME", "INAME", "STRING", "CLAIM", "TRACE", "INIT", "LTL", - "ASGN", "AND", "OR", "BITAND", "BITXOR", "BITOR", "NE", "EQ", "LE", "GE", - "LT", "GT", "RSHIFT", "LSHIFT", "MINUS", "PLUS", "MODULO", "DIVIDE", - "TIMES", "COMPL", "NEG", "DOT", "'['", "']'", "'.'", "'('", "')'", "'{'", - "'}'", "','", "':'", "'-'", "'+'", "'*'", "'/'", "'%'", "$accept", + "$end", "error", "$undefined", "VAR_ARRAY", "VARLIST", "DECL", + "DECLLIST", "STMNT", "COLON", "EXPR", "NAMELIST", "'('", "')'", "'['", + "']'", "'{'", "'}'", "ASSERT", "PRINT", "PRINTM", "LEN", "STRING", + "TYPEDEF", "MTYPE", "INLINE", "RETURN", "LABEL", "OF", "GOTO", "BREAK", + "ELSE", "SEMI", "ARROW", "IF", "FI", "DO", "OD", "FOR", "SELECT", "IN", + "SEP", "DOTDOT", "HIDDEN", "SHOW", "ISLOCAL", "CONST", "TYPE", "XU", + "NAME", "UNAME", "PNAME", "INAME", "CLAIM", "TRACE", "INIT", "LTL", + "COMMA", "ASGN", "AND", "OR", "BITAND", "BITXOR", "BITOR", "NE", "EQ", + "LE", "GE", "LT", "GT", "RSHIFT", "LSHIFT", "MINUS", "PLUS", "MODULO", + "DIVIDE", "TIMES", "DECR", "INCR", "COMPL", "NEG", "DOT", "$accept", "program", "varref", "pfld", "cmpnd", "$@1", "sfld", "expr", "vis", "one_decl", "decl_lst", "var_list", "ivar", "vardcl", "const_expr", - "nlst", YY_NULL + "nlst", "stmnt_lst", "stmnt", "Stmnt", "$@2", "args", "prargs", "arg", YY_NULL }; #endif @@ -596,38 +621,43 @@ static const char *const yytname[] = static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 91, 93, 46, 40, 41, 123, 125, - 44, 58, 45, 43, 42, 47, 37 + 265, 40, 41, 91, 93, 123, 125, 266, 267, 268, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, + 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, + 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, + 329 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 77, 78, 78, 79, 80, 80, 82, 81, 83, - 83, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 85, 85, 85, 85, 86, - 86, 86, 87, 87, 88, 88, 89, 89, 90, 90, - 90, 91, 91, 91, 91, 91, 91, 91, 91, 92, - 92, 92 + 0, 81, 82, 82, 82, 83, 84, 84, 86, 85, + 87, 87, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 89, 89, 89, 89, + 90, 90, 90, 91, 91, 91, 92, 92, 93, 93, + 94, 94, 94, 95, 95, 95, 95, 95, 95, 95, + 95, 96, 96, 96, 97, 97, 97, 98, 99, 99, + 99, 99, 99, 99, 99, 99, 100, 99, 101, 101, + 102, 102, 103, 103 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { - 0, 2, 1, 1, 1, 1, 4, 0, 3, 0, - 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 0, 2, 1, 1, 1, 1, 1, 4, 0, 3, + 0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 2, 4, 1, 1, 0, 1, 1, 1, 3, - 3, 6, 1, 3, 1, 3, 1, 3, 1, 3, - 4, 1, 2, 3, 3, 3, 3, 3, 3, 1, - 2, 2 + 3, 2, 2, 4, 1, 1, 0, 1, 1, 1, + 3, 3, 6, 1, 2, 3, 1, 3, 1, 3, + 1, 3, 4, 1, 2, 3, 3, 3, 3, 3, + 3, 1, 2, 2, 1, 2, 3, 1, 3, 2, + 2, 5, 4, 4, 2, 1, 0, 8, 0, 1, + 0, 2, 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -635,126 +665,160 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 35, 0, 0, 36, 37, 38, 34, 5, 0, 0, - 0, 33, 7, 4, 3, 0, 42, 2, 0, 0, - 0, 31, 30, 1, 9, 0, 0, 0, 0, 0, + 36, 0, 0, 0, 0, 0, 37, 38, 39, 35, + 6, 0, 0, 0, 34, 8, 5, 3, 0, 43, + 2, 4, 64, 67, 34, 0, 74, 0, 0, 0, + 0, 32, 31, 1, 0, 70, 69, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 35, 11, 0, 0, 0, - 8, 26, 27, 17, 18, 19, 25, 24, 23, 22, - 21, 20, 29, 28, 13, 12, 16, 15, 14, 48, - 0, 39, 44, 46, 40, 43, 32, 6, 10, 0, - 0, 0, 0, 0, 51, 0, 0, 0, 49, 59, - 0, 45, 47, 0, 52, 50, 0, 0, 0, 0, - 0, 60, 41, 61, 53, 55, 54, 56, 57, 58 + 0, 0, 0, 0, 0, 0, 0, 0, 36, 65, + 12, 80, 0, 0, 0, 0, 76, 68, 0, 9, + 27, 28, 18, 19, 20, 26, 25, 24, 23, 22, + 21, 30, 29, 14, 13, 17, 16, 15, 50, 0, + 40, 46, 48, 41, 45, 75, 66, 0, 0, 73, + 72, 33, 7, 0, 11, 0, 0, 0, 0, 0, + 82, 81, 71, 78, 51, 0, 53, 0, 0, 61, + 0, 47, 49, 0, 0, 79, 0, 54, 52, 0, + 0, 0, 0, 0, 42, 62, 63, 83, 0, 55, + 57, 56, 60, 59, 58, 77 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 10, 11, 12, 13, 24, 50, 14, 15, 16, - 17, 71, 72, 73, 87, 90 + -1, 13, 24, 15, 16, 37, 69, 110, 18, 19, + 20, 90, 91, 92, 118, 120, 21, 22, 23, 103, + 124, 98, 111 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -83 +#define YYPACT_NINF -109 static const yytype_int16 yypact[] = { - 17, 18, -64, -83, -83, -83, -83, -57, 18, 18, - 11, -83, -83, -83, 67, -21, 56, -83, 9, 45, - 18, 44, -83, -83, 15, 18, 18, 18, 18, 18, - 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, - 18, 18, 18, -31, 49, 48, -83, 114, 41, 45, - -83, 83, 83, 96, 96, 96, 120, 120, 104, 104, - 104, 104, 136, 136, 44, 44, -83, -83, -83, 119, - 36, -83, 131, 142, -83, -83, -83, -83, -83, -24, - 155, 170, 49, 18, -83, -24, -24, 92, -83, -83, - 37, -83, 67, 113, 124, -83, -24, -24, -24, -24, - -24, -83, -83, -83, -83, 124, 124, 124, 124, 124 + 46, 65, 65, -5, 7, 9, -109, -109, -109, -109, + 8, 65, 65, 33, -53, -109, -109, 155, -36, 5, + -109, -109, 6, -109, -109, 87, 193, 54, -29, 36, + 65, -1, -109, -109, 60, -109, -109, 13, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, -40, 38, 35, 50, + -109, 25, 71, 75, 84, 110, -109, 193, 36, -109, + 209, 209, 222, 222, 222, 170, 170, 229, 229, 229, + 229, -46, -46, -1, -1, -109, -109, -109, 1, 82, + -109, 51, 49, -109, -109, 193, -109, 65, 100, -109, + -109, -109, -109, 103, -109, 70, 11, 68, 38, 65, + 136, -109, -109, 65, -109, 11, -109, 11, 116, -109, + 44, -109, 193, 65, 106, -109, 92, 28, -109, 11, + 11, 11, 11, 11, -109, -109, -109, -109, 50, -109, + 28, 28, -109, -109, -109, -109 }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = +static const yytype_int8 yypgoto[] = { - -83, -83, 184, -83, 156, -83, -83, -1, -83, -83, - 159, 26, -83, -83, -82, -83 + -109, -109, 3, -109, 52, -109, -109, 0, -109, -109, + 61, -50, -109, -109, 117, -109, 63, -109, -15, -109, + -109, -109, -108 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = +#define YYTABLE_NINF -76 +static const yytype_int16 yytable[] = { - 18, 69, 19, 93, 94, 84, 20, 21, 22, 43, - 70, 23, 44, 46, 105, 106, 107, 108, 109, 48, - 1, 1, 2, 2, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 68, 85, 3, 4, 5, 6, 6, 86, 7, - 7, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 101, - 74, 45, 8, 8, 3, 4, 5, 7, 9, 9, - 49, 69, 92, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 40, 41, 42, 81, 77, 102, 103, 91, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 95, 36, 37, 38, - 39, 40, 41, 42, 96, 97, 98, 99, 100, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 104, 76, 79, 83, 88, 96, 97, 98, 99, 100, - 80, 38, 39, 40, 41, 42, 96, 97, 98, 99, - 100, 82, 89, 47, 75, 78 + 17, 25, 26, 14, 34, 125, 27, 93, 88, 105, + 56, 31, 32, 57, 106, 137, 62, 89, 28, 10, + 29, 30, 115, 35, 36, 51, 52, 53, 54, 55, + 65, 63, 64, 33, 67, -44, 58, 59, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 116, 1, 121, 95, + 134, 1, 14, 2, 3, 4, 5, 2, 3, 4, + 5, 1, 53, 54, 55, 61, 1, 6, 7, 8, + 5, 97, 117, 99, 10, 5, 88, 100, 6, 7, + 8, 9, 135, 68, 10, 9, 101, 107, 10, 60, + 136, 131, 132, 133, 139, 9, 109, 108, 10, 122, + 9, 66, 112, 10, 113, 114, 119, 11, 138, 94, + 104, 11, 96, 145, 102, 12, 0, 0, 0, 12, + 128, 11, 0, 0, 0, 0, 11, 0, 95, 12, + 0, 14, 0, 0, 12, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 129, 130, 131, 132, 133, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, -75, 129, 130, 131, + 132, 133, 123, 0, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 0, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 0, 126, 0, 127, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 140, 141, 142, 143, + 144, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 49, 50, + 51, 52, 53, 54, 55 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-83))) + (!!((Yystate) == (-109))) #define yytable_value_is_error(Yytable_value) \ YYID (0) -static const yytype_uint8 yycheck[] = +static const yytype_int16 yycheck[] = { - 1, 32, 66, 85, 86, 29, 63, 8, 9, 30, - 41, 0, 33, 4, 96, 97, 98, 99, 100, 20, - 3, 3, 5, 5, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 66, 26, 27, 28, 29, 29, 72, 32, - 32, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 32, - 44, 15, 55, 55, 26, 27, 28, 32, 61, 61, - 65, 32, 83, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 57, 58, 59, 68, 64, 69, 70, 82, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 64, 53, 54, 55, - 56, 57, 58, 59, 72, 73, 74, 75, 76, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 67, 67, 63, 41, 29, 72, 73, 74, 75, 76, - 71, 55, 56, 57, 58, 59, 72, 73, 74, 75, - 76, 70, 32, 19, 45, 49 + 0, 1, 2, 0, 57, 113, 11, 57, 48, 8, + 46, 11, 12, 49, 13, 123, 45, 57, 11, 48, + 11, 13, 11, 76, 77, 71, 72, 73, 74, 75, + 30, 28, 29, 0, 34, 0, 31, 31, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 45, 11, 108, 59, + 16, 11, 59, 17, 18, 19, 20, 17, 18, 19, + 20, 11, 73, 74, 75, 21, 11, 42, 43, 44, + 20, 56, 71, 12, 48, 20, 48, 12, 42, 43, + 44, 45, 48, 80, 48, 45, 12, 15, 48, 12, + 56, 73, 74, 75, 12, 45, 57, 56, 48, 109, + 45, 51, 12, 48, 11, 45, 48, 71, 12, 58, + 68, 71, 59, 138, 14, 79, -1, -1, -1, 79, + 14, 71, -1, -1, -1, -1, 71, -1, 138, 79, + -1, 138, -1, -1, 79, 58, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 71, 72, 73, 74, 75, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 31, 71, 72, 73, + 74, 75, 56, -1, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, -1, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, -1, 115, -1, 117, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 129, 130, 131, 132, + 133, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 60, + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 69, 70, + 71, 72, 73, 74, 75 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 3, 5, 26, 27, 28, 29, 32, 55, 61, - 78, 79, 80, 81, 84, 85, 86, 87, 84, 66, - 63, 84, 84, 0, 82, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 30, 33, 15, 4, 79, 84, 65, - 83, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 84, 84, 84, 84, 32, - 41, 88, 89, 90, 88, 87, 67, 64, 81, 63, - 71, 68, 70, 41, 29, 66, 72, 91, 29, 32, - 92, 88, 84, 91, 91, 64, 72, 73, 74, 75, - 76, 32, 69, 70, 67, 91, 91, 91, 91, 91 + 0, 11, 17, 18, 19, 20, 42, 43, 44, 45, + 48, 71, 79, 82, 83, 84, 85, 88, 89, 90, + 91, 97, 98, 99, 83, 88, 88, 11, 11, 11, + 13, 88, 88, 0, 57, 76, 77, 86, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 46, 49, 31, 31, + 12, 21, 45, 83, 83, 88, 51, 88, 80, 87, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 48, 57, + 92, 93, 94, 92, 91, 88, 97, 56, 102, 12, + 12, 12, 14, 100, 85, 8, 13, 15, 56, 57, + 88, 103, 12, 11, 45, 11, 45, 71, 95, 48, + 96, 92, 88, 56, 101, 103, 95, 95, 14, 71, + 72, 73, 74, 75, 16, 48, 56, 103, 12, 12, + 95, 95, 95, 95, 95, 99 }; #define yyerrok (yyerrstatus = 0) @@ -1573,7 +1637,7 @@ yyreduce: { case 2: /* Line 1787 of yacc.c */ -#line 75 "promela.ypp" +#line 84 "promela.ypp" { ctx->ast = (yyvsp[(1) - (1)].node); ctx->type = PromelaParser::PROMELA_DECL; @@ -1582,7 +1646,7 @@ yyreduce: case 3: /* Line 1787 of yacc.c */ -#line 79 "promela.ypp" +#line 88 "promela.ypp" { ctx->ast = (yyvsp[(1) - (1)].node); ctx->type = PromelaParser::PROMELA_EXPR; @@ -1591,355 +1655,504 @@ yyreduce: case 4: /* Line 1787 of yacc.c */ -#line 84 "promela.ypp" - {} +#line 92 "promela.ypp" + { + ctx->ast = (yyvsp[(1) - (1)].node); + ctx->type = PromelaParser::PROMELA_STMNT; + } break; case 5: /* Line 1787 of yacc.c */ -#line 87 "promela.ypp" - { (yyval.node) = ctx->value(yylval.value); } +#line 98 "promela.ypp" + {} break; case 6: /* Line 1787 of yacc.c */ -#line 88 "promela.ypp" - {} +#line 101 "promela.ypp" + { (yyval.node) = ctx->value(NAME, yylval.value); } break; case 7: /* Line 1787 of yacc.c */ -#line 91 "promela.ypp" +#line 102 "promela.ypp" {} break; case 8: /* Line 1787 of yacc.c */ -#line 92 "promela.ypp" +#line 105 "promela.ypp" {} break; case 9: /* Line 1787 of yacc.c */ -#line 95 "promela.ypp" +#line 106 "promela.ypp" {} break; case 10: /* Line 1787 of yacc.c */ -#line 96 "promela.ypp" +#line 109 "promela.ypp" {} break; case 11: /* Line 1787 of yacc.c */ -#line 99 "promela.ypp" - { (yyval.node) = (yyvsp[(2) - (3)].node); } +#line 110 "promela.ypp" + {} break; case 12: /* Line 1787 of yacc.c */ -#line 100 "promela.ypp" - { (yyval.node) = ctx->binOp(PLUS, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 120 "promela.ypp" + { (yyval.node) = (yyvsp[(2) - (3)].node); } break; case 13: /* Line 1787 of yacc.c */ -#line 101 "promela.ypp" - { (yyval.node) = ctx->binOp(MINUS, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 121 "promela.ypp" + { (yyval.node) = ctx->node(PLUS, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 14: /* Line 1787 of yacc.c */ -#line 102 "promela.ypp" - { (yyval.node) = ctx->binOp(TIMES, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 122 "promela.ypp" + { (yyval.node) = ctx->node(MINUS, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 15: /* Line 1787 of yacc.c */ -#line 103 "promela.ypp" - { (yyval.node) = ctx->binOp(DIVIDE, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 123 "promela.ypp" + { (yyval.node) = ctx->node(TIMES, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 16: /* Line 1787 of yacc.c */ -#line 104 "promela.ypp" - { (yyval.node) = ctx->binOp(MODULO, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 124 "promela.ypp" + { (yyval.node) = ctx->node(DIVIDE, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 17: /* Line 1787 of yacc.c */ -#line 105 "promela.ypp" - { (yyval.node) = ctx->binOp(BITAND, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 125 "promela.ypp" + { (yyval.node) = ctx->node(MODULO, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 18: /* Line 1787 of yacc.c */ -#line 106 "promela.ypp" - { (yyval.node) = ctx->binOp(BITXOR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 126 "promela.ypp" + { (yyval.node) = ctx->node(BITAND, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 19: /* Line 1787 of yacc.c */ -#line 107 "promela.ypp" - { (yyval.node) = ctx->binOp(BITOR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 127 "promela.ypp" + { (yyval.node) = ctx->node(BITXOR, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 20: /* Line 1787 of yacc.c */ -#line 108 "promela.ypp" - { (yyval.node) = ctx->binOp(GT, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 128 "promela.ypp" + { (yyval.node) = ctx->node(BITOR, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 21: /* Line 1787 of yacc.c */ -#line 109 "promela.ypp" - { (yyval.node) = ctx->binOp(LT, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 129 "promela.ypp" + { (yyval.node) = ctx->node(GT, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 22: /* Line 1787 of yacc.c */ -#line 110 "promela.ypp" - { (yyval.node) = ctx->binOp(GE, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 130 "promela.ypp" + { (yyval.node) = ctx->node(LT, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 23: /* Line 1787 of yacc.c */ -#line 111 "promela.ypp" - { (yyval.node) = ctx->binOp(LE, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 131 "promela.ypp" + { (yyval.node) = ctx->node(GE, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 24: /* Line 1787 of yacc.c */ -#line 112 "promela.ypp" - { (yyval.node) = ctx->binOp(EQ, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 132 "promela.ypp" + { (yyval.node) = ctx->node(LE, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 25: /* Line 1787 of yacc.c */ -#line 113 "promela.ypp" - { (yyval.node) = ctx->binOp(NE, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 133 "promela.ypp" + { (yyval.node) = ctx->node(EQ, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 26: /* Line 1787 of yacc.c */ -#line 114 "promela.ypp" - { (yyval.node) = ctx->binOp(AND, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 134 "promela.ypp" + { (yyval.node) = ctx->node(NE, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 27: /* Line 1787 of yacc.c */ -#line 115 "promela.ypp" - { (yyval.node) = ctx->binOp(OR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 135 "promela.ypp" + { (yyval.node) = ctx->node(AND, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 28: /* Line 1787 of yacc.c */ -#line 116 "promela.ypp" - { (yyval.node) = ctx->binOp(LSHIFT, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 136 "promela.ypp" + { (yyval.node) = ctx->node(OR, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 29: /* Line 1787 of yacc.c */ -#line 117 "promela.ypp" - { (yyval.node) = ctx->binOp(RSHIFT, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 137 "promela.ypp" + { (yyval.node) = ctx->node(LSHIFT, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 30: /* Line 1787 of yacc.c */ -#line 118 "promela.ypp" - { (yyval.node) = ctx->uniOp(NEG, (yyvsp[(2) - (2)].node)); } +#line 138 "promela.ypp" + { (yyval.node) = ctx->node(RSHIFT, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 31: /* Line 1787 of yacc.c */ -#line 119 "promela.ypp" - { (yyval.node) = ctx->uniOp(MINUS, (yyvsp[(2) - (2)].node)); } +#line 139 "promela.ypp" + { (yyval.node) = ctx->node(NEG, 1, (yyvsp[(2) - (2)].node)); } break; case 32: /* Line 1787 of yacc.c */ -#line 121 "promela.ypp" - { (yyval.node) = ctx->uniOp(LEN, (yyvsp[(3) - (4)].node)); } +#line 140 "promela.ypp" + { (yyval.node) = ctx->node(MINUS, 1, (yyvsp[(2) - (2)].node)); } break; case 33: /* Line 1787 of yacc.c */ -#line 122 "promela.ypp" - { } +#line 142 "promela.ypp" + { (yyval.node) = ctx->node(LEN, 1, (yyvsp[(3) - (4)].node)); } break; case 34: /* Line 1787 of yacc.c */ -#line 123 "promela.ypp" - { (yyval.node) = ctx->value(yylval.value); } +#line 143 "promela.ypp" + { } break; case 35: /* Line 1787 of yacc.c */ -#line 127 "promela.ypp" - { } +#line 144 "promela.ypp" + { (yyval.node) = ctx->value(CONST, yylval.value); } break; case 36: /* Line 1787 of yacc.c */ -#line 128 "promela.ypp" - { } +#line 148 "promela.ypp" + { (yyval.node) = ctx->node(SHOW, 0); } break; case 37: /* Line 1787 of yacc.c */ -#line 129 "promela.ypp" - { } +#line 149 "promela.ypp" + { (yyval.node) = ctx->node(HIDDEN, 0); } break; case 38: /* Line 1787 of yacc.c */ -#line 130 "promela.ypp" - { } +#line 150 "promela.ypp" + { (yyval.node) = ctx->node(SHOW, 0); } break; case 39: /* Line 1787 of yacc.c */ -#line 133 "promela.ypp" - { (yyval.node) = ctx->uniOp(ASGN, (yyvsp[(3) - (3)].node)); } +#line 151 "promela.ypp" + { (yyval.node) = ctx->node(ISLOCAL, 0); } break; case 40: /* Line 1787 of yacc.c */ -#line 134 "promela.ypp" - { } +#line 154 "promela.ypp" + { (yyval.node) = ctx->node(DECL, 3, (yyvsp[(1) - (3)].node), ctx->value(TYPE, (yyvsp[(2) - (3)].value)), (yyvsp[(3) - (3)].node)); } break; case 41: /* Line 1787 of yacc.c */ -#line 135 "promela.ypp" - { } +#line 155 "promela.ypp" + { (yyval.node) = ctx->node(UNAME, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 42: /* Line 1787 of yacc.c */ -#line 138 "promela.ypp" - { } +#line 156 "promela.ypp" + { (yyval.node) = ctx->node(DECL, 3, (yyvsp[(1) - (6)].node), ctx->value(TYPE, (yyvsp[(2) - (6)].value)), (yyvsp[(5) - (6)].node)); } break; case 43: /* Line 1787 of yacc.c */ -#line 140 "promela.ypp" - { } +#line 159 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (1)].node); } break; case 44: /* Line 1787 of yacc.c */ -#line 143 "promela.ypp" - { (yyval.node) = ctx->uniOp(ASGN, (yyvsp[(1) - (1)].node)); } +#line 160 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (2)].node); } break; case 45: /* Line 1787 of yacc.c */ -#line 144 "promela.ypp" - { (yyval.node) = ctx->binOp(ASGN, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 161 "promela.ypp" + { + (yyval.node) = ctx->node(DECLLIST, 1, (yyvsp[(1) - (3)].node)); + if((yyvsp[(3) - (3)].node)->type == DECLLIST) { + (yyval.node)->merge((yyvsp[(3) - (3)].node)); delete (yyvsp[(3) - (3)].node); + } else { + (yyval.node)->push((yyvsp[(3) - (3)].node)); + } + } break; case 46: /* Line 1787 of yacc.c */ -#line 147 "promela.ypp" - { (yyval.node) = ctx->uniOp(ASGN, (yyvsp[(1) - (1)].node)); } +#line 171 "promela.ypp" + { (yyval.node) = ctx->node(VARLIST, 1, (yyvsp[(1) - (1)].node)); } break; case 47: /* Line 1787 of yacc.c */ -#line 148 "promela.ypp" - { (yyval.node) = ctx->binOp(ASGN, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } +#line 172 "promela.ypp" + { (yyval.node) = ctx->node(VARLIST, 1, (yyvsp[(1) - (3)].node)); (yyval.node)->merge((yyvsp[(3) - (3)].node)); delete (yyvsp[(3) - (3)].node); } break; case 48: /* Line 1787 of yacc.c */ -#line 151 "promela.ypp" - { (yyval.node) = ctx->value(yylval.value); } +#line 175 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (1)].node); } break; case 49: /* Line 1787 of yacc.c */ -#line 152 "promela.ypp" - { } +#line 176 "promela.ypp" + { (yyval.node) = ctx->node(ASGN, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 50: /* Line 1787 of yacc.c */ -#line 153 "promela.ypp" - { } +#line 179 "promela.ypp" + { (yyval.node) = ctx->value(NAME, (yyvsp[(1) - (1)].value)); } break; case 51: /* Line 1787 of yacc.c */ -#line 156 "promela.ypp" - { } +#line 180 "promela.ypp" + { (yyval.node) = ctx->node(COLON, 2, ctx->value(NAME, (yyvsp[(1) - (3)].value)), ctx->value(CONST, (yyvsp[(3) - (3)].value))); } break; case 52: /* Line 1787 of yacc.c */ -#line 157 "promela.ypp" - { } +#line 181 "promela.ypp" + { (yyval.node) = ctx->node(VAR_ARRAY, 2, ctx->value(NAME, (yyvsp[(1) - (4)].value)), (yyvsp[(3) - (4)].node)); } break; case 53: /* Line 1787 of yacc.c */ -#line 158 "promela.ypp" - { } +#line 184 "promela.ypp" + { (yyval.node) = ctx->value(CONST, yylval.value); } break; case 54: /* Line 1787 of yacc.c */ -#line 159 "promela.ypp" - { } +#line 185 "promela.ypp" + { (yyval.node) = ctx->node(MINUS, 1, (yyvsp[(2) - (2)].node)); } break; case 55: /* Line 1787 of yacc.c */ -#line 160 "promela.ypp" - { } +#line 186 "promela.ypp" + { (yyval.node) = (yyvsp[(2) - (3)].node); } break; case 56: /* Line 1787 of yacc.c */ -#line 161 "promela.ypp" - { } +#line 187 "promela.ypp" + { (yyval.node) = ctx->node(PLUS, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 57: /* Line 1787 of yacc.c */ -#line 162 "promela.ypp" - { } +#line 188 "promela.ypp" + { (yyval.node) = ctx->node(MINUS, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 58: /* Line 1787 of yacc.c */ -#line 163 "promela.ypp" - { } +#line 189 "promela.ypp" + { (yyval.node) = ctx->node(TIMES, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 59: /* Line 1787 of yacc.c */ -#line 166 "promela.ypp" - { } +#line 190 "promela.ypp" + { (yyval.node) = ctx->node(DIVIDE, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 60: /* Line 1787 of yacc.c */ -#line 167 "promela.ypp" - { } +#line 191 "promela.ypp" + { (yyval.node) = ctx->node(MODULO, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 61: /* Line 1787 of yacc.c */ -#line 168 "promela.ypp" +#line 194 "promela.ypp" + { (yyval.node) = ctx->value(NAME, (yyvsp[(1) - (1)].value)); } + break; + + case 62: +/* Line 1787 of yacc.c */ +#line 195 "promela.ypp" + { + if ((yyvsp[(1) - (2)].node)->type == NAME) { + (yyval.node) = ctx->node(NAMELIST, 1, (yyvsp[(1) - (2)].node)); + (yyval.node)->push(ctx->value(NAME, (yyvsp[(2) - (2)].value))); + } else { + (yyvsp[(1) - (2)].node)->push(ctx->value(NAME, (yyvsp[(2) - (2)].value))); + } + } + break; + + case 63: +/* Line 1787 of yacc.c */ +#line 203 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (2)].node); } + break; + + case 64: +/* Line 1787 of yacc.c */ +#line 206 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (1)].node); } + break; + + case 65: +/* Line 1787 of yacc.c */ +#line 207 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (2)].node); } + break; + + case 66: +/* Line 1787 of yacc.c */ +#line 208 "promela.ypp" + { (yyval.node) = ctx->node(STMNT, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } + break; + + case 67: +/* Line 1787 of yacc.c */ +#line 211 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (1)].node); } + break; + + case 68: +/* Line 1787 of yacc.c */ +#line 214 "promela.ypp" + { (yyval.node) = ctx->node(ASGN, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } + break; + + case 69: +/* Line 1787 of yacc.c */ +#line 215 "promela.ypp" + { (yyval.node) = ctx->node(INCR, 1, (yyvsp[(1) - (2)].node)); } + break; + + case 70: +/* Line 1787 of yacc.c */ +#line 216 "promela.ypp" + { (yyval.node) = ctx->node(DECR, 1, (yyvsp[(1) - (2)].node)); } + break; + + case 71: +/* Line 1787 of yacc.c */ +#line 217 "promela.ypp" + { (yyval.node) = ctx->node(PRINT, 2, ctx->value(STRING, (yyvsp[(3) - (5)].value)), (yyvsp[(4) - (5)].node)); } + break; + + case 72: +/* Line 1787 of yacc.c */ +#line 218 "promela.ypp" + { (yyval.node) = ctx->node(PRINTM, 1, (yyvsp[(3) - (4)].node)); } + break; + + case 73: +/* Line 1787 of yacc.c */ +#line 219 "promela.ypp" + { (yyval.node) = ctx->node(PRINTM, 1, ctx->value(CONST, (yyvsp[(3) - (4)].value))); } + break; + + case 74: +/* Line 1787 of yacc.c */ +#line 220 "promela.ypp" + { } + break; + + case 75: +/* Line 1787 of yacc.c */ +#line 221 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (1)].node); } + break; + + case 76: +/* Line 1787 of yacc.c */ +#line 222 "promela.ypp" + { } + break; + + case 77: +/* Line 1787 of yacc.c */ +#line 222 "promela.ypp" { } break; + case 78: +/* Line 1787 of yacc.c */ +#line 225 "promela.ypp" + { } + break; + case 79: /* Line 1787 of yacc.c */ -#line 1943 "promela.tab.cpp" +#line 226 "promela.ypp" + { } + break; + + case 80: +/* Line 1787 of yacc.c */ +#line 229 "promela.ypp" + { (yyval.node) = ctx->value(0, ""); } + break; + + case 81: +/* Line 1787 of yacc.c */ +#line 230 "promela.ypp" + { (yyval.node) = (yyvsp[(2) - (2)].node); } + break; + + case 82: +/* Line 1787 of yacc.c */ +#line 233 "promela.ypp" + { (yyval.node) = (yyvsp[(1) - (1)].node); } + break; + + case 83: +/* Line 1787 of yacc.c */ +#line 234 "promela.ypp" + { (yyval.node) = ctx->node(0, 2, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } + break; + + +/* Line 1787 of yacc.c */ +#line 2156 "promela.tab.cpp" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2171,6 +2384,6 @@ yyreturn: /* Line 2050 of yacc.c */ -#line 171 "promela.ypp" +#line 238 "promela.ypp" diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.tab.hpp b/src/uscxml/plugins/datamodel/promela/parser/promela.tab.hpp index 66c0e03..4d2aac2 100644 --- a/src/uscxml/plugins/datamodel/promela/parser/promela.tab.hpp +++ b/src/uscxml/plugins/datamodel/promela/parser/promela.tab.hpp @@ -41,7 +41,7 @@ # define PROMELA_DEBUG 0 # endif # else /* ! defined YYDEBUG */ -# define PROMELA_DEBUG 0 +# define PROMELA_DEBUG 1 # endif /* ! defined YYDEBUG */ #endif /* ! defined PROMELA_DEBUG */ #if PROMELA_DEBUG @@ -54,66 +54,78 @@ extern int promela_debug; /* Put the tokens into the symbol table, so that GDB and other debuggers know about them. */ enum promela_tokentype { - LBRACKET = 258, - RBRACKET = 259, - LEN = 260, - TYPEDEF = 261, - MTYPE = 262, - INLINE = 263, - RETURN = 264, - LABEL = 265, - OF = 266, - GOTO = 267, - BREAK = 268, - ELSE = 269, - SEMI = 270, - ARROW = 271, - IF = 272, - FI = 273, - DO = 274, - OD = 275, - FOR = 276, - SELECT = 277, - IN = 278, - SEP = 279, - DOTDOT = 280, - HIDDEN = 281, - SHOW = 282, - ISLOCAL = 283, - CONST = 284, - TYPE = 285, - XU = 286, - NAME = 287, - UNAME = 288, - PNAME = 289, - INAME = 290, - STRING = 291, - CLAIM = 292, - TRACE = 293, - INIT = 294, - LTL = 295, - ASGN = 296, - AND = 297, - OR = 298, - BITAND = 299, - BITXOR = 300, - BITOR = 301, - NE = 302, - EQ = 303, - LE = 304, - GE = 305, - LT = 306, - GT = 307, - RSHIFT = 308, - LSHIFT = 309, - MINUS = 310, - PLUS = 311, - MODULO = 312, - DIVIDE = 313, - TIMES = 314, - COMPL = 315, - NEG = 316, - DOT = 317 + VAR_ARRAY = 258, + VARLIST = 259, + DECL = 260, + DECLLIST = 261, + STMNT = 262, + COLON = 263, + EXPR = 264, + NAMELIST = 265, + ASSERT = 266, + PRINT = 267, + PRINTM = 268, + LEN = 269, + STRING = 270, + TYPEDEF = 271, + MTYPE = 272, + INLINE = 273, + RETURN = 274, + LABEL = 275, + OF = 276, + GOTO = 277, + BREAK = 278, + ELSE = 279, + SEMI = 280, + ARROW = 281, + IF = 282, + FI = 283, + DO = 284, + OD = 285, + FOR = 286, + SELECT = 287, + IN = 288, + SEP = 289, + DOTDOT = 290, + HIDDEN = 291, + SHOW = 292, + ISLOCAL = 293, + CONST = 294, + TYPE = 295, + XU = 296, + NAME = 297, + UNAME = 298, + PNAME = 299, + INAME = 300, + CLAIM = 301, + TRACE = 302, + INIT = 303, + LTL = 304, + COMMA = 305, + ASGN = 306, + AND = 307, + OR = 308, + BITAND = 309, + BITXOR = 310, + BITOR = 311, + NE = 312, + EQ = 313, + LE = 314, + GE = 315, + LT = 316, + GT = 317, + RSHIFT = 318, + LSHIFT = 319, + MINUS = 320, + PLUS = 321, + MODULO = 322, + DIVIDE = 323, + TIMES = 324, + DECR = 325, + INCR = 326, + COMPL = 327, + NEG = 328, + DOT = 329 }; #endif @@ -122,14 +134,14 @@ extern int promela_debug; typedef union PROMELA_STYPE { /* Line 2053 of yacc.c */ -#line 37 "promela.ypp" +#line 38 "promela.ypp" uscxml::PromelaParserNode* node; char* value; /* Line 2053 of yacc.c */ -#line 133 "promela.tab.hpp" +#line 145 "promela.tab.hpp" } PROMELA_STYPE; # define PROMELA_STYPE_IS_TRIVIAL 1 # define promela_stype PROMELA_STYPE /* obsolescent; will be withdrawn */ diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.ypp b/src/uscxml/plugins/datamodel/promela/parser/promela.ypp index 8b4426b..6147d40 100644 --- a/src/uscxml/plugins/datamodel/promela/parser/promela.ypp +++ b/src/uscxml/plugins/datamodel/promela/parser/promela.ypp @@ -27,6 +27,7 @@ using namespace uscxml; %} %pure-parser +%debug %file-prefix "promela" %parse-param { uscxml::PromelaParser* ctx } %lex-param {void * scanner} @@ -41,18 +42,25 @@ using namespace uscxml; %error-verbose +/* %type <node> expr_lst */ +%type <node> expr pfld varref decl_lst stmnt_lst vardcl ivar var_list one_decl prargs +%type <node> stmnt Stmnt const_expr nlst vis arg -%type <node> expr pfld varref decl_lst vardcl ivar var_list one_decl +%token VAR_ARRAY VARLIST DECL DECLLIST STMNT COLON EXPR NAMELIST -%token LBRACKET RBRACKET -%token <value> LEN +%token '(' ')' +%token '[' ']' +%token '{' '}' +%token ASSERT PRINT PRINTM +%token <value> LEN STRING %token TYPEDEF MTYPE INLINE RETURN LABEL OF %token GOTO BREAK ELSE SEMI ARROW %token IF FI DO OD FOR SELECT IN SEP DOTDOT %token HIDDEN SHOW ISLOCAL %token <value> CONST TYPE XU /* val */ %token <value> NAME UNAME PNAME INAME /* sym */ -%token STRING CLAIM TRACE INIT LTL /* sym */ +%token CLAIM TRACE INIT LTL /* sym */ +%token COMMA %right ASGN %left OR AND @@ -62,6 +70,7 @@ using namespace uscxml; %left LSHIFT RSHIFT %left PLUS MINUS %left TIMES DIVIDE MODULO +%left INCR DECR %left COMPL %right NEG %left DOT @@ -80,11 +89,16 @@ program : ctx->ast = $1; ctx->type = PromelaParser::PROMELA_EXPR; } + | stmnt_lst { + ctx->ast = $1; + ctx->type = PromelaParser::PROMELA_STMNT; + } + ; varref : cmpnd {} ; -pfld : NAME { $$ = ctx->value(yylval.value); } +pfld : NAME { $$ = ctx->value(NAME, yylval.value); } | NAME '[' expr ']' {} ; @@ -93,80 +107,133 @@ cmpnd : pfld {} ; sfld : /* empty */ {} - | '.' cmpnd %prec DOT {} - ; - -expr : LBRACKET expr RBRACKET { $$ = $2; } - | expr PLUS expr { $$ = ctx->binOp(PLUS, $1, $3); } - | expr MINUS expr { $$ = ctx->binOp(MINUS, $1, $3); } - | expr TIMES expr { $$ = ctx->binOp(TIMES, $1, $3); } - | expr DIVIDE expr { $$ = ctx->binOp(DIVIDE, $1, $3); } - | expr MODULO expr { $$ = ctx->binOp(MODULO, $1, $3); } - | expr BITAND expr { $$ = ctx->binOp(BITAND, $1, $3); } - | expr BITXOR expr { $$ = ctx->binOp(BITXOR, $1, $3); } - | expr BITOR expr { $$ = ctx->binOp(BITOR, $1, $3); } - | expr GT expr { $$ = ctx->binOp(GT, $1, $3); } - | expr LT expr { $$ = ctx->binOp(LT, $1, $3); } - | expr GE expr { $$ = ctx->binOp(GE, $1, $3); } - | expr LE expr { $$ = ctx->binOp(LE, $1, $3); } - | expr EQ expr { $$ = ctx->binOp(EQ, $1, $3); } - | expr NE expr { $$ = ctx->binOp(NE, $1, $3); } - | expr AND expr { $$ = ctx->binOp(AND, $1, $3); } - | expr OR expr { $$ = ctx->binOp(OR, $1, $3); } - | expr LSHIFT expr { $$ = ctx->binOp(LSHIFT, $1, $3); } - | expr RSHIFT expr { $$ = ctx->binOp(RSHIFT, $1, $3); } - | NEG expr { $$ = ctx->uniOp(NEG, $2); } - | MINUS expr %prec MINUS { $$ = ctx->uniOp(MINUS, $2); } - - | LEN '(' varref ')' { $$ = ctx->uniOp(LEN, $3); } + | DOT cmpnd %prec DOT {} + ; + +/* +expr_lst: expr { $$ = ctx->node(EXPR, 1, $1); } + | expr SEMI { $$ = ctx->node(EXPR, 1, $1); } + | expr SEMI expr_lst { $$ = ctx->node(EXPR, 2, $1, $3); } + ; +*/ + +expr : '(' expr ')' { $$ = $2; } + | expr PLUS expr { $$ = ctx->node(PLUS, 2, $1, $3); } + | expr MINUS expr { $$ = ctx->node(MINUS, 2, $1, $3); } + | expr TIMES expr { $$ = ctx->node(TIMES, 2, $1, $3); } + | expr DIVIDE expr { $$ = ctx->node(DIVIDE, 2, $1, $3); } + | expr MODULO expr { $$ = ctx->node(MODULO, 2, $1, $3); } + | expr BITAND expr { $$ = ctx->node(BITAND, 2, $1, $3); } + | expr BITXOR expr { $$ = ctx->node(BITXOR, 2, $1, $3); } + | expr BITOR expr { $$ = ctx->node(BITOR, 2, $1, $3); } + | expr GT expr { $$ = ctx->node(GT, 2, $1, $3); } + | expr LT expr { $$ = ctx->node(LT, 2, $1, $3); } + | expr GE expr { $$ = ctx->node(GE, 2, $1, $3); } + | expr LE expr { $$ = ctx->node(LE, 2, $1, $3); } + | expr EQ expr { $$ = ctx->node(EQ, 2, $1, $3); } + | expr NE expr { $$ = ctx->node(NE, 2, $1, $3); } + | expr AND expr { $$ = ctx->node(AND, 2, $1, $3); } + | expr OR expr { $$ = ctx->node(OR, 2, $1, $3); } + | expr LSHIFT expr { $$ = ctx->node(LSHIFT, 2, $1, $3); } + | expr RSHIFT expr { $$ = ctx->node(RSHIFT, 2, $1, $3); } + | NEG expr { $$ = ctx->node(NEG, 1, $2); } + | MINUS expr %prec MINUS { $$ = ctx->node(MINUS, 1, $2); } + + | LEN '(' varref ')' { $$ = ctx->node(LEN, 1, $3); } | varref { } - | CONST { $$ = ctx->value(yylval.value); } + | CONST { $$ = ctx->value(CONST, yylval.value); } + ; + + +vis : /* empty */ { $$ = ctx->node(SHOW, 0); } + | HIDDEN { $$ = ctx->node(HIDDEN, 0); } + | SHOW { $$ = ctx->node(SHOW, 0); } + | ISLOCAL { $$ = ctx->node(ISLOCAL, 0); } + ; + +one_decl: vis TYPE var_list { $$ = ctx->node(DECL, 3, $1, ctx->value(TYPE, $2), $3); } + | vis UNAME var_list { $$ = ctx->node(UNAME, 2, $1, $3); } + | vis TYPE ASGN '{' nlst '}' { $$ = ctx->node(DECL, 3, $1, ctx->value(TYPE, $2), $5); } ; +decl_lst: one_decl { $$ = $1; } + | one_decl SEMI { $$ = $1; } + | one_decl SEMI decl_lst { + $$ = ctx->node(DECLLIST, 1, $1); + if($3->type == DECLLIST) { + $$->merge($3); delete $3; + } else { + $$->push($3); + } + } + ; + +var_list: ivar { $$ = ctx->node(VARLIST, 1, $1); } + | ivar COMMA var_list { $$ = ctx->node(VARLIST, 1, $1); $$->merge($3); delete $3; } + ; + +ivar : vardcl { $$ = $1; } + | vardcl ASGN expr { $$ = ctx->node(ASGN, 2, $1, $3); } + ; -vis : /* empty */ { } - | HIDDEN { } - | SHOW { } - | ISLOCAL { } +vardcl : NAME { $$ = ctx->value(NAME, $1); } + | NAME COLON CONST { $$ = ctx->node(COLON, 2, ctx->value(NAME, $1), ctx->value(CONST, $3)); } + | NAME '[' const_expr ']' { $$ = ctx->node(VAR_ARRAY, 2, ctx->value(NAME, $1), $3); } ; -one_decl: vis TYPE var_list { $$ = ctx->uniOp(ASGN, $3); } - | vis UNAME var_list { } - | vis TYPE ASGN '{' nlst '}' { } +const_expr: CONST { $$ = ctx->value(CONST, yylval.value); } + | MINUS const_expr %prec MINUS { $$ = ctx->node(MINUS, 1, $2); } + | '(' const_expr ')' { $$ = $2; } + | const_expr PLUS const_expr { $$ = ctx->node(PLUS, 2, $1, $3); } + | const_expr MINUS const_expr { $$ = ctx->node(MINUS, 2, $1, $3); } + | const_expr TIMES const_expr { $$ = ctx->node(TIMES, 2, $1, $3); } + | const_expr DIVIDE const_expr { $$ = ctx->node(DIVIDE, 2, $1, $3); } + | const_expr MODULO const_expr { $$ = ctx->node(MODULO, 2, $1, $3); } ; -decl_lst: one_decl { } - | one_decl SEMI - decl_lst { } +nlst : NAME { $$ = ctx->value(NAME, $1); } + | nlst NAME { + if ($1->type == NAME) { + $$ = ctx->node(NAMELIST, 1, $1); + $$->push(ctx->value(NAME, $2)); + } else { + $1->push(ctx->value(NAME, $2)); + } + } + | nlst COMMA { $$ = $1; } ; -var_list: ivar { $$ = ctx->uniOp(ASGN, $1); } - | ivar ',' var_list { $$ = ctx->binOp(ASGN, $1, $3); } +stmnt_lst: stmnt { $$ = $1; } + | stmnt SEMI { $$ = $1; } + | stmnt SEMI stmnt_lst { $$ = ctx->node(STMNT, 2, $1, $3); } ; -ivar : vardcl { $$ = ctx->uniOp(ASGN, $1); } - | vardcl ASGN expr { $$ = ctx->binOp(ASGN, $1, $3); } +stmnt : Stmnt { $$ = $1; } ; -vardcl : NAME { $$ = ctx->value(yylval.value); } - | NAME ':' CONST { } - | NAME '[' const_expr ']' { } +Stmnt : varref ASGN expr { $$ = ctx->node(ASGN, 2, $1, $3); } + | varref INCR { $$ = ctx->node(INCR, 1, $1); } + | varref DECR { $$ = ctx->node(DECR, 1, $1); } + | PRINT '(' STRING prargs ')' { $$ = ctx->node(PRINT, 2, ctx->value(STRING, $3), $4); } + | PRINTM '(' varref ')' { $$ = ctx->node(PRINTM, 1, $3); } + | PRINTM '(' CONST ')' { $$ = ctx->node(PRINTM, 1, ctx->value(CONST, $3)); } + | ASSERT expr { } + | expr { $$ = $1; } + | varref ASGN INAME { } '(' args ')' Stmnt { } ; -const_expr: CONST { } - | '-' const_expr %prec MINUS { } - | '(' const_expr ')' { } - | const_expr '+' const_expr { } - | const_expr '-' const_expr { } - | const_expr '*' const_expr { } - | const_expr '/' const_expr { } - | const_expr '%' const_expr { } +args : /* empty */ { } + | arg { } ; -nlst : NAME { } - | nlst NAME { } - | nlst ',' { } +prargs : /* empty */ { $$ = ctx->value(0, ""); } + | COMMA arg { $$ = $2; } ; +arg : expr { $$ = $1; } + | expr COMMA arg { $$ = ctx->node(0, 2, $1, $3); } + ; + + %% |