From 78705024e88f6e820295d65d2c2d8f94160512d2 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Thu, 7 Oct 2010 20:28:21 +0000
Subject: [PATCH] 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    | 14 ++++++++------
 parser/parser.yy     | 10 ++++++----
 scenes/for-test.fart |  4 ++--
 scenes/if-test.fart  | 12 ++++++------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/parser/parser.lex b/parser/parser.lex
index 64a2ac1..19bdc5d 100644
--- a/parser/parser.lex
+++ b/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;
diff --git a/parser/parser.yy b/parser/parser.yy
index b4664f1..e128fef 100644
--- a/parser/parser.yy
+++ b/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;
 
diff --git a/scenes/for-test.fart b/scenes/for-test.fart
index f5f127f..fdef550 100644
--- a/scenes/for-test.fart
+++ b/scenes/for-test.fart
@@ -26,9 +26,9 @@ scene
         }
     }
 
-    for (local $x := -200; $x <= 200; $x := $x + 40)
+    for (local $x = -200; $x <= 200; $x = $x + 40)
     {
-        for (local $y := 0; $y <= 4000; $y := $y + 40)
+        for (local $y = 0; $y <= 4000; $y = $y + 40)
         {
             sphere
             {
diff --git a/scenes/if-test.fart b/scenes/if-test.fart
index 400a4eb..27ac040 100644
--- a/scenes/if-test.fart
+++ b/scenes/if-test.fart
@@ -25,20 +25,20 @@ scene
         }
     }
 
-    local $m := 0
-    for (local $x := -100; $x <= 100; $x := $x + 40)
+    local $m = 0
+    for (local $x = -100; $x <= 100; $x = $x + 40)
     {
-        for (local $y := -100; $y <= 100; $y := $y + 40)
+        for (local $y = -100; $y <= 100; $y = $y + 40)
         {
             sphere
             {
                 radius 10
                 translate <$x, $y, 10>
-                if ($m % 3 = 0)
+                if ($m % 3 == 0)
                 {
                     material mat
                 }
-                elsif ($m % 3 = 1)
+                elsif ($m % 3 == 1)
                 {
                     material mat2
                 }
@@ -51,7 +51,7 @@ scene
                     }
                 }
             }
-            $m := $m + 1
+            $m = $m + 1
         }
     }
 }