Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 19:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix getchar() helper

Browse Source 
The getchar() function is defined as a macro in uClibc, raising the
next following errors:

>>> pocketpy 2.0.8 Building
GIT_DIR=. PATH="/builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/host/bin:/builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"  /usr/bin/cmake --build /builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/ -j3 --
[ 50%] Building C object CMakeFiles/pocketpy.dir/Unity/unity_pocketpy_c.c.o
In file included from /builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/host/arc-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:71,
                 from /builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/include/pocketpy/common/utils.h:3,
                 from /builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/include/pocketpy/common/str.h:4,
                 from /builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/include/pocketpy/common/smallmap.h:4,
                 from /builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/src/common/smallmap.c:1,
                 from /builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/CMakeFiles/pocketpy.dir/Unity/unity_pocketpy_c.c:9:
/builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/src/interpreter/vm.c: In function ‘py_replinput’:
/builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/src/interpreter/vm.c:813:42: error: expected identifier before ‘(’ token
  813 |         int c = pk_current_vm->callbacks.getchar();
      |                                          ^~~~~~~
/builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/src/interpreter/vm.c:813:42: error: expected statement before ‘)’ token
  813 |         int c = pk_current_vm->callbacks.getchar();
      |                                          ^~~~~~~
/builds/jolivain/buildroot/br-test-pkg/bootlin-arcle-hs38-uclibc/build/pocketpy-2.0.8/src/interpreter/vm.c:813:42: error: expected statement before ‘)’ token
  813 |         int c = pk_current_vm->callbacks.getchar();

Link: https://gitlab.com/jolivain/buildroot/-/pipelines/1847795347
Link: https://gitlab.com/jolivain/buildroot/-/jobs/10217736977
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
This commit is contained in:
Dario Binacchi 2025-06-04 12:31:19 +02:00
parent a0bd1a3f3b
commit f8728223af
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pocketpy/pocketpy.h
View File

@ -71,7 +71,7 @@ typedef struct py_Callbacks {
/// Flush the output buffer of `print`. /// Flush the output buffer of `print`.
void (*flush)(); void (*flush)();
/// Used by `input` to get a character. /// Used by `input` to get a character.
int (*getchar)(); int (*getch)();
} py_Callbacks; } py_Callbacks;
/// Native function signature. /// Native function signature.

4
src/interpreter/vm.c
View File

@ -76,7 +76,7 @@ void VM__ctor(VM* self) {
self->callbacks.importfile = pk_default_importfile; self->callbacks.importfile = pk_default_importfile;
self->callbacks.print = pk_default_print; self->callbacks.print = pk_default_print;
self->callbacks.flush = pk_default_flush; self->callbacks.flush = pk_default_flush;
self->callbacks.getchar = getchar; self->callbacks.getch = getchar;
self->last_retval = *py_NIL(); self->last_retval = *py_NIL();
self->curr_exception = *py_NIL(); self->curr_exception = *py_NIL();
@ -822,7 +822,7 @@ int py_replinput(char* buf, int max_size) {
printf(">>> "); printf(">>> ");
while(true) { while(true) {
int c = pk_current_vm->callbacks.getchar(); int c = pk_current_vm->callbacks.getch();
if(c == EOF) return -1; if(c == EOF) return -1;
if(c == '\n') { if(c == '\n') {

2
src/public/modules.c
View File

@ -205,7 +205,7 @@ static bool builtins_input(int argc, py_Ref argv) {
c11_sbuf buf; c11_sbuf buf;
c11_sbuf__ctor(&buf); c11_sbuf__ctor(&buf);
while(true) { while(true) {
int c = py_callbacks()->getchar(); int c = py_callbacks()->getch();
if(c == '\n' || c == '\r') break; if(c == '\n' || c == '\r') break;
if(c == EOF) break; if(c == EOF) break;
c11_sbuf__write_char(&buf, c); c11_sbuf__write_char(&buf, c);