X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fdeclare.h;h=96cdc40d92e605af4e1fc05328bf8ca8268bc763;hb=9b7c16ec4cbb5282642c377272224e3fc825f860;hp=57bf41516501a923ca5d3d9be6cb9988d0ef6887;hpb=53dd513176425872128ef26031d00952ef7a0628;p=cc65

diff --git a/src/cc65/declare.h b/src/cc65/declare.h
index 57bf41516..96cdc40d9 100644
--- a/src/cc65/declare.h
+++ b/src/cc65/declare.h
@@ -1,8 +1,35 @@
-/*
- * declare.h
- *
- * Ullrich von Bassewitz, 20.06.1998
- */
+/*****************************************************************************/
+/*                                                                           */
+/*				   declare.h				     */
+/*                                                                           */
+/*		   Parse variable and function declarations		     */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
 
 
 
@@ -11,43 +38,52 @@
 
 
 
+/* common */
+#include "coll.h"
+
+/* cc65 */
 #include "scanner.h"
 #include "symtab.h"
 
 
 
 /*****************************************************************************/
-/*		      		     Data		     		     */
+/*	  	      		     Data		     		     */
 /*****************************************************************************/
 
 
 
 /* Masks for the Flags field in DeclSpec */
-#define DS_DEF_STORAGE		0x0001U	/* Default storage class used */
-#define DS_DEF_TYPE		0x0002U	/* Default type used */
+#define DS_DEF_STORAGE		0x0001U	/* Default storage class used 	*/
+#define DS_DEF_TYPE		0x0002U	/* Default type used 		*/
+#define DS_EXTRA_TYPE		0x0004U	/* Extra type declared 		*/
 
 /* Result of ParseDeclSpec */
 typedef struct DeclSpec DeclSpec;
 struct DeclSpec {
-    unsigned	StorageClass;  	 	/* One of the SC_xxx flags */
-    type	Type [MAXTYPELEN];	/* Type of the declaration spec */
-    unsigned	Flags;			/* Bitmapped flags */
+    unsigned	StorageClass;           /* One of the SC_xxx flags      */
+    Type       	Type[MAXTYPELEN];       /* Type of the declaration spec */
+    unsigned	Flags;                  /* Bitmapped flags              */
 };
 
 /* Result of ParseDecl */
 typedef struct Declaration Declaration;
 struct Declaration {
-    ident     	Ident;			/* The identifier if any, else empty */
-    type      	Type [MAXTYPELEN];	/* The type */
+    unsigned    StorageClass;           /* A set of SC_xxx flags */
+    Type      	Type[MAXTYPELEN];       /* The type */
+    ident     	Ident;                  /* The identifier, if any*/
+    Collection* Attributes;             /* Attributes if any */
 
     /* Working variables */
-    type*	T;			/* Used to build Type */
+    unsigned	Index;              /* Used to build Type */
 };
 
 /* Modes for ParseDecl */
-#define DM_NEED_IDENT	0U		/* We must have an identifier */
-#define DM_NO_IDENT	1U		/* We won't read an identifier */
-#define DM_ACCEPT_IDENT	2U		/* We will accept an id if there is one */
+typedef enum {
+    DM_NEED_IDENT,                      /* We must have an identifier */
+    DM_NO_IDENT,                        /* We won't read an identifier */
+    DM_ACCEPT_IDENT,                    /* We will accept an id if there is one */
+} declmode_t;
 
 
 
@@ -57,17 +93,25 @@ struct Declaration {
 
 
 
-type* ParseType (type* Type);
+Type* ParseType (Type* Type);
 /* Parse a complete type specification */
 
-void ParseDecl (const DeclSpec* Spec, Declaration* D, unsigned Mode);
+void ParseDecl (const DeclSpec* Spec, Declaration* D, declmode_t Mode);
 /* Parse a variable, type or function declaration */
 
-void ParseDeclSpec (DeclSpec* D, unsigned DefStorage, int DefType);
+void ParseDeclSpec (DeclSpec* D, unsigned DefStorage, long DefType);
 /* Parse a declaration specification */
 
-void ParseInit (type* tptr);
-/* Parse initialization of variables */
+void CheckEmptyDecl (const DeclSpec* D);
+/* Called after an empty type declaration (that is, a type declaration without
+ * a variable). Checks if the declaration does really make sense and issues a
+ * warning if not.
+ */
+
+unsigned ParseInit (Type* T);
+/* Parse initialization of variables. Return the number of initialized data
+ * bytes.
+ */