develop #19

Merged
cromer merged 6 commits from develop into master 2023-02-28 22:17:52 -03:00
2 changed files with 13 additions and 7 deletions
Showing only changes of commit f2108492b8 - Show all commits

View File

@ -56,10 +56,10 @@ int obelisk::Lexer::getToken()
if (getIdentifier() == "extern")
{
return kTokenExtern;
return Token::kTokenExtern;
}
return kTokenIdentifier;
return Token::kTokenIdentifier;
}
if (isdigit(lastChar))

View File

@ -80,23 +80,27 @@ namespace obelisk
* @brief A fact which is a relationship between 2 entities.
*
*/
kTokenFact = -2,
kTokenFact = -2,
/**
* @brief A rule which is a relationship between a new fact a
* existing fact.
*
*/
kTokenRule = -3,
kTokenRule = -3,
/**
* @brief An action to take if a fact is true.
*
*/
kTokenAction = -4,
/**
* @brief A definition of a new function.
*
*/
kTokenDef = -5,
kTokenDef = -5,
/**
* @brief An external function that will be linked to.
*
@ -108,16 +112,18 @@ namespace obelisk
*
*/
kTokenIdentifier = -7,
/**
* @brief A double floating point value.
*
*/
kTokenNumber = -8,
kTokenNumber = -8,
/**
* @brief A string.
*
*/
kTokenString = -9
kTokenString = -9
};
/**