Skip to content

Commit

Permalink
table: replaced internal function type use with function flag
Browse files Browse the repository at this point in the history 
added new function table flag
changed to use function flag instead
added function flag to all function entries
- the type initializer was changed to the default type
added is function table entry and token pass-thru access functions
updated function type checks in tester and translator classes
  • Loading branch information
@thunder422
thunder422 committed Jan 18, 2015
1 parent e064047 commit eaa6e6d
Show file tree
Hide file tree
Showing 5 changed files with 136 additions and 122 deletions.
156 changes: 78 additions & 78 deletions table.cpp
View file
Expand Up @@ -330,9 +330,9 @@ static TableEntry tableEntries[] =
// Internal Functions (No Parentheses)
//-----------------------------------------
{ // Rnd_Code
Type::IntFunc,
Type{},
"RND", "", "",
TableFlag{}, 2, &Dbl_None_ExprInfo,
Function_Flag, 2, &Dbl_None_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
//--------------------
Expand Down Expand Up @@ -384,190 +384,190 @@ static TableEntry tableEntries[] =
// INTERNAL FUNCTIONS (Parentheses)
//--------------------------------------
{ // Abs_Code
Type::IntFunc,
Type{},
"ABS(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Fix_Code
Type::IntFunc,
Type{},
"FIX(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Frac_Code
Type::IntFunc,
Type{},
"FRAC(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Int_Code
Type::IntFunc,
Type{},
"INT(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate

},
{ // RndArg_Code
Type::IntFunc,
Type{},
"RND(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Sgn_Code
Type::IntFunc,
Type{},
"SGN(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Cint_Code
Type::IntFunc,
Type{},
"CINT(", "", "",
TableFlag{}, 2, &Int_Dbl_ExprInfo,
Function_Flag, 2, &Int_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Cdbl_Code
Type::IntFunc,
Type{},
"CDBL(", "", "",
TableFlag{}, 2, &Dbl_Int_ExprInfo,
Function_Flag, 2, &Dbl_Int_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Sqr_Code
Type::IntFunc,
Type{},
"SQR(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Atn_Code
Type::IntFunc,
Type{},
"ATN(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Cos_Code
Type::IntFunc,
Type{},
"COS(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Sin_Code
Type::IntFunc,
Type{},
"SIN(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Tan_Code
Type::IntFunc,
Type{},
"TAN(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Exp_Code
Type::IntFunc,
Type{},
"EXP(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Log_Code
Type::IntFunc,
Type{},
"LOG(", "", "",
TableFlag{}, 2, &Dbl_Dbl_ExprInfo,
Function_Flag, 2, &Dbl_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Tab_Code
Type::IntFunc,
Type{},
"TAB(", "", "",
Print_Flag, 2, &None_Int_ExprInfo,
Function_Flag | Print_Flag, 2, &None_Int_ExprInfo,
NULL, NULL, NULL, NULL, printFunctionRecreate
},
{ // Spc_Code
Type::IntFunc,
Type{},
"SPC(", "", "",
Print_Flag, 2, &None_Int_ExprInfo,
Function_Flag | Print_Flag, 2, &None_Int_ExprInfo,
NULL, NULL, NULL, NULL, printFunctionRecreate
},
{ // Asc_Code
Type::IntFunc,
Type{},
"ASC(", "", "",
TableFlag{}, 2, &Int_Str_ExprInfo,
Function_Flag, 2, &Int_Str_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Asc2_Code
Type::IntFunc,
Type{},
"ASC(", "2", "",
TableFlag{}, 2, &Int_StrInt_ExprInfo,
Function_Flag, 2, &Int_StrInt_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Chr_Code
Type::IntFunc,
Type{},
"CHR$(", "", "",
TableFlag{}, 2, &Str_Int_ExprInfo,
Function_Flag, 2, &Str_Int_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Instr2_Code
Type::IntFunc,
Type{},
"INSTR(", "2", "",
TableFlag{}, 2, &Int_StrStr_ExprInfo,
Function_Flag, 2, &Int_StrStr_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Instr3_Code
Type::IntFunc,
Type{},
"INSTR(", "3", "",
TableFlag{}, 2, &Int_StrStrInt_ExprInfo,
Function_Flag, 2, &Int_StrStrInt_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Left_Code
Type::IntFunc,
Type{},
"LEFT$(", "", "",
SubStr_Flag, 2, &Str_StrInt_ExprInfo,
Function_Flag | SubStr_Flag, 2, &Str_StrInt_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Len_Code
Type::IntFunc,
Type{},
"LEN(", "", "",
TableFlag{}, 2, &Int_Str_ExprInfo,
Function_Flag, 2, &Int_Str_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Mid2_Code
Type::IntFunc,
Type{},
"MID$(", "2", "",
SubStr_Flag, 2, &Str_StrInt_ExprInfo,
Function_Flag | SubStr_Flag, 2, &Str_StrInt_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Mid3_Code
Type::IntFunc,
Type{},
"MID$(", "3", "",
SubStr_Flag, 2, &Str_StrIntInt_ExprInfo,
Function_Flag | SubStr_Flag, 2, &Str_StrIntInt_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Repeat_Code
Type::IntFunc,
Type{},
"REPEAT$(", "", "",
TableFlag{}, 2, &Str_StrInt_ExprInfo,
Function_Flag, 2, &Str_StrInt_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Right_Code
Type::IntFunc,
Type{},
"RIGHT$(", "", "",
SubStr_Flag, 2, &Str_StrInt_ExprInfo,
Function_Flag | SubStr_Flag, 2, &Str_StrInt_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Space_Code
Type::IntFunc,
Type{},
"SPACE$(", "", "",
TableFlag{}, 2, &Str_Int_ExprInfo,
Function_Flag, 2, &Str_Int_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Str_Code
Type::IntFunc,
Type{},
"STR$(", "", "",
TableFlag{}, 2, &Str_Dbl_ExprInfo,
Function_Flag, 2, &Str_Dbl_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // Val_Code
Type::IntFunc,
Type{},
"VAL(", "", "",
TableFlag{}, 2, &Dbl_Str_ExprInfo,
Function_Flag, 2, &Dbl_Str_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
//----------------------
Expand Down Expand Up @@ -1053,39 +1053,39 @@ static TableEntry tableEntries[] =
NULL, NULL, NULL, NULL, binaryOperatorRecreate
},
{ // AbsInt_Code
Type::IntFunc,
Type{},
"ABS(", "%", "",
TableFlag{}, 2, &Int_Int_ExprInfo,
Function_Flag, 2, &Int_Int_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // RndArgInt_Code
Type::IntFunc,
Type{},
"RND(", "%", "",
TableFlag{}, 2, &Int_Int_ExprInfo,
Function_Flag, 2, &Int_Int_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // SgnInt_Code
Type::IntFunc,
Type{},
"SGN(", "%", "",
TableFlag{}, 2, &Int_Int_ExprInfo,
Function_Flag, 2, &Int_Int_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // CvtInt_Code
Type::IntFunc,
Type{},
"", "CvtInt", "",
Hidden_Flag, 2, &Null_ExprInfo,
Function_Flag | Hidden_Flag, 2, &Null_ExprInfo,
NULL, NULL, NULL, NULL, blankRecreate
},
{ // CvtDbl_Code
Type::IntFunc,
Type{},
"", "CvtDbl", "",
Hidden_Flag, 2, &Null_ExprInfo,
Function_Flag | Hidden_Flag, 2, &Null_ExprInfo,
NULL, NULL, NULL, NULL, blankRecreate
},
{ // StrInt_Code
Type::IntFunc,
Type{},
"STR$(", "%", "",
TableFlag{}, 2, &Str_Int_ExprInfo,
Function_Flag, 2, &Str_Int_ExprInfo,
NULL, NULL, NULL, NULL, internalFunctionRecreate
},
{ // PrintDbl_Code
Expand Down Expand Up @@ -1388,7 +1388,7 @@ void Table::add(TableEntry &entry)
iterator->second = &entry;
s_alternate[&entry][alternate->m_exprInfo->m_operandCount - 1]
.push_back(alternate);
if (entry.m_type == Type::IntFunc)
if (entry.isFunction())
{
// multiple codes; set multiple flag on primary code
entry.m_flags |= Multiple_Flag;
Expand Down Expand Up @@ -1469,7 +1469,7 @@ void Table::add(TableEntry &entry)
break; // no more operands, all operands match
}
}
if (entry.m_type == Type::IntFunc && exprInfo->m_operandCount
if (entry.isFunction() && exprInfo->m_operandCount
> primary->m_exprInfo->m_operandCount)
{
// multiple codes; set multiple flag on primary code
Expand Down
8 changes: 6 additions & 2 deletions table.h
View file
Expand Up @@ -38,8 +38,7 @@ using TokenPtr = std::shared_ptr<Token>;
// TODO temporary until code type enumeration implemented
enum class Type
{
IntFunc = 1,
Constant,
Constant = 1,
DefFunc,
DefFuncNoArgs,
NoParen,
Expand All @@ -61,6 +60,7 @@ enum TableFlag : unsigned
Two_Flag = 1u << 7, // code can have two words or characters
Command_Flag = 1u << 8, // code is a command
Operator_Flag = 1u << 9, // code is an operator
Function_Flag = 1u << 10, // code is a BASIC function
EndStmt_Flag = 1u << 31 // end statement
};

Expand Down Expand Up @@ -158,6 +158,10 @@ class TableEntry
return hasFlag(Command_Flag) && !hasFlag(Reference_Flag)
&& !isOperator();
}
bool isFunction() const
{
return hasFlag(Function_Flag);
}
int precedence() const
{
return m_precedence;
Expand Down

0 comments on commit eaa6e6d

Please sign in to comment.