CDPP / AMDA_Kernel

Commit e2fdaa2f75dbd0dd21a1944dee688da2ac550249

Authored by Benjamin Renard
1 parent 45674658
Exists in SpeasyGet

Support speasy remote parameters in expression parser

Showing 1 changed file with 5 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/expressionParser/ParserGrammar.hh
  Diff comments   View file @e2fdaa2
... ... @@ -60,9 +60,9 @@ public:
60 60 // UNARY OPERATIONS
61 61  
62 62 const_ = (definedConstants) [_val = boost::phoenix::construct<ConstantOperation>(_1)] | param_[_val = _1];
63   - param_= ((localParams_ | derivedParam_ | uploadedParam_ | impexParam_ | themisParam_ | cdaWebParam_ | templatedParam_) >>('(' >> componentValue_ >> componentSeparator_ >> componentValue_ >>')'))[_val=boost::phoenix::construct<ParameterDef>(_1,_2,_3)] ||
64   - ((localParams_ | derivedParam_ | uploadedParam_ | impexParam_ | themisParam_ | cdaWebParam_ | templatedParam_) >>('(' >> componentValue_ >> ')'))[_val=boost::phoenix::construct<ParameterDef>(_1,_2)] ||
65   - ((localParams_ | derivedParam_ | uploadedParam_ | impexParam_ | themisParam_ | cdaWebParam_ | templatedParam_ |
  63 + param_= ((localParams_ | derivedParam_ | uploadedParam_ | impexParam_ | themisParam_ | cdaWebParam_ | speasyParam_ | templatedParam_) >>('(' >> componentValue_ >> componentSeparator_ >> componentValue_ >>')'))[_val=boost::phoenix::construct<ParameterDef>(_1,_2,_3)] ||
  64 + ((localParams_ | derivedParam_ | uploadedParam_ | impexParam_ | themisParam_ | cdaWebParam_ | speasyParam_ | templatedParam_) >>('(' >> componentValue_ >> ')'))[_val=boost::phoenix::construct<ParameterDef>(_1,_2)] ||
  65 + ((localParams_ | derivedParam_ | uploadedParam_ | impexParam_ | themisParam_ | cdaWebParam_ | speasyParam_ | templatedParam_ |
66 66 timeTableParam_ | catalogParam_ | sharedtimeTableParam_ | sharedcatalogParam_))[_val=boost::phoenix::construct<ParameterDef>(_1)] | simple[_val = _1];
67 67  
68 68 funArgs_=((expr_ |var_ | definedArgsListValues) |functions_);
... ... @@ -77,6 +77,7 @@ public:
77 77 impexParam_ = (qi::string("spase___IMPEX_") >> +(qi::alnum | qi::char_('_')));
78 78 themisParam_ = (qi::string("th") >> qi::char_('a','e') >> qi::char_('_') >> +(qi::alnum | qi::char_('_')));
79 79 cdaWebParam_ = (qi::string("cdaweb_") >> +(qi::alnum | qi::char_('_')));
  80 + speasyParam_ = (qi::string("SPEASY_") >> +(qi::alnum | qi::char_('_')));
80 81 timeTableParam_ = (qi::string("tt_") >> +(qi::alnum | qi::char_('_')));
81 82 catalogParam_ = (qi::string("cat_") >> +(qi::alnum | qi::char_('_')));
82 83 sharedtimeTableParam_ = (qi::string("sharedtimeTable_") >> +(qi::alnum | qi::char_('_')));
... ... @@ -157,7 +158,7 @@ public:
157 158  
158 159 private:
159 160 qi::rule<It, Expression::var(), Skipper> var_, componentValue_, indexValue_, derivedParam_, uploadedParam_, impexParam_, themisParam_,
160   - cdaWebParam_, templatedParam_, timeTableParam_, catalogParam_, sharedtimeTableParam_, sharedcatalogParam_;
  161 + cdaWebParam_, speasyParam_, templatedParam_, timeTableParam_, catalogParam_, sharedtimeTableParam_, sharedcatalogParam_;
161 162 qi::rule<It, Expression::ExpressionContainer(), Skipper> not_
162 163 , pow_
163 164 , powerTen_
... ...