From b0014e34d18d519447a373ed5aa5cf1cc16f4959 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 17 Feb 2009 23:31:19 +0000 Subject: [PATCH] made parsed_scene_node static to parser, parse() returns refptr now git-svn-id: svn://anubis/fart/trunk@124 7f9b0f55-74a9-4bce-be96-3c2cd072584d --- parser/parser.h | 4 +--- parser/parser.yy | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/parser/parser.h b/parser/parser.h index cab34eb..158c90c 100644 --- a/parser/parser.h +++ b/parser/parser.h @@ -7,8 +7,6 @@ #define YYSTYPE refptr -extern YYSTYPE parsed_scene_node; - -int parse(const char * fileName); +refptr parse(const char * fileName); #endif diff --git a/parser/parser.yy b/parser/parser.yy index 6789493..8a6f9ec 100644 --- a/parser/parser.yy +++ b/parser/parser.yy @@ -23,7 +23,7 @@ int yywrap() return 1; } -refptr parsed_scene_node; +static refptr parsed_scene_node; %} @@ -387,14 +387,14 @@ vector: LESS number COMMA number COMMA number GREATER { %% -int parse(const char * fileName) +refptr parse(const char * fileName) { yyin = fopen(fileName, "r"); if (yyin == NULL) { cerr << "Failed to open file '" << fileName << "'" << endl; - return -1; + return refptr(NULL); } yyparse(); - return 0; + return parsed_scene_node; }