mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
update from main archive 961016
Thu Oct 17 01:55:34 1996 Ulrich Drepper <drepper@cygnus.com> * sunrpc/Makefile ($(objpfx)rpcsvc/%.h, $(objpfx)x%.c): Write output to $@T and move to $@ later since the new rpcgen will not overwrite existing files. * po/Makefile (libc.pot): Fix typo. Sun Oct 13 20:52:07 1996 Thorsten Kukuk <kukuk@weber.uni-paderborn.de> Update rpcgen program to TI-rpc code. * sunrpc/Makefile (rpcgen-objs): Add rpc_tblout.o and rpc_sample.o. (distribute): Add proto.h. * sunrpc/proto.h: New file. Prototypes for all the RPC functions. * sunrpc/rpc_clntout.c: Change to allow generation of ISO C code. * sunrpc/rpc_cout.c: Likewise. * sunrpc/rpc_hout.c: Likewise. * sunrpc/rpc_main.c: Likewise. * sunrpc/rpc_parse.c: Likewise. * sunrpc/rpc_parse.h: Likewise. * sunrpc/rpc_scan.c: Likewise. * sunrpc/rpc_scan.h: Likewise. * sunrpc/rpc_svcout.c: Likewise. * sunrpc/rpc_util.c: Likewise. * sunrpc/rpc_util.h: Likewise. * sunrpc/rpc_tblout.c: New file. * sunrpc/rpc_sample.c: Likewise. Thu Oct 17 00:26:20 1996 NIIBE Yutaka <gniibe@mri.co.jp> * sysdeps/unix/opendir.c: Add semicolon for consistency. Wed Oct 16 12:26:53 1996 Sven Verdoolaege <skimo@breughel.ufsia.ac.be> * locale/progams/localedef.c (main): Test with -1 to find out whether read failed. Wed Oct 16 14:54:59 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/clone.S: Use JUMPTARGET and PSEUDO_END macro. Tue Oct 15 21:27:42 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/sigcontext.h: Removed. Tue Oct 15 15:52:29 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/clone.S: Add CALL_MCOUNT. * sysdeps/unix/sysv/linux/m68k/mmap.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sigreturn.S: Likewise. * sysdeps/unix/sysv/linux/m68k/socket.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S (__errno_location): Likewise. * sysdeps/unix/sysv/linux/m68k/syscall.S: Likewise. Correct generation of system call. Tue Oct 15 15:13:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (sysd-Makefile): Fix command so that it works in the subdirectories. (BUILD_CFLAGS): Change back using $(..) instead of $(common-objpfx), the latter fails in the toplevel directory when $(objdir) is relative. (common-objdir-compile): Run compiler in $(objdir). * sysdeps/posix/Makefile (mk-stdiolim): Likewise. Tue Oct 15 23:39:48 1996 Ulrich Drepper <drepper@cygnus.com> * string/string.h [__USE_SVID]: Add prototype for swab. * time/sys/time.h [__USE_BSD]: Add prototype for ualarm. Reported by Andreas Jaeger. The available nlist implementation is not generally usable. Especially on the currently supported ELF systems the nlist function comes with the libelf. * misc/Makefile (headers): Remove nlist.h. (routines): Remove nlist. * Makefile ($(objpfx)version-info.h): Include information about system the libc is built on in version-info.h file. * po/Makefile (distribute): Add header.pot. Tue Oct 15 16:34:15 1996 Andreas Jaeger <aj@arthur.pfalz.de> * sysdeps/unix/sysv/linux/sleep.c: Include file with prototype. * sysdeps/unix/sysv/linux/reboot.c: Likewise. * misc/error.c: Likewise. Tue Oct 15 22:41:27 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/syscalls.list: Add {get,set}resuid. Tue Oct 15 08:06:02 1996 Andreas Jaeger <aj@arthur.pfalz.de> * crypt/Makefiel (rpath-link): Extend search path to current directory. Fri Oct 11 09:18:06 1996 Sven Verdoolaege <skimo@breughel.ufsia.ac.be> * sysdeps/i386/i586/strlen.S: Correct handling of prolog for aligning pointer. Tue Oct 15 02:13:21 1996 Ulrich Drepper <drepper@cygnus.com> * stdio-common/vfprintf.c: Don't declare __flockfile as weak. * crypt/md5-crypt.c (md5_crypt_r): Add cast to prevent warning. Sun Oct 13 19:16:10 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/sysdep.h (POUND): Macro removed, replaced by `&'. (PSEUDO_END): Provide definition to use .size directive. (PSEUDO): Don't interpret negative return values less than -128 as syscall error. * sysdeps/unix/sysv/linux/m68k/syscall.S (syscall): Likewise. * sysdeps/m68k/bsd-_setjmp.S: Use PSEUDO_END macro to provide .size directive. * sysdeps/m68k/bsd-setjmp.S: Likewise. * sysdeps/unix/sysv/linux/m68k/clone.S: Likewise. * sysdeps/unix/sysv/linux/m68k/mmap.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sigreturn.S: Likewise. * sysdeps/unix/sysv/linux/m68k/socket.S: Likewise. * sysdeps/unix/sysv/linux/m68k/syscall.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Use PSEUDO_END instead of explicit .size directive. * libio/iogets.c: Warn when gets is used. cd * time/strptime.c: Recognize %s, %u, %g, and %G format.
This commit is contained in:
Ulrich Drepper
@ -1,11 +1,11 @@
|
||||
/* @(#)rpc_parse.c 2.1 88/08/01 4.0 RPCSRC */
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
* unrestricted use provided that this legend is included on all tape
|
||||
* media and as a part of the software program in whole or part. Users
|
||||
* may copy or modify Sun RPC without charge, but are not authorized
|
||||
* to license or distribute it to anyone else except as part of a product or
|
||||
* program developed by the user.
|
||||
* program developed by the user or with the express written consent of
|
||||
* Sun Microsystems, Inc.
|
||||
*
|
||||
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
|
||||
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
|
||||
@ -27,24 +27,45 @@
|
||||
* 2550 Garcia Avenue
|
||||
* Mountain View, California 94043
|
||||
*/
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#)rpc_parse.c 1.4 87/04/28 (C) 1987 SMI";
|
||||
#endif
|
||||
|
||||
/*
|
||||
* rpc_parse.c, Parser for the RPC protocol compiler
|
||||
* From: @(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI
|
||||
*/
|
||||
char parse_rcsid[] =
|
||||
"$Id$";
|
||||
|
||||
/*
|
||||
* rpc_parse.c, Parser for the RPC protocol compiler
|
||||
* Copyright (C) 1987 Sun Microsystems, Inc.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include "rpc_util.h"
|
||||
#include <string.h>
|
||||
#include "rpc/types.h"
|
||||
#include "rpc_scan.h"
|
||||
#include "rpc_parse.h"
|
||||
#include "rpc_util.h"
|
||||
#include "proto.h"
|
||||
|
||||
#define ARGNAME "arg"
|
||||
|
||||
static void isdefined(definition *defp);
|
||||
static void def_struct(definition *defp);
|
||||
static void def_program(definition *defp);
|
||||
static void def_enum(definition *defp);
|
||||
static void def_const(definition *defp);
|
||||
static void def_union(definition *defp);
|
||||
static void check_type_name(const char *name, int new_type);
|
||||
static void def_typedef(definition *defp);
|
||||
static void get_declaration(declaration *dec, defkind dkind);
|
||||
static void get_prog_declaration(declaration *dec, defkind dkind, int num);
|
||||
static void get_type(const char **prefixp, const char **typep, defkind dkind);
|
||||
static void unsigned_dec(const char **typep);
|
||||
|
||||
/*
|
||||
* return the next definition you see
|
||||
*/
|
||||
definition *
|
||||
get_definition()
|
||||
get_definition(void)
|
||||
{
|
||||
definition *defp;
|
||||
token tok;
|
||||
@ -72,26 +93,22 @@ get_definition()
|
||||
break;
|
||||
case TOK_EOF:
|
||||
return (NULL);
|
||||
break;
|
||||
default:
|
||||
error(_("definition keyword expected"));
|
||||
error("definition keyword expected");
|
||||
}
|
||||
scan(TOK_SEMICOLON, &tok);
|
||||
isdefined(defp);
|
||||
return (defp);
|
||||
}
|
||||
|
||||
static
|
||||
isdefined(defp)
|
||||
definition *defp;
|
||||
static void
|
||||
isdefined(definition *defp)
|
||||
{
|
||||
STOREVAL(&defined, defp);
|
||||
}
|
||||
|
||||
|
||||
static
|
||||
def_struct(defp)
|
||||
definition *defp;
|
||||
static void
|
||||
def_struct(definition *defp)
|
||||
{
|
||||
token tok;
|
||||
declaration dec;
|
||||
@ -117,21 +134,25 @@ def_struct(defp)
|
||||
*tailp = NULL;
|
||||
}
|
||||
|
||||
static
|
||||
def_program(defp)
|
||||
definition *defp;
|
||||
static void
|
||||
def_program(definition *defp)
|
||||
{
|
||||
token tok;
|
||||
declaration dec;
|
||||
decl_list *decls;
|
||||
decl_list **tailp;
|
||||
version_list *vlist;
|
||||
version_list **vtailp;
|
||||
proc_list *plist;
|
||||
proc_list **ptailp;
|
||||
|
||||
int num_args;
|
||||
bool_t isvoid = FALSE; /* whether first argument is void */
|
||||
defp->def_kind = DEF_PROGRAM;
|
||||
scan(TOK_IDENT, &tok);
|
||||
defp->def_name = tok.str;
|
||||
scan(TOK_LBRACE, &tok);
|
||||
vtailp = &defp->def.pr.versions;
|
||||
tailp = &defp->def.st.decls;
|
||||
scan(TOK_VERSION, &tok);
|
||||
do {
|
||||
scan(TOK_IDENT, &tok);
|
||||
@ -140,33 +161,74 @@ def_program(defp)
|
||||
scan(TOK_LBRACE, &tok);
|
||||
ptailp = &vlist->procs;
|
||||
do {
|
||||
/* get result type */
|
||||
plist = ALLOC(proc_list);
|
||||
get_type(&plist->res_prefix, &plist->res_type, DEF_PROGRAM);
|
||||
get_type(&plist->res_prefix, &plist->res_type,
|
||||
DEF_PROGRAM);
|
||||
if (streq(plist->res_type, "opaque")) {
|
||||
error(_("illegal result type"));
|
||||
error("illegal result type");
|
||||
}
|
||||
scan(TOK_IDENT, &tok);
|
||||
plist->proc_name = tok.str;
|
||||
scan(TOK_LPAREN, &tok);
|
||||
get_type(&plist->arg_prefix, &plist->arg_type, DEF_PROGRAM);
|
||||
if (streq(plist->arg_type, "opaque")) {
|
||||
error("illegal argument type");
|
||||
/* get args - first one*/
|
||||
num_args = 1;
|
||||
isvoid = FALSE;
|
||||
/* type of DEF_PROGRAM in the first
|
||||
* get_prog_declaration and DEF_STURCT in the next
|
||||
* allows void as argument if it is the only argument
|
||||
*/
|
||||
get_prog_declaration(&dec, DEF_PROGRAM, num_args);
|
||||
if (streq(dec.type, "void"))
|
||||
isvoid = TRUE;
|
||||
decls = ALLOC(decl_list);
|
||||
plist->args.decls = decls;
|
||||
decls->decl = dec;
|
||||
tailp = &decls->next;
|
||||
/* get args */
|
||||
while(peekscan(TOK_COMMA, &tok)) {
|
||||
num_args++;
|
||||
get_prog_declaration(&dec, DEF_STRUCT,
|
||||
num_args);
|
||||
decls = ALLOC(decl_list);
|
||||
decls->decl = dec;
|
||||
*tailp = decls;
|
||||
if (streq(dec.type, "void"))
|
||||
isvoid = TRUE;
|
||||
tailp = &decls->next;
|
||||
}
|
||||
/* multiple arguments are only allowed in newstyle */
|
||||
if( !newstyle && num_args > 1 ) {
|
||||
error("only one argument is allowed" );
|
||||
}
|
||||
if (isvoid && num_args > 1) {
|
||||
error("illegal use of void in program definition");
|
||||
}
|
||||
*tailp = NULL;
|
||||
scan(TOK_RPAREN, &tok);
|
||||
scan(TOK_EQUAL, &tok);
|
||||
scan_num(&tok);
|
||||
scan(TOK_SEMICOLON, &tok);
|
||||
plist->proc_num = tok.str;
|
||||
plist->arg_num = num_args;
|
||||
*ptailp = plist;
|
||||
ptailp = &plist->next;
|
||||
peek(&tok);
|
||||
} while (tok.kind != TOK_RBRACE);
|
||||
*ptailp = NULL;
|
||||
*vtailp = vlist;
|
||||
vtailp = &vlist->next;
|
||||
scan(TOK_RBRACE, &tok);
|
||||
scan(TOK_EQUAL, &tok);
|
||||
scan_num(&tok);
|
||||
vlist->vers_num = tok.str;
|
||||
/* make the argument structure name for each arg*/
|
||||
for(plist = vlist->procs; plist != NULL;
|
||||
plist = plist->next) {
|
||||
plist->args.argname = make_argname(plist->proc_name,
|
||||
vlist->vers_num);
|
||||
/* free the memory ??*/
|
||||
}
|
||||
scan(TOK_SEMICOLON, &tok);
|
||||
scan2(TOK_VERSION, TOK_RBRACE, &tok);
|
||||
} while (tok.kind == TOK_VERSION);
|
||||
@ -176,9 +238,9 @@ def_program(defp)
|
||||
*vtailp = NULL;
|
||||
}
|
||||
|
||||
static
|
||||
def_enum(defp)
|
||||
definition *defp;
|
||||
|
||||
static void
|
||||
def_enum(definition *defp)
|
||||
{
|
||||
token tok;
|
||||
enumval_list *elist;
|
||||
@ -206,9 +268,8 @@ def_enum(defp)
|
||||
*tailp = NULL;
|
||||
}
|
||||
|
||||
static
|
||||
def_const(defp)
|
||||
definition *defp;
|
||||
static void
|
||||
def_const(definition *defp)
|
||||
{
|
||||
token tok;
|
||||
|
||||
@ -220,72 +281,150 @@ def_const(defp)
|
||||
defp->def.co = tok.str;
|
||||
}
|
||||
|
||||
static
|
||||
def_union(defp)
|
||||
definition *defp;
|
||||
static void
|
||||
def_union(definition *defp)
|
||||
{
|
||||
token tok;
|
||||
declaration dec;
|
||||
case_list *cases;
|
||||
case_list **tailp;
|
||||
token tok;
|
||||
declaration dec;
|
||||
case_list *cases;
|
||||
/* case_list *tcase; */
|
||||
case_list **tailp;
|
||||
int flag;
|
||||
|
||||
defp->def_kind = DEF_UNION;
|
||||
scan(TOK_IDENT, &tok);
|
||||
defp->def_name = tok.str;
|
||||
scan(TOK_SWITCH, &tok);
|
||||
scan(TOK_LPAREN, &tok);
|
||||
get_declaration(&dec, DEF_UNION);
|
||||
defp->def.un.enum_decl = dec;
|
||||
tailp = &defp->def.un.cases;
|
||||
scan(TOK_RPAREN, &tok);
|
||||
scan(TOK_LBRACE, &tok);
|
||||
scan(TOK_CASE, &tok);
|
||||
while (tok.kind == TOK_CASE) {
|
||||
scan(TOK_IDENT, &tok);
|
||||
cases = ALLOC(case_list);
|
||||
cases->case_name = tok.str;
|
||||
scan(TOK_COLON, &tok);
|
||||
get_declaration(&dec, DEF_UNION);
|
||||
cases->case_decl = dec;
|
||||
*tailp = cases;
|
||||
tailp = &cases->next;
|
||||
scan(TOK_SEMICOLON, &tok);
|
||||
scan3(TOK_CASE, TOK_DEFAULT, TOK_RBRACE, &tok);
|
||||
}
|
||||
*tailp = NULL;
|
||||
if (tok.kind == TOK_DEFAULT) {
|
||||
scan(TOK_COLON, &tok);
|
||||
get_declaration(&dec, DEF_UNION);
|
||||
defp->def.un.default_decl = ALLOC(declaration);
|
||||
*defp->def.un.default_decl = dec;
|
||||
scan(TOK_SEMICOLON, &tok);
|
||||
scan(TOK_RBRACE, &tok);
|
||||
} else {
|
||||
defp->def.un.default_decl = NULL;
|
||||
}
|
||||
defp->def_kind = DEF_UNION;
|
||||
scan(TOK_IDENT, &tok);
|
||||
defp->def_name = tok.str;
|
||||
scan(TOK_SWITCH, &tok);
|
||||
scan(TOK_LPAREN, &tok);
|
||||
get_declaration(&dec, DEF_UNION);
|
||||
defp->def.un.enum_decl = dec;
|
||||
tailp = &defp->def.un.cases;
|
||||
scan(TOK_RPAREN, &tok);
|
||||
scan(TOK_LBRACE, &tok);
|
||||
scan(TOK_CASE, &tok);
|
||||
while (tok.kind == TOK_CASE) {
|
||||
scan2(TOK_IDENT, TOK_CHARCONST, &tok);
|
||||
cases = ALLOC(case_list);
|
||||
cases->case_name = tok.str;
|
||||
scan(TOK_COLON, &tok);
|
||||
/* now peek at next token */
|
||||
flag=0;
|
||||
if(peekscan(TOK_CASE,&tok))
|
||||
{
|
||||
|
||||
do
|
||||
{
|
||||
scan2(TOK_IDENT, TOK_CHARCONST, &tok);
|
||||
cases->contflag=1; /* continued case statement */
|
||||
*tailp = cases;
|
||||
tailp = &cases->next;
|
||||
cases = ALLOC(case_list);
|
||||
cases->case_name = tok.str;
|
||||
scan(TOK_COLON, &tok);
|
||||
|
||||
}while(peekscan(TOK_CASE,&tok));
|
||||
}
|
||||
else
|
||||
if(flag)
|
||||
{
|
||||
|
||||
*tailp = cases;
|
||||
tailp = &cases->next;
|
||||
cases = ALLOC(case_list);
|
||||
};
|
||||
|
||||
get_declaration(&dec, DEF_UNION);
|
||||
cases->case_decl = dec;
|
||||
cases->contflag=0; /* no continued case statement */
|
||||
*tailp = cases;
|
||||
tailp = &cases->next;
|
||||
scan(TOK_SEMICOLON, &tok);
|
||||
|
||||
scan3(TOK_CASE, TOK_DEFAULT, TOK_RBRACE, &tok);
|
||||
}
|
||||
*tailp = NULL;
|
||||
if (tok.kind == TOK_DEFAULT) {
|
||||
scan(TOK_COLON, &tok);
|
||||
get_declaration(&dec, DEF_UNION);
|
||||
defp->def.un.default_decl = ALLOC(declaration);
|
||||
*defp->def.un.default_decl = dec;
|
||||
scan(TOK_SEMICOLON, &tok);
|
||||
scan(TOK_RBRACE, &tok);
|
||||
} else {
|
||||
defp->def.un.default_decl = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static const char *reserved_words[] =
|
||||
{
|
||||
"array",
|
||||
"bytes",
|
||||
"destroy",
|
||||
"free",
|
||||
"getpos",
|
||||
"inline",
|
||||
"pointer",
|
||||
"reference",
|
||||
"setpos",
|
||||
"sizeof",
|
||||
"union",
|
||||
"vector",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *reserved_types[] =
|
||||
{
|
||||
"opaque",
|
||||
"string",
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
* check that the given name is not one that would eventually result in
|
||||
* xdr routines that would conflict with internal XDR routines.
|
||||
*/
|
||||
static void check_type_name(const char *name, int new_type)
|
||||
{
|
||||
int i;
|
||||
char tmp[100];
|
||||
|
||||
for( i = 0; reserved_words[i] != NULL; i++ ) {
|
||||
if( strcmp( name, reserved_words[i] ) == 0 ) {
|
||||
sprintf(tmp,
|
||||
"illegal (reserved) name :\'%s\' in type definition", name );
|
||||
error(tmp);
|
||||
}
|
||||
}
|
||||
if( new_type ) {
|
||||
for( i = 0; reserved_types[i] != NULL; i++ ) {
|
||||
if( strcmp( name, reserved_types[i] ) == 0 ) {
|
||||
sprintf(tmp,
|
||||
"illegal (reserved) name :\'%s\' in type definition", name );
|
||||
error(tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static
|
||||
def_typedef(defp)
|
||||
definition *defp;
|
||||
|
||||
static void
|
||||
def_typedef(definition *defp)
|
||||
{
|
||||
declaration dec;
|
||||
|
||||
defp->def_kind = DEF_TYPEDEF;
|
||||
get_declaration(&dec, DEF_TYPEDEF);
|
||||
defp->def_name = dec.name;
|
||||
check_type_name(dec.name, 1);
|
||||
defp->def.ty.old_prefix = dec.prefix;
|
||||
defp->def.ty.old_type = dec.type;
|
||||
defp->def.ty.rel = dec.rel;
|
||||
defp->def.ty.array_max = dec.array_max;
|
||||
}
|
||||
|
||||
|
||||
static
|
||||
get_declaration(dec, dkind)
|
||||
declaration *dec;
|
||||
defkind dkind;
|
||||
static void
|
||||
get_declaration(declaration *dec, defkind dkind)
|
||||
{
|
||||
token tok;
|
||||
|
||||
@ -294,6 +433,9 @@ get_declaration(dec, dkind)
|
||||
if (streq(dec->type, "void")) {
|
||||
return;
|
||||
}
|
||||
|
||||
check_type_name(dec->type, 0);
|
||||
|
||||
scan2(TOK_STAR, TOK_IDENT, &tok);
|
||||
if (tok.kind == TOK_STAR) {
|
||||
dec->rel = REL_POINTER;
|
||||
@ -302,7 +444,7 @@ get_declaration(dec, dkind)
|
||||
dec->name = tok.str;
|
||||
if (peekscan(TOK_LBRACKET, &tok)) {
|
||||
if (dec->rel == REL_POINTER) {
|
||||
error(_("no array-of-pointer declarations -- use typedef"));
|
||||
error("no array-of-pointer declarations -- use typedef");
|
||||
}
|
||||
dec->rel = REL_VECTOR;
|
||||
scan_num(&tok);
|
||||
@ -310,7 +452,7 @@ get_declaration(dec, dkind)
|
||||
scan(TOK_RBRACKET, &tok);
|
||||
} else if (peekscan(TOK_LANGLE, &tok)) {
|
||||
if (dec->rel == REL_POINTER) {
|
||||
error(_("no array-of-pointer declarations -- use typedef"));
|
||||
error("no array-of-pointer declarations -- use typedef");
|
||||
}
|
||||
dec->rel = REL_ARRAY;
|
||||
if (peekscan(TOK_RANGLE, &tok)) {
|
||||
@ -323,21 +465,84 @@ get_declaration(dec, dkind)
|
||||
}
|
||||
if (streq(dec->type, "opaque")) {
|
||||
if (dec->rel != REL_ARRAY && dec->rel != REL_VECTOR) {
|
||||
error(_("array declaration expected"));
|
||||
error("array declaration expected");
|
||||
}
|
||||
} else if (streq(dec->type, "string")) {
|
||||
if (dec->rel != REL_ARRAY) {
|
||||
error(_("variable-length array declaration expected"));
|
||||
error("variable-length array declaration expected");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static
|
||||
get_type(prefixp, typep, dkind)
|
||||
char **prefixp;
|
||||
char **typep;
|
||||
defkind dkind;
|
||||
static void
|
||||
get_prog_declaration(declaration *dec, defkind dkind, int num /* arg number */)
|
||||
{
|
||||
token tok;
|
||||
char name[10]; /* argument name */
|
||||
|
||||
if (dkind == DEF_PROGRAM) {
|
||||
peek(&tok);
|
||||
if (tok.kind == TOK_RPAREN) { /* no arguments */
|
||||
dec->rel = REL_ALIAS;
|
||||
dec->type = "void";
|
||||
dec->prefix = NULL;
|
||||
dec->name = NULL;
|
||||
return;
|
||||
}
|
||||
}
|
||||
get_type(&dec->prefix, &dec->type, dkind);
|
||||
dec->rel = REL_ALIAS;
|
||||
if (peekscan(TOK_IDENT, &tok)) /* optional name of argument */
|
||||
strcpy(name, tok.str);
|
||||
else
|
||||
sprintf(name, "%s%d", ARGNAME, num); /* default name of argument */
|
||||
|
||||
dec->name = (char *) strdup(name);
|
||||
|
||||
if (streq(dec->type, "void")) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (streq(dec->type, "opaque")) {
|
||||
error("opaque -- illegal argument type");
|
||||
}
|
||||
if (peekscan(TOK_STAR, &tok)) {
|
||||
if (streq(dec->type, "string")) {
|
||||
error("pointer to string not allowed in program arguments\n");
|
||||
}
|
||||
dec->rel = REL_POINTER;
|
||||
if (peekscan(TOK_IDENT, &tok)) /* optional name of argument */
|
||||
dec->name = strdup(tok.str);
|
||||
}
|
||||
if (peekscan(TOK_LANGLE, &tok)) {
|
||||
if (!streq(dec->type, "string")) {
|
||||
error("arrays cannot be declared as arguments to procedures -- use typedef");
|
||||
}
|
||||
dec->rel = REL_ARRAY;
|
||||
if (peekscan(TOK_RANGLE, &tok)) {
|
||||
dec->array_max = "~0";/* unspecified size, use max */
|
||||
} else {
|
||||
scan_num(&tok);
|
||||
dec->array_max = tok.str;
|
||||
scan(TOK_RANGLE, &tok);
|
||||
}
|
||||
}
|
||||
if (streq(dec->type, "string")) {
|
||||
if (dec->rel != REL_ARRAY) { /* .x specifies just string as
|
||||
* type of argument
|
||||
* - make it string<>
|
||||
*/
|
||||
dec->rel = REL_ARRAY;
|
||||
dec->array_max = "~0";/* unspecified size, use max */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void
|
||||
get_type(const char **prefixp, const char **typep, defkind dkind)
|
||||
{
|
||||
token tok;
|
||||
|
||||
@ -367,7 +572,7 @@ get_type(prefixp, typep, dkind)
|
||||
break;
|
||||
case TOK_VOID:
|
||||
if (dkind != DEF_UNION && dkind != DEF_PROGRAM) {
|
||||
error(_("voids allowed only inside union and program definitions"));
|
||||
error("voids allowed only inside union and program definitions with one argument");
|
||||
}
|
||||
*typep = tok.str;
|
||||
break;
|
||||
@ -381,14 +586,12 @@ get_type(prefixp, typep, dkind)
|
||||
*typep = tok.str;
|
||||
break;
|
||||
default:
|
||||
error(_("expected type specifier"));
|
||||
error("expected type specifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static
|
||||
unsigned_dec(typep)
|
||||
char **typep;
|
||||
static void
|
||||
unsigned_dec(const char **typep)
|
||||
{
|
||||
token tok;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user