Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementing automatic includes #561

Merged
merged 12 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 6 additions & 3 deletions internal/c/libqb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1852,7 +1852,8 @@ void MAIN_LOOP(void *);
void GLUT_MAINLOOP_THREAD(void *);
void GLUT_DISPLAY_REQUEST();

extern qbs *WHATISMYIP();
extern qbs *FUNC__DECODEURL(qbs *_FUNC__DECODEURL_STRING__URL);
extern qbs *FUNC__WHATISMYIP();

int32 lprint = 0; // set to 1 during LPRINT operations
int32 lprint_image = 0;
Expand Down Expand Up @@ -13869,8 +13870,10 @@ long double func_val(qbs *s) {

case 'D':
case 'E':
case 'F':
case 'd':
case 'e':
case 'f':
if (step > 2)
goto finish;
step = 3;
Expand Down Expand Up @@ -23597,7 +23600,7 @@ qbs *func__connectionaddress(int32 i) {
qbs_set(str, qbs_new_txt("TCP/IP:")); // network type
qbs_set(str, qbs_add(str, qbs_ltrim(qbs_str(cs->port)))); // port
qbs_set(str, qbs_add(str, qbs_new_txt(":")));
tqbs2 = WHATISMYIP();
tqbs2 = FUNC__WHATISMYIP();
if (tqbs2->len) {
qbs_set(str, qbs_add(str, tqbs2));
} else {
Expand All @@ -23617,7 +23620,7 @@ qbs *func__connectionaddress(int32 i) {
else
qbs_set(str, qbs_add(str, qbs_new_txt("UNKNOWN")));

return str;
return FUNC__DECODEURL(str);

break;

Expand Down
270 changes: 0 additions & 270 deletions internal/c/myip.cpp

This file was deleted.

2 changes: 0 additions & 2 deletions internal/c/qbx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1774,8 +1774,6 @@ void evnt(uint32 linenumber, uint32 inclinenumber, const char *incfilename) {
uint8 *redim_preserve_cmem_buffer =
(uint8 *)malloc(65536); // used for temporary storage only (move to libqbx?)

#include "myip.cpp"

void division_by_zero_handler(int ignore) { error(11); }

// void SIGSEGV_handler(int ignore){
Expand Down
Empty file removed internal/source/autosave.bin
Empty file.
14 changes: 10 additions & 4 deletions internal/source/clear.txt
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,7 @@ __STRING_VWATCHVARIABLEEXCLUSIONS->len=0;
__STRING_NATIVEDATATYPES->len=0;
*__LONG_OPEX_RECOMPILEATTEMPTS=0;
*__LONG_OPEX_DESIREDSTATE=0;
*__LONG_OPEX_FORCEDSTATE=0;
*__LONG_OPEXARRAY_RECOMPILEATTEMPTS=0;
*__LONG_OPEXARRAY_DESIREDSTATE=0;
if (__ARRAY_LONG_EVERYCASESET[2]&1){
Expand Down Expand Up @@ -2220,6 +2221,8 @@ __STRING_CLEANUPSTRINGPROCESSINGCALL->len=0;
*__INTEGER_ADDMETASTATIC=0;
*__INTEGER_ADDMETADYNAMIC=0;
__STRING_ADDMETAINCLUDE->len=0;
*__INTEGER_AUTOINCLUDINGFILE=0;
*__INTEGER_AUTOINCFORCEUSCORE=0;
*__INTEGER_CLOSEDMAIN=0;
__STRING_MODULE->len=0;
__STRING_SUBFUNC->len=0;
Expand Down Expand Up @@ -2507,6 +2510,7 @@ __STRING_CURRENTDIR->len=0;
*__LONG_CLOSEALL=0;
*__LONG_BH=0;
*__LONG_LASTUNRESOLVED=0;
*__LONG_AUTOINCLUDEBUFFER=0;
*__LONG_F=0;
*__LONG_DYNAMICLIBRARY=0;
*__LONG_DIMMETHOD=0;
Expand Down Expand Up @@ -2612,8 +2616,7 @@ __ARRAY_STRING_WARNINGINCFILES[0]=(ptrszint)&nothingstring;
*__LONG_GLOBTXTBUF=0;
*__LONG_IDERECOMPILE=0;
__STRING_LINEBACKUP->len=0;
__STRING_FORCEINCLUDEFROMROOT->len=0;
*__LONG_ADDINGVWATCH=0;
*__LONG_NUL=0;
__STRING_WHOLESTV->len=0;
__STRING_TEMP->len=0;
*__LONG_TEMP=0;
Expand Down Expand Up @@ -2694,14 +2697,15 @@ __STRING_SYMBOL2->len=0;
*__LONG_PARAMSIZE=0;
*__LONG_I10=0;
__STRING_CTYPE->len=0;
__STRING_PWL->len=0;
*__INTEGER_APO=0;
*__INTEGER_CPO=0;
*__LONG_INCLUDINGFROMROOT=0;
*__LONG_FORCEINCLUDINGFILE=0;
*__LONG_FIRSTTRYMETHOD=0;
*__LONG_TRY=0;
__STRING_P->len=0;
__STRING_INCDAT->len=0;
*__LONG_INCPOS=0;
*__LONG_NUL=0;
__STRING_X->len=0;
*__LONG_DATABINBUF=0;
*__LONG_MAINTXTBUF=0;
Expand Down Expand Up @@ -2786,6 +2790,7 @@ __STRING_LIBPATH_INLINE->len=0;
__STRING_INLINELIBNAME->len=0;
__STRING_X2->len=0;
__STRING_DLLNAME->len=0;
__STRING_EORIG->len=0;
*__LONG_TARGETID=0;
__STRING_EE->len=0;
__STRING_SUBFUNCORIGINALNAME->len=0;
Expand Down Expand Up @@ -2997,6 +3002,7 @@ __STRING_NM_OUTPUT_FILE_DYNAMIC->len=0;
*__LONG_X1=0;
*__LONG_FFH=0;
*__LONG_QBERRORHAPPENEDVALUE=0;
*__LONG_ERLDIFF=0;
*_SUB_VWATCHVARIABLE_LONG_TOTALLOCALVARIABLES=0;
_SUB_VWATCHVARIABLE_STRING_LOCALVARIABLESLIST->len=0;
*_SUB_VWATCHVARIABLE_LONG_TOTALMAINMODULEVARIABLES=0;
Expand Down
Loading
Loading