made parsed_scene_node static to parser, parse() returns refptr<Node> now
git-svn-id: svn://anubis/fart/trunk@124 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
1 parent
f3e522262b
commit
b0014e34d1
2 files changed
+5
-7
No files matched your search
+1
-3
@@ -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
|
||||||
+4
-4
@@ -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;
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user