Renamed token type TYPE to RTYPE, so that the generated define won't conflict
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:
parent
24ecde09c8
commit
94978fa6a7
@ -4,7 +4,6 @@ USES_BE_API on <build>librdef.a <build>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 ] ;
|
||||
|
@ -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;
|
||||
|
@ -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 <b> BOOL
|
||||
%token <i> 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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user