X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCast.h;h=a3fb3d3c7eead9aa1bd104d5c7ad74f1f8b00426;hb=b6bf74fe60d0d76aa76e89e1b9adb870aa5b8933;hp=194612d58fafcc798949071836e88015db6e963b;hpb=46b4aa4d39aa386afe5ee47ce00be464d999278e;p=fw%2Fsdcc

diff --git a/src/SDCCast.h b/src/SDCCast.h
index 194612d5..a3fb3d3c 100644
--- a/src/SDCCast.h
+++ b/src/SDCCast.h
@@ -35,7 +35,6 @@ typedef enum {
   EX_OP=0,
   EX_VALUE,
   EX_LINK,
-  EX_STMNT,
   EX_OPERAND
 } ASTTYPE;
 
@@ -50,15 +49,16 @@ typedef struct ast
     unsigned rvalue:1;
     unsigned lvalue:1;
     unsigned initMode:1;
+    unsigned reversed:1;
     int level;			/* level for expr */
     int block;			/* block number   */
+    int seqPoint;		/* sequence point */
     /* union of values expression can have */
     union
       {
 	value *val;		/* value if type = EX_VALUE */
 	sym_link *lnk;		/* sym_link * if type= EX_LINK  */
 	struct operand *oprnd;	/* used only for side effecting function calls */
-	unsigned stmnt;		/* statement if type=EX_STMNT */
 	unsigned op;		/* operator if type= EX_OP  */
       }
     opval;
@@ -112,7 +112,7 @@ ast;
 
 
 /* easy access macros   */
-#define  IS_AST_OP(x)			(x && x->type == EX_OP)
+#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 == '&' && \
@@ -120,7 +120,7 @@ ast;
 #define IS_FOR_STMT(x) (IS_AST_OP(x) && x->opval.op == FOR)
 #define IS_LEFT_OP(x) (IS_AST_OP(x) && x->opval.op == LEFT_OP)
 #define IS_RIGHT_OP(x) (IS_AST_OP(x) && x->opval.op == RIGHT_OP)
-#define  IS_AST_VALUE(x)	(x && x->type == EX_VALUE && x->opval.val)
+#define  IS_AST_VALUE(x)	((x) && (x)->type == EX_VALUE && (x)->opval.val)
 #define  IS_AST_LINK(x)		(x->type == EX_LINK)
 #define  IS_AST_NOT_OPER(x)	(x && IS_AST_OP(x) && x->opval.op == '!')
 #define  IS_ARRAY_OP(x) (IS_AST_OP(x) && x->opval.op == '[')
@@ -131,14 +131,14 @@ ast;
 				   x->opval.op == GE_OP	||		\
 				   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_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 )
 #define IS_AST_LIT_VALUE(x) (IS_AST_VALUE(x) && \
-                             IS_LITERAL(x->opval.val->etype))
+                             IS_LITERAL((x)->opval.val->etype))
 #define IS_AST_SYM_VALUE(x)     (IS_AST_VALUE(x) && x->opval.val->sym)
 #define AST_LIT_VALUE(x)        (floatFromVal(x->opval.val))
 #define AST_SYMBOL(x)           (x->opval.val->sym)
@@ -180,23 +180,25 @@ extern struct memmap *GcurMemmap;
 ast *newAst_VALUE (value * val);
 ast *newAst_OP (unsigned op);
 ast *newAst_LINK (sym_link * val);
-ast *newAst_STMNT (unsigned val);
 
 void initAst ();
 ast *newNode (long, ast *, ast *);
 ast *copyAst (ast *);
 ast *removeIncDecOps (ast *);
+ast *removePreIncDecOps (ast *);
+ast *removePostIncDecOps (ast *);
 value *sizeofOp (sym_link *);
 value *evalStmnt (ast *);
+ast *createRMW (ast *, unsigned, ast *);
 ast *createFunction (symbol *, ast *);
 ast *createBlock (symbol *, ast *);
 ast *createLabel (symbol *, ast *);
 ast *createCase (ast *, ast *, ast *);
-ast *createDefault (ast *, ast *);
+ast *createDefault (ast *, ast *, ast *);
 ast *forLoopOptForm (ast *);
 ast *argAst (ast *);
 ast *resolveSymbols (ast *);
-ast *decorateType (ast *);
+ast *decorateType (ast *, RESULT_TYPE);
 ast *createWhile (symbol *, symbol *, symbol *, ast *, ast *);
 ast *createIf (ast *, ast *, ast *);
 ast *createDo (symbol *, symbol *, symbol *, ast *, ast *);
@@ -212,6 +214,8 @@ bool hasSEFcalls (ast *);
 void addSymToBlock (symbol *, ast *);
 void freeStringSymbol(symbol *);
 DEFSETFUNC(resetParmKey);
+int astErrors(ast *);
+RESULT_TYPE getResultTypeFromType (sym_link *);
 
 // exported variables 
 extern set *operKeyReset;