Skip to content

Commit

Permalink
Merge pull request mmikeww#259 from andymbody/240715_AMB_Fix_253b
Browse files Browse the repository at this point in the history 
240715_ AMB - Fix mmikeww#253 - quotes within quoted string
  • Loading branch information
@Banaanae
Banaanae authored Jul 16, 2024
2 parents e4849c9 + ae3aed1 commit 1480fac
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 50 deletions.
107 changes: 58 additions & 49 deletions ConvertFuncs.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Before_LineConverts(&code)
; convert and mask classes and functions
maskBlocks(&code) ; see MaskCode.ahk
}

return ; code by reference
}
;################################################################################
Expand All @@ -84,6 +85,7 @@ After_LineConverts(&code)
; inspect to see whether your code is best placed here or in FinalizeConvert()
; operations that must be performed last
FinalizeConvert(&code) ; perform all final operations

return ; code by reference
}

Expand All @@ -96,10 +98,10 @@ setGlobals()
; ... and so all code within script has access to these globals prior to _convertLines() call

global gUseMasking := 1 ; 2024-06-26 - set to 0 to test without masking applied
global gMenuBarName := "" ; 2024-07-02 - holds the name of the main gui menubar
global gAllFuncNames := "" ; 2024-07-07 - comma-deliminated string holding the names of all functions
global gAllV1LabelNames := "" ; 2024-07-09 - comma-deliminated string holding the names of all v1 labels
global gmAllLabelsV1toV2 := map() ; 2024-07-07 - map holding v1 labelNames (key) and their new v2 labelName (value)
global gMenuBarName := "" ; 2024-07-02 - holds the name of the main gui menubar
global gAllV1LabelNames := "" ; 2024-07-09 - comma-deliminated string holding the names of all v1 labels

global gaScriptStrsUsed := Array() ; Keeps an array of interesting strings used in the script
global gaList_PseudoArr := Array() ; list of strings that should be converted from pseudoArray to Array
Expand Down Expand Up @@ -127,11 +129,10 @@ setGlobals()
global gEOLComment_Func := "" ; _Funcs can use this to add comments at EOL
global gfrePostFuncMatch := False ; ... to know their regex matched
global gfNoSideEffect := False ; ... to not change global variables

global gLVNameDefault := "LV"
global gTVNameDefault := "TV"
global gSBNameDefault := "SB"
global gFuncParams
global gFuncParams := ""

global gAhkCmdsToRemove, gmAhkCmdsToConvert, gmAhkFuncsToConvert, gmAhkMethsToConvert
, gmAhkArrMethsToConvert, gmAhkKeywdsToRename, gmAhkLoopRegKeywds
Expand All @@ -144,26 +145,24 @@ _convertLines(ScriptString, finalize:=!gUseMasking) ; 2024-06-26 RENAMED to ac
{
; 2024-07-11 AMB, Globals are now declared/initialize in SetGlobals()...
; ... so that all functions can have access to them prior to this function being called
; ... this fixes masking issue with OnMessage
global gmAltLabel := GetAltLabelsMap(ScriptString) ; Create a map of labels who are identical
global gOrig_Line_NoComment := ""
; ... moving them fixes masking issue with OnMessage
global gmAltLabel := GetAltLabelsMap(ScriptString) ; Create a map of labels who are identical
global gOrig_ScriptStr := ScriptString
global gOScriptStr := "" ; array of all the lines
global gO_Index := 0 ; current index of the lines
global gOrig_Line_NoComment := ""
global gOScriptStr := StrSplit(ScriptString, "`n", "`r") ; array for all the lines
global gO_Index := 0 ; current index of the lines
global gIndentation := ""
global gSingleIndent := RegExMatch(ScriptString, "(^|[\r\n])( +|\t)", &gSingleIndent) ? gSingleIndent[2] : " " ; First spaces or single tab found.
global gNL_Func := "" ; _Funcs can use this to add New Previous Line
global gEOLComment_Func := "" ; _Funcs can use this to add comments at EOL

; Splashtexton and Splashtextoff is removed, but alternative gui code is available
global gSingleIndent := (RegExMatch(ScriptString, "(^|[\r\n])( +|\t)", &ws)) ? ws[2] : " " ; First spaces or single tab found
global gNL_Func := "" ; _Funcs can use this to add New Previous Line
global gEOLComment_Func := "" ; _Funcs can use this to add comments at EOL
global gaScriptStrsUsed

ScriptOutput := ""
lastLine := ""
InCommentBlock := false
InCont := 0
Cont_String := 0
gaScriptStrsUsed.ErrorLevel := InStr(ScriptString, "ErrorLevel")
gOScriptStr := StrSplit(ScriptString, "`n", "`r")

; parse each line of the input script
Loop
Expand Down Expand Up @@ -402,7 +401,7 @@ _convertLines(ScriptString, finalize:=!gUseMasking) ; 2024-06-26 RENAMED to ac
If (!RegexMatch(Line, "\h*\w+(\((?>[^)(]+|(?-1))*\))")) ; not a func
{
Line := Equation[1], val := Equation[2]
ConvertDblQuotesAMB(&Line, val)
ConvertDblQuotes2(&Line, val)
}
else if (InStr(RegExReplace(Line, "\w*(\((?>[^)(]+|(?-1))*\))"), '""'))
{
Expand All @@ -414,7 +413,7 @@ _convertLines(ScriptString, finalize:=!gUseMasking) ; 2024-06-26 RENAMED to ac
funcArray.push(match[])
val := StrReplace(val, match[], Chr(1000) "FUNC_" funcArray.Length Chr(1000),,, 1)
}
ConvertDblQuotesAMB(&Line, val)
ConvertDblQuotes2(&Line, val)
for i, v in funcArray {
Line := StrReplace(Line, Chr(1000) "FUNC_" i Chr(1000), v)
}
Expand Down Expand Up @@ -3991,11 +3990,12 @@ UpdateGotoFunc(ScriptString) ; the old UpdateGoto
for , v1Label in gaList_LblsToFuncC {
v2LabelName := getV2Name(v1Label) ; rename to v2 compatible without conflict
if InStr(line, v1Label)
retScript .= StrReplace(line, 'Goto("' v1Label '")', v2LabelName "()`r`n")
retScript .= StrReplace(line, 'Goto("' v1Label '")', v2LabelName "()`r`n")
else {
retScript .= line . "`r`n"
retScript .= line . "`r`n"
break
}
; retScript .= StrReplace(line, 'Goto("' v1Label '")', v2LabelName "()`r`n")
}
}
return RTrim(retScript, "`r`n") . happyTrails ; add back just the trailing CRLFs that code came in with
Expand Down Expand Up @@ -4055,7 +4055,7 @@ FixOnMessage(ScriptString) { ; TODO: If callback *still* isn't found, add this c
return RTrim(retScript, "`r`n") . happyTrails ; add back just the trailing CRLFs that code came in with
}
;################################################################################
ConvertDblQuotesAMB(&Line, eqRSide) {
ConvertDblQuotes2(&Line, eqRSide) {
; 2024-06-13 andymbody - ADDED/CHANGED
; provides conversion of double quotes (multiple styles)

Expand All @@ -4067,57 +4067,66 @@ ConvertDblQuotesAMB(&Line, eqRSide) {
m := []
while (pos := RegexMatch(eqRSide, '"``""', &m)) {
masks.push(m[])
eqRSide := StrReplace(eqRSide, m[], Chr(1000) "Q_" masks.Length Chr(1000),,, 1)
eqRSide := StrReplace(eqRSide, m[], Chr(0x2605) "Q_" masks.Length Chr(0x2605),,, 1)
}

; escaped quotes within a string ("" to `")
; escaped quotes within a string ("" to `" and """ to `"")
eqRSide := ConvertEscapedQuotesInStr(eqRSide)
; mask temporarily to avoid conflicts with other conversions below
m := []
while (pos := RegexMatch(eqRSide, '"``""', &m)) {
while (pos := RegexMatch(eqRSide, '``""?+', &m)) {
masks.push(m[])
eqRSide := StrReplace(eqRSide, m[], Chr(1000) "Q_" masks.Length Chr(1000),,, 1)
eqRSide := StrReplace(eqRSide, m[], Chr(0x2605) "Q_" masks.Length Chr(0x2605),,, 1)
}

; forced quotes around char-string
eqRSide := RegExReplace(eqRSide, '(")?("")([^"\v]+)("")(")?', '$1``"$3``"$5')
; remove masks
for i, v in masks
eqRSide := StrReplace(eqRSide, Chr(1000) "Q_" i Chr(1000), v)
eqRSide := StrReplace(eqRSide, Chr(0x2605) "Q_" i Chr(0x2605), v)

; update line with conversion
line .= eqRSide
return
}
;################################################################################
ConvertEscapedQuotesInStr(srcStr) {
; 2024-06-13 andymbody - ADDED
; convert each double quote found in srcStr ("" to `")
; 2024-06-13 AMB - ADDED
; 2024-07-15 AMB - UPDATED to fix issue 253
; escaped quotes within a string ("" to `" and """ to `"")

pos := 1, tempStr := ""
while (pos := RegExMatch(srcStr, '(?<!")"([^"\v]+""[^"\v]+)+"(?!")', &m, pos))
retStr := '', idx := 1, inStrg := 0
Loop
{
srcLen := StrLen(srcStr), curLen := StrLen(tempStr)
; add any chars that are to the left of the match
if (curLen=0)
tempStr .= SubStr(srcStr, 1, pos-1)
; add any chars that are between matches
if ((curLen > 0) && (curLen < srcLen))
tempStr .= SubStr(srcStr, curLen+1, (pos-curLen)-1)
; convert each "" to `"
qSplit := StrSplit(m[], '""') ; makes separation easy
for i, v in qSplit
tempStr .= ((A_Index=1) ? '' : '``"') . v
; set new search position (in case there is more than one string on line)
pos += m.len
}

; add any trailing chars
srcLen := StrLen(srcStr), curLen := StrLen(tempStr)
tempStr .= SubStr(srcStr, curLen+1, (srcLen-curLen)+1)

return (tempStr) ? tempStr : srcStr
; if reached end of string, exit loop
if (idx>StrLen(srcStr))
break

curChar := SubStr(srcStr, idx, 1) ; get next character

; if reached a DQ and not already in a quoted string, flag now in quoted string
if (curChar='"' && !inStrg) {
inStrg := 1, retStr .= curChar, idx++
}
; if reached a DQ and already in a quoted string, check for 3 DQs, convert if found, and flag close quoted string
else if (curChar='"' && inStrg && subStr(srcStr, idx, 3) = '"""') {
inStrg := 0, retStr .= '``""', idx+=3
}
; if reached a DQ and already in a quoted string, check for 2 DQs, convert if found
else if (curChar='"' && inStrg && subStr(srcStr, idx, 2) = '""') {
inStrg := 1, retStr .= '``"', idx+=2
}
; if reached a DQ and already in a quoted string, and none of the above are true, this should be the closing DQ
else if (curChar='"' && inStrg) {
inStrg := 0, retStr .= '"', idx++
}
; if not a DQ, just add char to return string
else {
retStr .= curChar, idx++
}
}
return retStr
}
;################################################################################
RemoveNewKeyword(line) {
Expand Down
3 changes: 2 additions & 1 deletion QuickConvertorV2.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,8 @@ GuiTest(strV1Script:="")
SB.SetParts(300, 300, 300) ; Create four parts in the bar (the fourth part fills all the remaining width).

; Add folders and their subfolders to the tree. Display the status in case loading takes a long time:
M := Gui("ToolWindow -SysMenu Disabled AlwaysOnTop", "Loading the tree..."), M.Show("w200 h0")
; M := Gui("ToolWindow -SysMenu Disabled AlwaysOnTop", "Loading the tree..."), M.Show("w200 h0")
M := Gui("ToolWindow -SysMenu Disabled", "Loading the tree..."), M.Show("w200 h0")

if TestFailing and TestMode{
DirList := AddSubFoldersToTree(A_ScriptDir "/tests", Map())
Expand Down
1 change: 1 addition & 0 deletions convert/1Commands.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
- use asterisk * and a function name to call, for custom processing when the params dont directly match up
*/

; SplashTextOn and SplashTextOff are removed, but alternative gui code is available
global gAhkCmdsToRemove := "
(
#AllowSameLineComments
Expand Down
6 changes: 6 additions & 0 deletions tests/Test_Folder/String/Quotes_Issue_253.ah1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var2 = failing
var := "MyTest = """ var2 """"
var3 := "MyTest = """ var2 """>"

MsgBox % var
MsgBox % var3
6 changes: 6 additions & 0 deletions tests/Test_Folder/String/Quotes_Issue_253.ah2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var2 := "failing"
var := "MyTest = `"" var2 "`""
var3 := "MyTest = `"" var2 "`">"

MsgBox(var)
MsgBox(var3)

0 comments on commit 1480fac

Please sign in to comment.