From b6b75396dd32460300c93c9b71bddf502015c5ad Mon Sep 17 00:00:00 2001 From: "zik.saleeba" Date: Sat, 28 Feb 2009 19:30:48 +0000 Subject: [PATCH] Added all remaining operators with a view to completing expression evaluation git-svn-id: http://picoc.googlecode.com/svn/trunk@124 21eae674-98b7-11dd-bd71-f92a316d2d60 --- lex.c | 20 ++++++++++++-------- picoc.h | 14 ++++++++------ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/lex.c b/lex.c index 806c89c..a7dde94 100644 --- a/lex.c +++ b/lex.c @@ -12,6 +12,7 @@ #define NEXTIS(c,x,y) { if (NextChar == (c)) { Lexer->Pos++; GotToken = (x); } else GotToken = (y); } #define NEXTIS3(c,x,d,y,z) { if (NextChar == (c)) { Lexer->Pos++; GotToken = (x); } else NEXTIS(d,y,z) } #define NEXTIS4(c,x,d,y,e,z,a) { if (NextChar == (c)) { Lexer->Pos++; GotToken = (x); } else NEXTIS3(d,y,e,z,a) } +#define NEXTIS3PLUS(c,x,d,y,e,z,a) { if (NextChar == (c)) { Lexer->Pos++; GotToken = (x); } else if (NextChar == (d)) { if (Lexer->Pos[1] == (e)) { Lexer->Pos += 2; GotToken = (z); } else { Lexer->Pos++; GotToken = (y); } } else GotToken = (a); } #define NEXTISEXACTLY3(c,d,y,z) { if (NextChar == (c) && Lexer->Pos[1] == (d)) { Lexer->Pos += 2; GotToken = (y); } else GotToken = (z); } static union AnyValue LexAnyValue; @@ -48,6 +49,7 @@ static struct ReservedWord ReservedWords[] = { "long", TokenLongType, NULL }, { "return", TokenReturn, NULL }, { "signed", TokenSignedType, NULL }, + { "sizeof", TokenSizeof, NULL }, { "short", TokenShortType, NULL }, { "struct", TokenStructType, NULL }, { "switch", TokenSwitch, NULL }, @@ -308,22 +310,24 @@ enum LexToken LexScanGetToken(struct LexState *Lexer, struct Value **Value) case '=': NEXTIS('=', TokenEquality, TokenAssign); break; case '+': NEXTIS3('=', TokenAddAssign, '+', TokenIncrement, TokenPlus); break; case '-': NEXTIS4('=', TokenSubtractAssign, '>', TokenArrow, '-', TokenDecrement, TokenMinus); break; - case '*': GotToken = TokenAsterisk; break; - case '/': if (NextChar == '/' || NextChar == '*') LexSkipComment(Lexer, NextChar); else GotToken = TokenSlash; break; - case '<': NEXTIS('=', TokenLessEqual, TokenLessThan); break; - case '>': NEXTIS('=', TokenGreaterEqual, TokenGreaterThan); break; + case '*': NEXTIS('=', TokenMultiplyAssign, TokenAsterisk); break; + case '/': if (NextChar == '/' || NextChar == '*') LexSkipComment(Lexer, NextChar); else NEXTIS('=', TokenDivideAssign, TokenSlash); break; + case '%': NEXTIS('=', TokenModulusAssign, TokenModulus); break; + case '<': NEXTIS3PLUS('=', TokenLessEqual, '<', TokenShiftLeft, '=', TokenShiftLeftAssign, TokenLessThan); break; + case '>': NEXTIS3PLUS('=', TokenGreaterEqual, '>', TokenShiftRight, '=', TokenShiftRightAssign, TokenGreaterThan); break; case ';': GotToken = TokenSemicolon; break; - case '&': NEXTIS('&', TokenLogicalAnd, TokenAmpersand); break; - case '|': NEXTIS('|', TokenLogicalOr, TokenArithmeticOr); break; + case '&': NEXTIS3('=', TokenArithmeticAndAssign, '&', TokenLogicalAnd, TokenAmpersand); break; + case '|': NEXTIS3('=', TokenArithmeticOrAssign, '|', TokenLogicalOr, TokenArithmeticOr); break; case '{': GotToken = TokenLeftBrace; break; case '}': GotToken = TokenRightBrace; break; case '[': GotToken = TokenLeftSquareBracket; break; case ']': GotToken = TokenRightSquareBracket; break; - case '!': GotToken = TokenUnaryNot; break; - case '^': GotToken = TokenArithmeticExor; break; + case '!': NEXTIS('=', TokenNotEqual, TokenUnaryNot); break; + case '^': NEXTIS('=', TokenArithmeticExorAssign, TokenArithmeticExor); break; case '~': GotToken = TokenUnaryExor; break; case ',': GotToken = TokenComma; break; case '.': NEXTISEXACTLY3('.', '.', TokenEllipsis, TokenDot); break; + case '?': GotToken = TokenQuestionMark; break; case ':': GotToken = TokenColon; break; default: LexFail(Lexer, "illegal character '%c'", ThisChar); break; } diff --git a/picoc.h b/picoc.h index 5583966..4ea2bb6 100644 --- a/picoc.h +++ b/picoc.h @@ -33,15 +33,17 @@ enum LexToken TokenNone, TokenEOF, TokenEndOfLine, TokenIdentifier, TokenIntegerConstant, TokenFPConstant, TokenStringConstant, TokenCharacterConstant, TokenOpenBracket, TokenCloseBracket, - TokenAssign, TokenPlus, TokenMinus, TokenAsterisk, TokenSlash, - TokenEquality, TokenLessThan, TokenGreaterThan, TokenLessEqual, TokenGreaterEqual, - TokenSemicolon, TokenComma, TokenDot, TokenColon, TokenEllipsis, - TokenArrow, TokenAmpersand, + TokenAssign, TokenPlus, TokenMinus, TokenAsterisk, TokenSlash, TokenModulus, + TokenEquality, TokenNotEqual, TokenLessThan, TokenGreaterThan, TokenLessEqual, TokenGreaterEqual, + TokenSemicolon, TokenComma, TokenDot, TokenQuestionMark, TokenColon, TokenEllipsis, + TokenArrow, TokenAmpersand, TokenLeftBrace, TokenRightBrace, TokenLeftSquareBracket, TokenRightSquareBracket, TokenLogicalAnd, TokenLogicalOr, TokenArithmeticOr, TokenArithmeticExor, TokenUnaryExor, TokenUnaryNot, - TokenAddAssign, TokenSubtractAssign, - TokenIncrement, TokenDecrement, + TokenAddAssign, TokenSubtractAssign, TokenMultiplyAssign, TokenDivideAssign, TokenModulusAssign, + TokenShiftLeft, TokenShiftRight, + TokenShiftLeftAssign, TokenShiftRightAssign, TokenArithmeticAndAssign, TokenArithmeticOrAssign, TokenArithmeticExorAssign, + TokenIncrement, TokenDecrement, TokenSizeof, TokenIntType, TokenCharType, TokenFloatType, TokenDoubleType, TokenVoidType, TokenEnumType, TokenLongType, TokenSignedType, TokenShortType, TokenStructType, TokenUnionType, TokenUnsignedType, TokenTypedef, TokenContinue, TokenDo, TokenElse, TokenFor, TokenIf, TokenWhile, TokenBreak, TokenSwitch, TokenCase, TokenDefault, TokenReturn,