josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://anubis/fart/trunk@362 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2010-10-07 20:28:21 +00:00
parent 654be9058d
commit 78705024e8
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
parser/parser.lex
View File

@ -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;

10
parser/parser.yy
View File

@ -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;

4
scenes/for-test.fart
View File

@ -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
{

12
scenes/if-test.fart
View File

@ -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
}
}
}