Skip to content

Adjust the source code of the macro "__FB_ARG_EXTRACT__( index, args.…)" #311

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 17, 2021
Merged

Adjust the source code of the macro "__FB_ARG_EXTRACT__( index, args.…)" #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e04d14
Adjust the source code of the macro "__FB_ARG_EXTRACT__( index, args.…
skyfish4tb May 17, 2021
92e7013
fbc: Adjust the source code of the macro "__FB_ARG_EXTRACT__( index, …
jayrm May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Version 1.08.0
- Add new gfxlib2 API's fb_GfxControl_i32() and fb_GfxControl_i64()
- Change overload for SCREENCONTROL( byval as const long, byref as long = -2147483648, byref as long = -2147483648, byref as long = -2147483648, byref as long = -2147483648 )
- Add overload for SCREENCONTROL( byval as const long, byref as longint, byref as longint = -2147483648, byref as longint = -2147483648, byref as longint = -2147483648 )
- github #311: index argument in __FB_ARG_EXTRACT__( index, args... ) is evaluated as constant (Skyfish)

[added]
- extern "rtlib": respects the parent namespace, uses default fb calling convention and C style name mangling
Expand Down Expand Up @@ -122,7 +123,7 @@ Version 1.08.0
- github #246: rtlib leaks thread local data, fixed by adding TLS destructors (adeyblue)
- sf.net #918: pcopy (console) bug when copying large console buffers, windows only (adeyblue)
- github #216: function getMouse() seems broken on Win10 when using the Console Mode (screen 0), fixed by turn off the QuickEdit console mode during GetMouse (adeyblue)
- github #258: on windows directx and gdi drivers, only show window after indianization is complete (adeyblue)
- github #258: on windows directx and gdi drivers, only show window after initialisation is complete (adeyblue)
- sf.net #925: CSIGN/CUNSG preserve size when converting pointers on 64-bit and implicit conversion of STEP value in FOR...NEXT statement
- github #122: gfxlib2: linux GFX_NO_FRAME + GFX_OPENGL freezing at exit due to a dead lock between exit routines
- sf.net #914: threadsafe RND() and RANDOMIZE() by adding a mutex
Expand Down
157 changes: 85 additions & 72 deletions src/compiler/symb-define.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,84 @@ private function hMacro_getArgW( byval argtb as LEXPP_ARGTB ptr, byval num as in

end function

private function hMacro_Eval( byval arg as zstring ptr) as string

'' the expression should have already been handled in hLoadMacro|hLoadMacroW
'' so, if we do get here, just pass the argument back as-is
var res = ""

if( arg ) then

'' create a lightweight context push for the lexer
'' like an include file, but no include file
'' text to expand is to be loaded in LEX.CTX->DEFTEXT[W]
'' use the parser to build an AST for the literal result

lexPushCtx()
lexInit( FALSE, TRUE )

'' prevent cExpression from writing to .pp.bas file
lex.ctx->reclevel += 1

DZstrAssign( lex.ctx->deftext, *arg )
lex.ctx->defptr = lex.ctx->deftext.data
lex.ctx->deflen += len( *arg )

'' Add an end of expression marker so that the parser
'' doesn't read past the end of the expression text
'' by appending an LFCHAR to the end of the expression
'' It would be better to use the explicit EOF character,
'' but we can't appened an extta NULL character to a zstring

DZstrConcatAssign( lex.ctx->deftext, LFCHAR )
lex.ctx->defptr = lex.ctx->deftext.data
lex.ctx->deflen += len( LFCHAR )

dim expr as ASTNODE ptr = cExpression( )
var errmsg = FB_ERRMSG_OK

if( expr <> NULL ) then
expr = astOptimizeTree( expr )

if( astIsCONST( expr ) ) then
res = astConstFlushToStr( expr )

'' any tokens still in the buffer? cExpression() should have used them all
if( lexGetToken( ) <> FB_TK_EOL ) then
errmsg = FB_ERRMSG_SYNTAXERROR
end if
elseif( astIsConstant( expr ) ) then
res = """" + hReplace( expr->sym->var_.littext, QUOTE, QUOTE + QUOTE ) + """"

'' any tokens still in the buffer? cExpression() should have used them all
if( lexGetToken( ) <> FB_TK_EOL ) then
errmsg = FB_ERRMSG_SYNTAXERROR
end if
else
astDelTree( expr )
errmsg = FB_ERRMSG_EXPECTEDCONST
res = str(0)
end if
else
errmsg = FB_ERRMSG_SYNTAXERROR
end if

lex.ctx->reclevel -= 1

lexPopCtx()

if( errmsg <> FB_ERRMSG_OK ) then
errReportEx( errmsg, *arg )
'' error recovery: skip until next line (in the buffer)
hSkipUntil( FB_TK_EOL, TRUE )
end if

end if

function = res

end function

private function hDefUniqueIdPush_cb( byval argtb as LEXPP_ARGTB ptr, byval errnum as integer ptr ) as string

'' __FB_UNIQUEID_PUSH__( STACKID )
Expand Down Expand Up @@ -357,14 +435,17 @@ private function hDefArgExtract_cb( byval argtb as LEXPP_ARGTB ptr, byval errnum
'' Val returns 0 on failure which we can't detect from a valid 0
'' so check and construct the number manually

dim numArgLen as Long = Len(*numStr), i as Long, index as ULong = 0
dim as string varstr = hMacro_Eval(numStr)
var pnumStr = strptr(varstr)

dim numArgLen as Long = Len(*pnumStr), i as Long, index as ULong = 0
dim zeroVal As ULong = Asc("0")
For i = 0 To numArgLen - 1
if( Not hIsCharNumeric(numStr[i]) ) then
if( Not hIsCharNumeric(pnumStr[i]) ) then
Exit For
End If
index *= 10
index += (numStr[i] - zeroVal)
index += (pnumStr[i] - zeroVal)
Next
If i = numArgLen Then
dim numVarArgs As ULong = argtb->count - 1
Expand Down Expand Up @@ -641,75 +722,7 @@ private function hDefEval_cb( byval argtb as LEXPP_ARGTB ptr, byval errnum as in
'' so, if we do get here, just pass the argument back as-is

var arg = hMacro_getArgZ( argtb, 0 )
var res = ""

if( arg ) then

'' create a lightweight context push for the lexer
'' like an include file, but no include file
'' text to expand is to be loaded in LEX.CTX->DEFTEXT[W]
'' use the parser to build an AST for the literal result

lexPushCtx()
lexInit( FALSE, TRUE )

'' prevent cExpression from writing to .pp.bas file
lex.ctx->reclevel += 1

DZstrAssign( lex.ctx->deftext, *arg )
lex.ctx->defptr = lex.ctx->deftext.data
lex.ctx->deflen += len( *arg )

'' Add an end of expression marker so that the parser
'' doesn't read past the end of the expression text
'' by appending an LFCHAR to the end of the expression
'' It would be better to use the explicit EOF character,
'' but we can't appened an extta NULL character to a zstring

DZstrConcatAssign( lex.ctx->deftext, LFCHAR )
lex.ctx->defptr = lex.ctx->deftext.data
lex.ctx->deflen += len( LFCHAR )

dim expr as ASTNODE ptr = cExpression( )
var errmsg = FB_ERRMSG_OK

if( expr <> NULL ) then
expr = astOptimizeTree( expr )

if( astIsCONST( expr ) ) then
res = astConstFlushToStr( expr )

'' any tokens still in the buffer? cExpression() should have used them all
if( lexGetToken( ) <> FB_TK_EOL ) then
errmsg = FB_ERRMSG_SYNTAXERROR
end if
elseif( astIsConstant( expr ) ) then
res = """" + hReplace( expr->sym->var_.littext, QUOTE, QUOTE + QUOTE ) + """"

'' any tokens still in the buffer? cExpression() should have used them all
if( lexGetToken( ) <> FB_TK_EOL ) then
errmsg = FB_ERRMSG_SYNTAXERROR
end if
else
astDelTree( expr )
errmsg = FB_ERRMSG_EXPECTEDCONST
res = str(0)
end if
else
errmsg = FB_ERRMSG_SYNTAXERROR
end if

lex.ctx->reclevel -= 1

lexPopCtx()

if( errmsg <> FB_ERRMSG_OK ) then
errReportEx( errmsg, *arg )
'' error recovery: skip until next line (in the buffer)
hSkipUntil( FB_TK_EOL, TRUE )
end if

end if
var res = hMacro_Eval(arg)

ZstrFree(arg)

Expand Down