qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

that seems to have got the type parsing right. (void []) () foo will work

Browse source 
and .float () foo works too
This commit is contained in:
Bill Currie 2002-05-22 17:13:52 +00:00
parent ddcaef5b0b
commit 5b590c9301
1 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
tools/qfcc/source/qc-parse.y
View file

@ -120,7 +120,7 @@ void free_local_inits (hashtab_t *def_list);
%token CLASS DEFS ENCODE END IMPLEMENTATION INTERFACE PRIVATE PROTECTED %token CLASS DEFS ENCODE END IMPLEMENTATION INTERFACE PRIVATE PROTECTED
%token PROTOCOL PUBLIC SELECTOR %token PROTOCOL PUBLIC SELECTOR
%type <type> type type_name %type <type> type non_field_type type_name
%type <param> function_decl %type <param> function_decl
%type <integer_val> array_decl %type <integer_val> array_decl
%type <param> param param_list %type <param> param param_list
@ -245,14 +245,21 @@ enum
type type
: '.' type { $$ = build_type (1, $2); } : '.' type { $$ = build_type (1, $2); }
| type array_decl { $$ = build_type (0, build_array_type ($1, $2)); } | non_field_type { $$ = $1; }
| type_name function_decl | non_field_type function_decl
{ {
current_params = $2; current_params = $2;
$$ = build_type (0, parse_params ($1, $2)); $$ = build_type (0, parse_params ($1, $2));
} }
| type_name { $$ = build_type (0, $1); } | non_field_type array_decl
| '(' type ')' { $$ = $2; } {
$$ = build_type (0, build_array_type ($1, $2));
}
;
non_field_type
: '(' type ')' { $$ = $2; }
| type_name { $$ = $1; }
; ;
type_name type_name
@ -903,6 +910,7 @@ new_class_name
error (0, "redefinition of `%s'", $1); error (0, "redefinition of `%s'", $1);
$$ = get_class (0, 1); $$ = get_class (0, 1);
} }
current_class = $$;
} }
class_with_super class_with_super
@ -920,6 +928,7 @@ new_class_with_super
{ {
$1->super_class = $3; $1->super_class = $3;
$$ = $1; $$ = $1;
current_class = $$;
} }
; ;
@ -942,6 +951,7 @@ new_category_name
error (0, "redefinition of category `%s (%s)'", $1, $3); error (0, "redefinition of category `%s (%s)'", $1, $3);
$$ = get_category (0, 0, 1); $$ = get_category (0, 0, 1);
} }
current_class = $$;
} }
; ;
@ -958,27 +968,27 @@ protocol_name
} }
classdef classdef
: INTERFACE new_class_name { current_class = $2; } : INTERFACE new_class_name
protocolrefs { class_add_protocol_methods ($2, $4);} protocolrefs { class_add_protocol_methods ($2, $3);}
'{' ivar_decl_list '}' { class_add_ivars ($2, $7); } '{' ivar_decl_list '}' { class_add_ivars ($2, $6); }
methodprotolist { class_add_methods ($2, $10); } methodprotolist { class_add_methods ($2, $9); }
END { current_class = 0; } END { current_class = 0; }
| INTERFACE new_class_name { current_class = $2; } | INTERFACE new_class_name
protocolrefs { class_add_protocol_methods ($2, $4);} protocolrefs { class_add_protocol_methods ($2, $3);}
methodprotolist { class_add_methods ($2, $6); } methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; } END { current_class = 0; }
| INTERFACE new_class_with_super { current_class = $2; } | INTERFACE new_class_with_super
protocolrefs { class_add_protocol_methods ($2, $4);} protocolrefs { class_add_protocol_methods ($2, $3);}
'{' ivar_decl_list '}' { class_add_ivars ($2, $7); } '{' ivar_decl_list '}' { class_add_ivars ($2, $6); }
methodprotolist { class_add_methods ($2, $10); } methodprotolist { class_add_methods ($2, $9); }
END { current_class = 0; } END { current_class = 0; }
| INTERFACE new_class_with_super { current_class = $2; } | INTERFACE new_class_with_super
protocolrefs { class_add_protocol_methods ($2, $4);} protocolrefs { class_add_protocol_methods ($2, $3);}
methodprotolist { class_add_methods ($2, $6); } methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; } END { current_class = 0; }
| INTERFACE new_category_name { current_class = $2; } | INTERFACE new_category_name
protocolrefs { class_add_protocol_methods ($2, $4);} protocolrefs { class_add_protocol_methods ($2, $3);}
methodprotolist { class_add_methods ($2, $6); } methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; } END { current_class = 0; }
| IMPLEMENTATION class_name { class_begin ($2); } | IMPLEMENTATION class_name { class_begin ($2); }
'{' ivar_decl_list '}' { class_check_ivars ($2, $5); } '{' ivar_decl_list '}' { class_check_ivars ($2, $5); }