Revert commits from OpenCode-AI and a partial regression fix

This reverts the crap from an unknown committer "OpenCode[AI]", that added an extension to TinyCC, which is incompatible to the C standard and not available in any other mainstream C compiler: * Revert "No More ; needed" This reverts commit 6547ea47d66a4d382c9c2cfc317426d8a3a5734e * Revert "Add AGENTS.md" This reverts commit 898f496dc9d68e85a81daa836009930a975ea71a. This also reverts a regression fix by "Zuhaitz.dev", which fixed a small part of the OpenCode-AI chaos: * Revert "tccgen: Fix optional semicolon regression" This reverts commit 169628a6abf2bf32a9f73a7db5b4fd3ea973d97a -- Regards ... Detlef

Detlef Riekenberg committed 6 months ago

Commit 9b8765d1 parent 7b92d2d3 files · +10 −67Browse files

Unified · Split

3 files

AGENTS.md +0 −54
tccgen.c +9 −12
tests/tests2/60_errors_and_warnings.expect +1 −1

AGENTS.md+0−54

@@ -1,54 +0,0 @@
1	# TinyCC (Tiny C Compiler)
2
3	## Build & Test
4
5	```sh
6	./configure && make && make test
7	```
8
9	- `make` builds `tcc` + `libtcc.a` + `libtcc1.a`. `libtcc1.a` is built by a recursive `make -C lib`.
10	- `make test` runs the full test suite (`tests/`), ~2 minutes.
11	- Run a single tests2 test: `make tests2.37` (run) or `make tests2.37+` (update .expect).
12	- Run a single tests/pp test: `make testspp.17`.
13	- Sanitizer tests: `make sani-test`, `make sani-tests2.37`, `make sani-testspp.17`.
14	- Coverage tests: `make tcov-test`, `make tcov-tests2.37`, `make tcov-testspp.17`.
15	- Test installed tcc: `make test-install`.
16
17	## Architecture
18
19	- Single-file-ish compiler: tcc compiles itself (or can be bootstrapped). `tcc.c` is the main entrypoint; `tccpp.c` handles preprocessing, `tccgen.c` handles code generation, `tccelf.c` handles ELF linking, `tccasm.c` handles inline asm, `tccrun.c` handles runtime execution, `tccdbg.c` handles debug info.
20	- Backend files per architecture: `i386-gen.c`, `x86_64-gen.c`, `arm-gen.c`, `arm64-gen.c`, `riscv64-gen.c`, `c67-gen.c`, plus corresponding asm/link files.
21	- Generated file: `include/tccdefs.h` is converted to `tccdefs_.h` by `c2str.exe` (built from `conftest.c`). Always exists after first `make`.
22	- Cross-compilers: `make cross` builds all cross-compilers; `make cross-i386`, `make cross-x86_64`, etc. for one target. `make CROSS_TARGET=i386 ONE_SOURCE=yes` for single-object cross build.
23	- `ONE_SOURCE=yes`: builds tcc as a single object file (default for cross-compilers, native uses separate objects).
24
25	## Coding Style
26
27	- C90 with these pre-existing non-C90 features: `long long`, `inline`, `//` comments, unnamed struct/union fields, empty macro arguments, assignment between function pointer and `void *`.
28	- Indentation: 4 spaces for most files; some files (e.g. `i386-gen.c`) use 2 spaces for deep nesting.
29	- Do not reformat existing code unless the change is the primary purpose.
30	- Remove tabs and trailing whitespace from modified lines.
31	- Check with `./configure --extra-cflags="-std=c90 -Wpedantic"`.
32
33	## Test Quirks
34
35	- `test.ref` (reference output) is generated from `tcctest.c` using gcc: `(cd tests && gcc -I.. tcctest.c && valgrind -q ./a.out > test.ref)` then `make test TCC="valgrind -q --leak-check=full $(pwd)/tcc -B$(pwd) -I$(pwd)"`.
36	- VLA tests (`79_vla_continue`) produce expected invalid reads under Valgrind.
37	- tests2 skip list is in `tests/tests2/Makefile` (architecture- and config-specific skips).
38	- Some tests need special flags (see `FLAGS =` assignments in `tests/tests2/Makefile`).
39	- Bound-check tests (`-b` flag) are skipped when `CONFIG_bcheck=no`.
40	- `.expect` files are generated with gcc by default; some use TCC (flagged with `GEN-TCC`).
41
42	## Language Extension: Optional Semicolons
43
44	Semicolons are optional after most statements and declarations:
45	- `return`, `break`, `continue`, `goto`, expression statements
46	- `do-while` trailing semicolon
47	- Variable declarations
48
49	Semicolons are still required for:
50	- `for()` loop init/condition/increment sections (e.g., `for(i=0; i<n; i++)`)
51	- Old-style function parameter declarations
52	- Struct/enum member declarations
53
54	The `skip(';')` function in `tccpp.c:100` errors if token doesn't match. Use `if (tok == ';') next();` instead to make semicolons optional.

tccgen.c+9−12

                 label_push(&local_label_stack, tok, LABEL_DECLARED);
                 next();
             } while (tok == ',');
-            if (tok == ';') next();
+            skip(';');
         }
         while (tok != '}') {
         leave_scope(root_scope);
         if (b)
             gfunc_return(&func_vt);
-        if (tok == ';') next();
+        skip(';');
         /* jump unless last stmt in top-level block */
         if (tok != '}' || local_scope != 1)
             rsym = gjmp(rsym);
         else
             leave_scope(loop_scope);
         *cur_scope->bsym = gjmp(*cur_scope->bsym);
-        if (tok == ';') next();
+        skip(';');
     } else if (t == TOK_CONTINUE) {
         /* compute jump */
             tcc_error("cannot continue");
         leave_scope(loop_scope);
         *cur_scope->csym = gjmp(*cur_scope->csym);
-        if (tok == ';') next();
+        skip(';');
     } else if (t == TOK_FOR) {
         new_scope(&o);
 	gexpr();
         c = gvtst(0, 0);
         skip(')');
-        if (tok == ';') next();
+        skip(';');
 	gsym_addr(c, d);
         gsym(a);
         prev_scope_s(&o);
         } else {
             expect("label identifier");
         }
-        if (tok == ';') next();
+        skip(';');
     } else if (t == TOK_ASM1 || t == TOK_ASM2 || t == TOK_ASM3) {
         asm_instr();
                     gexpr();
                     vpop();
                 }
-                if (tok == ';') next();
+                skip(';');
             }
         }
     }
     skip(')');
     if (c == 0)
         tcc_error("%s", msg);
-    if (tok == ';') next();
+    skip(';');
 }
 #ifdef TCC_TARGET_PE
                 if (tok != ',') {
                     if (l == VT_JMP)
                         return has_init ? v : 1;
-                    if (l == VT_CMP)
+                    skip(';');
-                        skip(';');
-                    else if (tok == ';')
-                        next();
                     break;
                 }
                 next();

tests/tests2/60_errors_and_warnings.expect+1−1

@@ -179,7 +179,7 @@ bar : 3 ; 3 · 178 unmodified lines
179	60_errors_and_warnings.c:372: error: statement expression outside of function	179	60_errors_and_warnings.c:372: error: statement expression outside of function
180		180
181	[test_invalid_tokckill]	181	[test_invalid_tokckill]
182	60_errors_and_warnings.c:375: warning: function might return no value: 'f'	182	60_errors_and_warnings.c:375: error: ';' expected (got '3')
183		183
184	[test_duplicate_member]	184	[test_duplicate_member]
185	60_errors_and_warnings.c:381: error: duplicate member 'a'	185	60_errors_and_warnings.c:381: error: duplicate member 'a'

Revert commits from OpenCode-AI and a partial regression fix

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code