X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCast.h;h=1504f69e54eb2ae32562aa02e989d2e4dbf00d75;hb=3d0d5b0df0a1ff1152a6ad01ee1d56b30e740b0c;hp=735a6a937a7441b91203014955d56bb07983a424;hpb=d92cc039b1bd6ddf52cecdc687f72b22523440aa;p=fw%2Fsdcc

diff --git a/src/SDCCast.h b/src/SDCCast.h
index 735a6a93..1504f69e 100644
--- a/src/SDCCast.h
+++ b/src/SDCCast.h
@@ -29,6 +29,7 @@
 #include "SDCCsymt.h"
 #include "SDCCval.h"
 #include "SDCCset.h"
+#include "SDCCmem.h"
 
 #define  EX_OP       0
 #define  EX_VALUE    1
@@ -42,7 +43,6 @@ typedef struct ast
 
     unsigned type:3;
     unsigned decorated:1;
-    unsigned hasVargs:1;
     unsigned isError:1;
     unsigned funcName:1;
     unsigned rvalue:1;
@@ -65,6 +65,7 @@ typedef struct ast
     union
       {
 	char *inlineasm;	/* pointer to inline assembler code */
+	literalList *constlist; /* init list for array initializer. */
 	symbol *sym;		/* if block then -> symbols */
 	value *args;		/* if function then args    */
 	/* if switch then switch values */
@@ -99,8 +100,6 @@ typedef struct ast
     sym_link *ftype;		/* start of type chain for this subtree */
     sym_link *etype;		/* end of type chain for this subtree   */
 
-    symbol *argSym;		/* argument symbols            */
-    value *args;		/* args of a function          */
     struct ast *left;		/* pointer to left tree        */
     struct ast *right;		/* pointer to right tree       */
     symbol *trueLabel;		/* if statement trueLabel */
@@ -111,6 +110,7 @@ ast;
 
 /* easy access macros   */
 #define  IS_AST_OP(x)			(x && x->type == EX_OP)
+#define IS_CALLOP(x)   (IS_AST_OP(x) && x->opval.op == CALL)
 #define IS_BITOR(x) (IS_AST_OP(x) && x->opval.op == '|')
 #define IS_BITAND(x) (IS_AST_OP(x) && x->opval.op == '&' && \
 		      x->left && x->right )
@@ -129,6 +129,8 @@ ast;
 				   x->opval.op == EQ_OP	||		\
 				   x->opval.op == NE_OP	))
 #define IS_CAST_OP(x) (IS_AST_OP(x) && x->opval.op == CAST)
+#define IS_TERNARY_OP(x) (IS_AST_OP(x) && x->opval.op == '?')
+#define IS_COLON_OP(x) (IS_AST_OP(x) && x->opval.op == ':')
 #define IS_ADDRESS_OF_OP(x)    (IS_AST_OP(x)            &&              \
 				x->opval.op == '&'      &&              \
 				x->right == NULL )
@@ -140,6 +142,7 @@ ast;
 #define AST_VALUE(x)            (x->opval.val)
 #define AST_VALUES(x,y)	(x->values.y)
 #define AST_FOR(x,y) x->values.forVals.y
+#define  IS_AST_PARAM(x)	(IS_AST_OP(x) && x->opval.op == PARAM)
 
 #define  CAN_EVAL(x)	(     x	==  '[' || x == '.' || x == PTR_OP ||	\
 	      x	==  '&'	|| x ==	'|' || x == '^'	   || x	== '*' || \
@@ -166,7 +169,7 @@ ast;
 /* forward declarations for global variables */
 extern ast *staticAutos;
 extern FILE *codeOutFile;
-extern memmap *GcurMemmap;
+extern struct memmap *GcurMemmap;
 
 /* forward definitions for functions   */
 ast *newAst_VALUE (value * val);
@@ -196,6 +199,7 @@ ast *createFor (symbol *, symbol *, symbol *, symbol *, ast *, ast *, ast *, ast
 void eval2icode (ast *);
 value *constExprValue (ast *, int);
 symbol *funcOfType (char *, sym_link *, sym_link *, int, int);
+symbol * funcOfTypeVarg (char *, char * , int , char **);
 ast *initAggregates (symbol *, initList *, ast *);
 bool hasSEFcalls (ast *);
 void addSymToBlock (symbol *, ast *);
@@ -203,5 +207,6 @@ void addSymToBlock (symbol *, ast *);
 // exported variables 
 extern set *operKeyReset;
 extern int noAlloc;
+extern int inInitMode;
 
 #endif