alien.parser, alien.syntax: send ENUM: body to parse-enum

db4
Joe Groff 2010-04-12 21:58:08 -07:00 committed by Erik Charlebois
parent f394cb4fdc
commit 6e55a3b8f5
2 changed files with 16 additions and 13 deletions

View File

@ -78,14 +78,6 @@ M: pointer return-type-name to>> return-type-name CHAR: * suffix ;
: next-enum-member ( members name value -- members value' )
[ 2array suffix! ] [ 1 + ] bi ;
PRIVATE>
: define-enum-member ( name value -- )
[ create-in ] [ define-constant ] bi* ;
: define-enum-members ( members -- )
[ first2 define-enum-member ] each ;
: parse-enum-member ( members name value -- members value' )
over "{" =
[ 2drop scan scan-object next-enum-member "}" expect ]
@ -95,8 +87,22 @@ PRIVATE>
scan dup ";" = not
[ swap parse-enum-member parse-enum-members ] [ 2drop ] if ;
: define-enum-member ( name value -- )
[ create-in ] [ define-constant ] bi* ;
: define-enum-members ( members -- )
[ first2 define-enum-member ] each ;
PRIVATE>
: parse-enum ( -- name members )
scan dup "f" =
[ drop f ]
[ (CREATE-C-TYPE) dup save-location ] if
V{ } clone 0 parse-enum-members ;
: define-enum ( word members -- )
[ [ int swap typedef ] when ] [ define-enum-members ] bi* ;
[ [ int swap typedef ] when* ] [ define-enum-members ] bi* ;
: scan-function-name ( -- return function )
scan-c-type scan parse-pointers ;

View File

@ -29,10 +29,7 @@ SYNTAX: TYPEDEF:
scan-c-type CREATE-C-TYPE dup save-location typedef ;
SYNTAX: ENUM:
scan dup "f" =
[ drop f ]
[ (CREATE-C-TYPE) dup save-location ] if
V{ } clone 0 parse-enum-members define-enum ;
parse-enum define-enum ;
SYNTAX: C-TYPE:
void CREATE-C-TYPE typedef ;