From 94978fa6a71bdb289ed6a14fa0292adaeceb5380 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 31 Oct 2005 14:18:03 +0000 Subject: [PATCH] Renamed token type TYPE to RTYPE, so that the generated define won't conflict with Dano's header. Reverted usage of Haiku headers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14595 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tools/rc/Jamfile | 1 - src/tools/rc/lexer.l | 2 +- src/tools/rc/parser.y | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tools/rc/Jamfile b/src/tools/rc/Jamfile index 951b197453..e22fd0e681 100644 --- a/src/tools/rc/Jamfile +++ b/src/tools/rc/Jamfile @@ -4,7 +4,6 @@ USES_BE_API on librdef.a rc = true ; GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ; -SubDirSysHdrs [ FDirName $(HAIKU_TOP) headers os app ] ; SubDirC++Flags -Wno-sign-compare -Wno-unused ; local r5Compatibility = [ FDirName $(SUBDIR) R5Compatibility.h ] ; diff --git a/src/tools/rc/lexer.l b/src/tools/rc/lexer.l index 0310293cfb..a17f79507e 100644 --- a/src/tools/rc/lexer.l +++ b/src/tools/rc/lexer.l @@ -89,7 +89,7 @@ resource return RESOURCE; array return ARRAY; message return MESSAGE; archive return ARCHIVE; -type return TYPE; +type return RTYPE; import return IMPORT; false yylval.b = false; return BOOL; diff --git a/src/tools/rc/parser.y b/src/tools/rc/parser.y index 7b4e6d203c..cf5cc9301a 100644 --- a/src/tools/rc/parser.y +++ b/src/tools/rc/parser.y @@ -118,7 +118,7 @@ static void add_resource(res_id_t, type_code, data_t); type_t T; } -%token ENUM RESOURCE ARCHIVE ARRAY MESSAGE TYPE IMPORT +%token ENUM RESOURCE ARCHIVE ARRAY MESSAGE RTYPE IMPORT %token BOOL %token INTEGER @@ -182,11 +182,11 @@ symboldef ; typedef - : TYPE id TYPECODE IDENT '{' typedeffields '}' ';' + : RTYPE id TYPECODE IDENT '{' typedeffields '}' ';' { add_user_type($2, $3, $4, $6); } - | TYPE id IDENT '{' typedeffields '}' ';' + | RTYPE id IDENT '{' typedeffields '}' ';' { add_user_type($2, B_RAW_TYPE, $3, $5); }