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

made parsed_scene_node static to parser, parse() returns refptr<Node> now

Browse Source 
git-svn-id: svn://anubis/fart/trunk@124 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-02-17 23:31:19 +00:00
parent f3e522262b
commit b0014e34d1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser/parser.h
View File

@ -7,8 +7,6 @@
#define YYSTYPE refptr<Node> #define YYSTYPE refptr<Node>
extern YYSTYPE parsed_scene_node; refptr<Node> parse(const char * fileName);
int parse(const char * fileName);
#endif #endif

8
parser/parser.yy
View File

@ -23,7 +23,7 @@ int yywrap()
return 1; return 1;
} }
refptr<Node> parsed_scene_node; static refptr<Node> parsed_scene_node;
%} %}
@ -387,14 +387,14 @@ vector: LESS number COMMA number COMMA number GREATER {
%% %%
int parse(const char * fileName) refptr<Node> parse(const char * fileName)
{ {
yyin = fopen(fileName, "r"); yyin = fopen(fileName, "r");
if (yyin == NULL) if (yyin == NULL)
{ {
cerr << "Failed to open file '" << fileName << "'" << endl; cerr << "Failed to open file '" << fileName << "'" << endl;
return -1; return refptr<Node>(NULL);
} }
yyparse(); yyparse();
return 0; return parsed_scene_node;
} }