tccgen: scopes levels for local symbols (update 2)

allow typedef int xxx; typedef int xxx; in the same scope as long as it is the same type

grischka committed 10 years ago

Commit a94e8d41 parent d48662d3 files · +21 −17Browse files

Unified · Split

3 files

tccgen.c +14 −11
tests/Makefile +1 −0
tests/pp/Makefile +6 −6

         if (v < TOK_IDENT)
             expect("struct/union/enum name");
         s = struct_find(v);
-        if (s && s->type.t == a) {
+        if (s && (s->scope == local_scope || (tok != '{' && tok != ';'))) {
-            if (0 == local_scope)
+            if (s->type.t != a)
-                goto do_decl; /* compatibility with past behavior */
+                tcc_error("redefinition of '%s'", get_tok_str(v, NULL));
-            if (tok != '{' && tok != ';')
+            goto do_decl;
-                goto do_decl; /* variable declaration: 'struct s x;' */
-            if (s->scope == local_scope && (s->c == -1 || tok != '{'))
-                goto do_decl; /* at least one must be incomplete type */
         }
     } else {
         v = anon_sym++;
         plast = &first;
         arg_size = 0;
         if (tok != ')') {
-            int ls = local_scope;
-            local_scope = 1; /* for struct decl inside function params */
             for(;;) {
                 /* read param name and compute offset */
                 if (l != FUNC_OLD) {
                     break;
                 }
             }
-            local_scope = ls;
         }
         /* if no parameters, then old type prototype */
         if (l == 0)
                 if (btype.t & VT_TYPEDEF) {
                     /* save typedefed type  */
                     /* XXX: test storage specifiers ? */
-                    sym = sym_push(v, &type, 0, 0);
+                    sym = sym_find(v);
+                    if (sym && sym->scope == local_scope) {
+                        if (!is_compatible_types(&sym->type, &type)
+                            || !(sym->type.t & VT_TYPEDEF))
+                            tcc_error("incompatible redefinition of '%s'",
+                                get_tok_str(v, NULL));
+                        sym->type = type;
+                    } else {
+                        sym = sym_push(v, &type, 0, 0);
+                    }
                     sym->a = ad.a;
                     sym->type.t |= VT_TYPEDEF;
                 } else {

tests/Makefile+1−0

@@ -250,6 +250,7 @@ cache: tcc_g · 249 unmodified lines
250	# clean	250	# clean
251	clean:	251	clean:
252	$(MAKE) -C tests2 $@	252	$(MAKE) -C tests2 $@
		253	$(MAKE) -C pp $@
253	rm -vf ~ .o .a .bin .i .ref .out .out? .out?b .cc \	254	rm -vf ~ .o .a .bin .i .ref .out .out? .out?b .cc \
254	-cc -tcc *.exe \	255	-cc -tcc *.exe \
255	hello libtcc_test vla_test tcctest[1234] ex? tcc_g	256	hello libtcc_test vla_test tcctest[1234] ex? tcc_g

tests/pp/Makefile+6−6

 all test : $(sort $(TESTS))
+DIFF_OPTS = -Nu -b -B -I "^\#"
 %.test: %.c %.expect
 	@echo PPTest $* ...
 	-@$(TCC) -E -P $< >$*.output 2>&1 ; \
-	    diff -Nu -b -B -I "^#" $(EXTRA_DIFF_OPTS) $*.expect $*.output \
+	    diff $(DIFF_OPTS) $*.expect $*.output \
 	    && rm -f $*.output
 %.test: %.S %.expect
 	@echo PPTest $* ...
 	-@$(TCC) -E -P $< >$*.output 2>&1 ; \
-	    diff -Nu -b -B -I "^#" $(EXTRA_DIFF_OPTS) $*.expect $*.output \
+	    diff $(DIFF_OPTS) $*.expect $*.output \
 	    && rm -f $*.output
 # automatically generate .expect files with gcc:
 clean:
 	rm -vf *.output
-# 02.test : EXTRA_DIFF_OPTS = -w
+02.test : DIFF_OPTS += -w
-# 03.test : EXTRA_DIFF_OPTS = -w
+15.test : DIFF_OPTS += -w
-# 04.test : EXTRA_DIFF_OPTS = -w
-# 10.test : EXTRA_DIFF_OPTS = -w
 # diff options:
 # -b ighore space changes

tccgen: scopes levels for local symbols (update 2)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code