LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

improved (hopefully) string back parsing and furthermore added the constant Pi for functions.

Browse Source
This commit is contained in:
nemu
2008-02-08 07:32:55 +00:00
parent 4d9732faa1
commit b0a23afead
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/include/PFunctionGrammar.h
View File

@ -52,14 +52,15 @@ typedef parse_tree_match_t::tree_iterator iter_t;
struct PFunctionGrammar : public grammar<PFunctionGrammar>
{
static const int realID = 1;
static const int funLabelID = 2;
static const int parameterID = 3;
static const int mapID = 4;
static const int functionID = 5;
static const int factorID = 6;
static const int termID = 7;
static const int expressionID = 8;
static const int assignmentID = 9;
static const int constPiID = 2;
static const int funLabelID = 3;
static const int parameterID = 4;
static const int mapID = 5;
static const int functionID = 6;
static const int factorID = 7;
static const int termID = 8;
static const int expressionID = 9;
static const int assignmentID = 10;
template <typename ScannerT>
struct definition
@ -69,6 +70,8 @@ struct PFunctionGrammar : public grammar<PFunctionGrammar>
// Start grammar definition
real = leaf_node_d[ real_p ];
const_pi = leaf_node_d[ str_p("PI") ];
fun_label = leaf_node_d[ ( lexeme_d[ "FUN" >> +digit_p ] ) ];
parameter = leaf_node_d[ ( lexeme_d[ "PAR" >> +digit_p ] ) ];
@ -93,6 +96,7 @@ struct PFunctionGrammar : public grammar<PFunctionGrammar>
;
factor = real
| const_pi
| parameter
| map
| function
@ -114,6 +118,7 @@ struct PFunctionGrammar : public grammar<PFunctionGrammar>
// turn on the debugging info.
BOOST_SPIRIT_DEBUG_RULE(real);
BOOST_SPIRIT_DEBUG_RULE(const_pi);
BOOST_SPIRIT_DEBUG_RULE(fun_label);
BOOST_SPIRIT_DEBUG_RULE(parameter);
BOOST_SPIRIT_DEBUG_RULE(map);
@ -132,6 +137,7 @@ struct PFunctionGrammar : public grammar<PFunctionGrammar>
rule<ScannerT, parser_context<>, parser_tag<mapID> > map;
rule<ScannerT, parser_context<>, parser_tag<parameterID> > parameter;
rule<ScannerT, parser_context<>, parser_tag<funLabelID> > fun_label;
rule<ScannerT, parser_context<>, parser_tag<constPiID> > const_pi;
rule<ScannerT, parser_context<>, parser_tag<realID> > real;
rule<ScannerT, parser_context<>, parser_tag<assignmentID> > const&