Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed token type TYPE to RTYPE, so that the generated define won't conflict

Browse Source 
with Dano's <Message.h> header. Reverted usage of Haiku headers.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14595 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-10-31 14:18:03 +00:00
parent 24ecde09c8
commit 94978fa6a7
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/rc/Jamfile
View File

@ -4,7 +4,6 @@ USES_BE_API on <build>librdef.a <build>rc = true ;
GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ; GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ;
SubDirSysHdrs [ FDirName $(HAIKU_TOP) headers os app ] ;
SubDirC++Flags -Wno-sign-compare -Wno-unused ; SubDirC++Flags -Wno-sign-compare -Wno-unused ;
local r5Compatibility = [ FDirName $(SUBDIR) R5Compatibility.h ] ; local r5Compatibility = [ FDirName $(SUBDIR) R5Compatibility.h ] ;

2
src/tools/rc/lexer.l
View File

@ -89,7 +89,7 @@ resource return RESOURCE;
array return ARRAY; array return ARRAY;
message return MESSAGE; message return MESSAGE;
archive return ARCHIVE; archive return ARCHIVE;
type return TYPE; type return RTYPE;
import return IMPORT; import return IMPORT;
false yylval.b = false; return BOOL; false yylval.b = false; return BOOL;

6
src/tools/rc/parser.y
View File

@ -118,7 +118,7 @@ static void add_resource(res_id_t, type_code, data_t);
type_t T; type_t T;
} }
%token ENUM RESOURCE ARCHIVE ARRAY MESSAGE TYPE IMPORT %token ENUM RESOURCE ARCHIVE ARRAY MESSAGE RTYPE IMPORT
%token <b> BOOL %token <b> BOOL
%token <i> INTEGER %token <i> INTEGER
@ -182,11 +182,11 @@ symboldef
; ;
typedef typedef
: TYPE id TYPECODE IDENT '{' typedeffields '}' ';' : RTYPE id TYPECODE IDENT '{' typedeffields '}' ';'
{ {
add_user_type($2, $3, $4, $6); add_user_type($2, $3, $4, $6);
} }
| TYPE id IDENT '{' typedeffields '}' ';' | RTYPE id IDENT '{' typedeffields '}' ';'
{ {
add_user_type($2, B_RAW_TYPE, $3, $5); add_user_type($2, B_RAW_TYPE, $3, $5);
} }