michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing tokens

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-08-13 03:52:08 -07:00
parent 2ea7479ee9
commit b308355426
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/frontend/scanner.cpp
View file

@ -16,8 +16,10 @@ static name g_pi_unicode("\u03A0");
static name g_arrow_unicode("\u2192"); static name g_arrow_unicode("\u2192");
static char g_normalized[255]; static char g_normalized[255];
static name g_lambda_name("fun"); static name g_lambda_name("fun");
static name g_type_name("Type");
static name g_pi_name("pi"); static name g_pi_name("pi");
static name g_arrow_name("->"); static name g_arrow_name("->");
static name g_eq_name("=");
class init_normalized_table { class init_normalized_table {
public: public:
@ -155,6 +157,8 @@ scanner::token scanner::read_a_symbol() {
return token::Lambda; return token::Lambda;
else if (m_name_val == g_pi_name) else if (m_name_val == g_pi_name)
return token::Pi; return token::Pi;
else if (m_name_val == g_type_name)
return token::Type;
else else
return is_command(m_name_val) ? token::CommandId : token::Id; return is_command(m_name_val) ? token::CommandId : token::Id;
} }
@ -174,6 +178,8 @@ scanner::token scanner::read_b_symbol() {
m_name_val = name(m_buffer.c_str()); m_name_val = name(m_buffer.c_str());
if (m_name_val == g_arrow_name) if (m_name_val == g_arrow_name)
return token::Arrow; return token::Arrow;
else if (m_name_val == g_eq_name)
return token::Eq;
else else
return token::Id; return token::Id;
} }
@ -238,7 +244,13 @@ scanner::token scanner::scan() {
switch (normalize(c)) { switch (normalize(c)) {
case ' ': next(); break; case ' ': next(); break;
case '\n': next(); new_line(); break; case '\n': next(); new_line(); break;
case ':': next(); return token::Colon; case ':': next();
if (curr() == '=') {
next();
return token::Assign;
} else {
return token::Colon;
}
case ',': next(); return token::Comma; case ',': next(); return token::Comma;
case '.': next(); return token::Period; case '.': next(); return token::Period;
case '(': case '(':
@ -279,6 +291,7 @@ std::ostream & operator<<(std::ostream & out, scanner::token const & t) {
case scanner::token::Decimal: out << "Dec"; break; case scanner::token::Decimal: out << "Dec"; break;
case scanner::token::Eq: out << "="; break; case scanner::token::Eq: out << "="; break;
case scanner::token::Assign: out << ":="; break; case scanner::token::Assign: out << ":="; break;
case scanner::token::Type: out << "Type"; break;
case scanner::token::Eof: out << "EOF"; break; case scanner::token::Eof: out << "EOF"; break;
} }
return out; return out;

2
src/frontend/scanner.h
View file

@ -18,7 +18,7 @@ class scanner {
public: public:
enum class token { enum class token {
LeftParen, RightParen, LeftCurlyBracket, RightCurlyBracket, Colon, Comma, Period, Lambda, Pi, Arrow, LeftParen, RightParen, LeftCurlyBracket, RightCurlyBracket, Colon, Comma, Period, Lambda, Pi, Arrow,
Id, CommandId, Int, Decimal, Eq, Assign, Eof Id, CommandId, Int, Decimal, Eq, Assign, Type, Eof
}; };
protected: protected:
int m_spos; // position in the current line of the stream int m_spos; // position in the current line of the stream