changed assignment operator from := to = and equals operator from = to ==

git-svn-id: svn://anubis/fart/trunk@362 7f9b0f55-74a9-4bce-be96-3c2cd072584d

parser/parser.lex

@@ -19,9 +19,15 @@
 \*                  return TIMES;
 \/                  return DIVIDE;
 %                   return MOD;
-:=                  return ASSIGN;
-=                   return EQUALS;
+=                   return ASSIGN;
+==                  return EQUALS;
 !=                  return NOTEQUALS;
+\<                  return LESS;
+\<=                 return LESSEQ;
+\>                  return GREATER;
+\>=                 return GREATEREQ;
+&&                  return AND;
+\|\|                return OR;
 !                   return NOT;
 
 ;                   return SEMICOLON;
@@ -39,10 +45,6 @@
 \]                  return RBRACKET;
 \(                  return LPAREN;
 \)                  return RPAREN;
-\<                  return LESS;
-\<=                 return LESSEQ;
-\>                  return GREATER;
-\>=                 return GREATEREQ;
 
 [0-9]+              *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER;
 [0-9]*\.[0-9]+      *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER;

parser/parser.yy

@@ -41,6 +41,12 @@ refptr<Scope> parser_scope;
 %token ASSIGN;
 %token EQUALS;
 %token NOTEQUALS;
+%token LESS;
+%token LESSEQ;
+%token GREATER;
+%token GREATEREQ;
+%token AND
+%token OR
 %token NOT;
 
 %token SEMICOLON;
@@ -58,10 +64,6 @@ refptr<Scope> parser_scope;
 %token RBRACKET;
 %token LPAREN;
 %token RPAREN;
-%token LESS;
-%token LESSEQ;
-%token GREATER;
-%token GREATEREQ;
 
 %token REAL_NUMBER;