diff options
| author | John Hodge <tpg@mutabah.net> | 2015-03-18 12:09:29 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2015-03-18 12:09:29 +0800 |
| commit | d967bbb657fce4f2bea01ba646ae28463fd27fb7 (patch) | |
| tree | 48aa0129ad1006897fddb9ddbcc3af58cc59cf42 /src/parse/lex.cpp | |
| parent | 993f20b4cd3cc4692817ded4f632efcff6d7b72f (diff) | |
| download | mrust-d967bbb657fce4f2bea01ba646ae28463fd27fb7.tar.gz | |
Array literals, op-equals parsing, super in path, blocks
Diffstat (limited to 'src/parse/lex.cpp')
| -rw-r--r-- | src/parse/lex.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/parse/lex.cpp b/src/parse/lex.cpp index a2459e14..1e5fb1cf 100644 --- a/src/parse/lex.cpp +++ b/src/parse/lex.cpp @@ -74,6 +74,7 @@ static const struct { TOKENT(";", TOK_SEMICOLON), TOKENT("<", TOK_LT), TOKENT("<<", TOK_DOUBLE_LT), + TOKENT("<<=",TOK_DOUBLE_LT_EQUAL), TOKENT("<=", TOK_LTE), TOKENT("=" , TOK_EQUAL), TOKENT("==", TOK_DOUBLE_EQUAL), @@ -81,6 +82,7 @@ static const struct { TOKENT(">", TOK_GT), TOKENT(">=", TOK_GTE), TOKENT(">>", TOK_DOUBLE_GT), + TOKENT(">>=",TOK_DOUBLE_GT_EQUAL), TOKENT("?", TOK_QMARK), TOKENT("@", TOK_AT), // A-Z :: Elsewhere @@ -88,6 +90,7 @@ static const struct { TOKENT("\\", TOK_BACKSLASH), TOKENT("]", TOK_SQUARE_CLOSE), TOKENT("^", TOK_CARET), + TOKENT("^=", TOK_CARET_EQUAL), TOKENT("`", TOK_BACKTICK), TOKENT("{", TOK_BRACE_OPEN), |