Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/pp-define.bas
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ private function hReadMacroText _
'' '##'?
case CHAR_SHARP
lexSkipToken( LEX_FLAGS )
lexSkipToken( LEX_FLAGS )
lexSkipToken( LEX_FLAGS or LEXCHECK_NOLINECONT)
continue do

'' '#' macro?
Expand Down
16 changes: 16 additions & 0 deletions src/compiler/pp.bas
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,14 @@ function ppReadLiteral _
case CHAR_SHARP
select case lexGetLookAhead( 1, (LEX_FLAGS or LEXCHECK_KWDNAMESPC) and _
(not LEXCHECK_NOWHITESPC) )
'' '##'?
case CHAR_SHARP
lexSkipToken( LEX_FLAGS )
lexSkipToken( LEX_FLAGS or LEXCHECK_NOLINECONT)
if *lexGetText( ) <> "_" then '' Is only '##_'?
DZstrConcatAssign( text, "##" )
end if

'' '#' macro?
case FB_TK_PP_MACRO
if( ismultiline ) then
Expand Down Expand Up @@ -689,6 +697,14 @@ function ppReadLiteralW _
case CHAR_SHARP
select case lexGetLookAhead( 1, (LEX_FLAGS or LEXCHECK_KWDNAMESPC) and _
(not LEXCHECK_NOWHITESPC) )
'' '##'?
case CHAR_SHARP
lexSkipToken( LEX_FLAGS )
lexSkipToken( LEX_FLAGS or LEXCHECK_NOLINECONT)
if *lexGetText( ) <> "_" then '' Is only '##_'?
DWstrConcatAssignA( text, "##" )
end if

'' '#' macro?
case FB_TK_PP_MACRO
if( ismultiline ) then
Expand Down