root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiunti metodi parse_user_func e string

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@3447 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1996-08-26 15:42:18 +00:00
parent 607e672174
commit 38f03725d7
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/expr.cpp
View File

@ -194,10 +194,10 @@ TExpression::operator const char*()
void TExpression::print_on(ostream& out) const void TExpression::print_on(ostream& out) const
{ out << _original; } { out << _original; }
void TExpression::evaluate_user_func(const char * name, int nparms, TStack & stack, TTypeexp type) const void TExpression::evaluate_user_func(int index, int nparms, TStack & stack, TTypeexp type) const
{ {
NFCHECK("Unknown function : %s ", name); CHECKD(FALSE, "Unknown function ", index);
for ( int i = nparms ; i > 0; i--) for ( int i = nparms ; i > 0; i--)
stack.pop(); stack.pop();
stack.push(ZERO); stack.push(ZERO);
@ -445,8 +445,9 @@ void TExpression::eval()
case _userfunc: case _userfunc:
{ {
const int nparms = (int) ((real &) evalstack.pop()).integer(); const int nparms = (int) ((real &) evalstack.pop()).integer();
const int index = atoi(instr.string());
evaluate_user_func(instr.string(), nparms, evalstack, type); evaluate_user_func(index, nparms, evalstack, type);
} }
break; break;
case _sqrt: case _sqrt:
@ -867,9 +868,19 @@ TCodesym TExpression::__factor(TCodesym startsym)
if (sym == _rpar) if (sym == _rpar)
{ {
_code.add(_number, real(nparms)); _code.add(_number, real(nparms));
_code.add(startsym, val); const int index = parse_user_func((const char *) val.string(), nparms);
_user_func_defined = TRUE; if (index < 0)
sym = __gettoken(TRUE); {
strcpy(_tok, (const char *) val.string());
sym = _invalid;
}
else
{
val.set(format("%d", index));
_code.add(startsym, val);
_user_func_defined = TRUE;
sym = __gettoken(TRUE);
}
} }
} }
} }

5
include/expr.h
View File

@ -416,7 +416,8 @@ protected:
protected: // TObject protected: // TObject
// @cmember Stampa l'espressione su <p out> (serve per implementare l'insertore) // @cmember Stampa l'espressione su <p out> (serve per implementare l'insertore)
virtual void print_on(ostream& out) const ; virtual void print_on(ostream& out) const ;
virtual void evaluate_user_func(const char * name, int nparms, TStack & stack, TTypeexp type) const ; virtual void evaluate_user_func(int index, int nparms, TStack & stack, TTypeexp type) const;
virtual int parse_user_func(const char * name, int nparms) const { return -1; }
// @access Public Member // @access Public Member
public: public:
@ -458,6 +459,8 @@ public:
// @cmember Setta l'espressione e la compila (ritorna il risultato della compilazione) // @cmember Setta l'espressione e la compila (ritorna il risultato della compilazione)
bool set(const char* expression, TTypeexp type = _numexpr); bool set(const char* expression, TTypeexp type = _numexpr);
const char* last_compiled_token() const; const char* last_compiled_token() const;
// @cmember Ritorna l'espressione originale
const char * string() const { return _original; }
// @cmember Costruttore (assegna l'estressione e il suo tipo) // @cmember Costruttore (assegna l'estressione e il suo tipo)
TExpression(const char* expression, TTypeexp type = _numexpr); TExpression(const char* expression, TTypeexp type = _numexpr);