From 9c760b0907df4f5ec7c28dd109b5ded8dddbfe93 Mon Sep 17 00:00:00 2001 From: Teddy Date: Mon, 7 Apr 2014 03:00:06 +0800 Subject: ... --- Makefile | 4 +-- TODO.rst | 1 + ast.h | 4 +-- semantics.c | 2 +- semantics.h | 97 ++++++++++++++++++++++++++++++++----------------------------- 5 files changed, 57 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index bce2e89..a2fec1a 100644 --- a/Makefile +++ b/Makefile @@ -14,9 +14,9 @@ cibic.tab.o: cibic.tab.c gcc -c cibic.tab.c main.o: main.c gcc -c main.c -g -Wall -Wextra -ast.o: ast.c +ast.o: ast.c ast.h gcc -c ast.c -g -Wall -Wextra -DCIBIC_DEBUG -semantics.o: semantics.c +semantics.o: semantics.c semantics.h gcc -c semantics.c -g -Wall -Wextra -DCIBIC_DEBUG lex.yy.c: cibic.l flex cibic.l diff --git a/TODO.rst b/TODO.rst index d896657..2efe1b5 100644 --- a/TODO.rst +++ b/TODO.rst @@ -8,6 +8,7 @@ TODO - Fix: + - check global definition when semantic analysis finishes - local function declaration is not in a local scope - Not Implemented: diff --git a/ast.h b/ast.h index c12e2b9..8b5c372 100644 --- a/ast.h +++ b/ast.h @@ -45,8 +45,8 @@ typedef struct CNode { char *strval; } rec; struct { - CType *type; - CVar *var; + CType_t type; + CVar_t var; } ext; struct CNode *chd, *next; /* For error reporting */ diff --git a/semantics.c b/semantics.c index 1d9e329..39ca0c1 100644 --- a/semantics.c +++ b/semantics.c @@ -596,7 +596,7 @@ CVar_t semantics_decl(CNode *p, CScope_t scope) { { /* TODO: initializer checking */ CVar_t var = semantics_declr(p->chd, type, scope, 0); - if (!type_is_complete(var->type)) + if (scope->lvl && !type_is_complete(var->type)) { sprintf(err_buff, "storage size of '%s' isn’t known", var->name); ERROR(var->ast); diff --git a/semantics.h b/semantics.h index df7f36a..8a69c13 100644 --- a/semantics.h +++ b/semantics.h @@ -3,23 +3,24 @@ #include "const.h" typedef struct CNode CNode; -struct CTable; typedef struct CTable *CTable_t; -struct CType; +typedef struct CType CType; +typedef CType *CType_t; +typedef struct CVar CVar; +typedef CVar *CVar_t; -typedef struct CVar { +struct CVar { const char *name; - struct CVar *next; /* next in the linked list */ - struct CType *type; + CVar_t next; /* next in the linked list */ + CType_t type; int offset; CNode *ast; -} CVar; +}; -typedef CVar *CVar_t; -CVar_t cvar_create(const char *name, struct CType *type, CNode *ast); +CVar_t cvar_create(const char *name, CType_t type, CNode *ast); void cvar_print(CVar_t cv); -typedef struct CType { +struct CType { enum { CINT, CCHAR, @@ -31,26 +32,25 @@ typedef struct CType { CFUNC } type; const char *name; - struct CType *next; + CType_t next; union { CTable_t fields; /* for a struct or union */ - struct CType *ref; /* for a pointer */ + CType_t ref; /* for a pointer */ struct { - struct CType *elem; + CType_t elem; int len; } arr; /* for an array */ struct { - CVar *params; - CVar *local; - struct CType *ret; + CVar_t params; + CVar_t local; + CType_t ret; CNode *body; } func; /* for a function */ } rec; int size; /* memory footprint */ CNode *ast; -} CType; +}; -typedef CType *CType_t; CType_t ctype_create(const char *name, int type, CNode *ast); void ctype_debug_print(CType_t ct); @@ -59,15 +59,16 @@ typedef unsigned int (*Hashfunc_t) (const char *); typedef const char *(*Printfunc_t) (void *); #endif -typedef struct CTNode { +typedef struct CTNode CTNode; +struct CTNode { const char *key; void *val; - struct CTNode *next; + CTNode *next; int lvl; -} CTNode; +}; typedef struct CTable { - struct CTNode *head[MAX_TABLE_SIZE]; + CTNode *head[MAX_TABLE_SIZE]; Hashfunc_t hfunc; #ifdef CIBIC_DEBUG Printfunc_t pfunc; @@ -86,42 +87,46 @@ int ctable_insert(CTable_t ct, const char *key, void *val, int lvl); void ctable_clip(CTable_t ct, const char *key, int max_lvl); void ctable_debug_print(CTable_t ct); -typedef struct CSVar { - struct CVar *var; - struct CSVar *next; -} CSVar; - -typedef struct CSType { - struct CType *type; - struct CSType *next; -} CSType; - -typedef struct CSNode { - struct CSVar *vhead; - struct CSType *thead; - struct CSNode *next; -} CSNode; - -typedef struct CScope *CScope_t; -typedef struct CScope { +typedef struct CSVar CSVar; +struct CSVar { + CVar_t var; + CSVar *next; +}; + +typedef struct CSType CSType; +struct CSType { + CType_t type; + CSType *next; +}; + +typedef struct CSNode CSNode; +struct CSNode { + CSVar *vhead; + CSType *thead; + CSNode *next; +}; + +typedef struct CScope CScope; +typedef CScope *CScope_t; +struct CScope { int lvl; CType_t func; int inside_loop; - struct CSNode *top; + CSNode *top; CTable_t tvar; CTable_t ttype; -} CScope; +}; typedef struct ExpType { - CType *type; + CType_t type; int lval; } ExpType; CScope_t cscope_create(); -CVar *cscope_lookup_var(CScope_t cs, const char *name); -CType *cscope_lookup_type(CScope_t cs, const char *name); -int cscope_push_var(CScope_t cs, CVar *var); -int cscope_push_type(CScope_t cs, CType *type); +CVar_t cscope_lookup_var(CScope_t cs, const char *name); +CType_t cscope_lookup_type(CScope_t cs, const char *name); +int cscope_push_var(CScope_t cs, CVar_t var); +int cscope_push_type(CScope_t cs, CType_t type); void cscope_enter(CScope_t cs); void cscope_exit(CScope_t cs); void cscope_debug_print(CScope_t cs); -- cgit v1.2.3-70-g09d2