Skip to content

fix: strtran, execscript, set #1980

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
RobertvanderHulst merged 1 commit into from
Jun 8, 2026
+25 −4
Merged

fix: strtran, execscript, set #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/Runtime/XSharp.VFP/LanguageCoreWrappers.prg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,15 @@ FUNCTION Occurs(uSearch AS STRING, cTarget AS STRING) AS DWORD
/// <include file="VfpRuntimeDocs.xml" path="Runtimefunctions/strtran/*" />
[FoxProFunction("STRTRAN", FoxFunctionCategory.StringAndCharacter, FoxEngine.LanguageCore, FoxFunctionStatus.Full, FoxCriticality.High)];
FUNCTION StrTran(uTarget, uSearch, uReplace, uStart, uCount) AS STRING CLIPPER
RETURN XSharp.RT.Functions.StrTran(uTarget, uSearch, uReplace, uStart, uCount)
switch PCount()
case 3
RETURN XSharp.RT.Functions.StrTran(uTarget, uSearch, uReplace)
case 4
RETURN XSharp.RT.Functions.StrTran(uTarget, uSearch, uReplace, uStart)
case 5
RETURN XSharp.RT.Functions.StrTran(uTarget, uSearch, uReplace, uStart, uCount)
end switch
RETURN XSharp.RT.Functions.StrTran(uTarget, uSearch, uReplace)

/// <include file="VfpRuntimeDocs.xml" path="Runtimefunctions/val/*" />
[FoxProFunction("VAL", FoxFunctionCategory.MathAndNumeric, FoxEngine.LanguageCore, FoxFunctionStatus.Full, FoxCriticality.High)];
Expand Down
12 changes: 11 additions & 1 deletion src/Runtime/XSharp.VFP/MacroWrappers.prg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ FUNCTION Evaluate(cString AS STRING) AS USUAL
/// <include file="VfpDocs.xml" path="Runtimefunctions/execscript/*" />
[FoxProFunction("EXECSCRIPT", FoxFunctionCategory.General, FoxEngine.Macro, FoxFunctionStatus.Partial, FoxCriticality.High)];
FUNCTION ExecScript(cExpression, eParameter1, eParameter2, eParameterN) AS USUAL CLIPPER
RETURN XSharp.RT.Functions.ExecScript(cExpression, eParameter1, eParameter2, eParameterN)
switch PCount()
case 1
RETURN XSharp.RT.Functions.ExecScript(cExpression)
case 2
RETURN XSharp.RT.Functions.ExecScript(cExpression, eParameter1)
case 3
RETURN XSharp.RT.Functions.ExecScript(cExpression, eParameter1, eParameter2)
case 4
RETURN XSharp.RT.Functions.ExecScript(cExpression, eParameter1, eParameter2, eParameterN)
end switch
RETURN XSharp.RT.Functions.ExecScript(cExpression)

/// <include file="VfpRuntimeDocs.xml" path="Runtimefunctions/type/*" />
[NeedsAccessToLocals(FALSE)];
Expand Down
7 changes: 5 additions & 2 deletions src/Runtime/XSharp.VFP/RuntimeCoreWrappers.prg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,8 @@ FUNCTION OemToAnsi(cOemString AS STRING) AS STRING

/// <include file="VfpRuntimeDocs.xml" path="Runtimefunctions/set/*" />
[FoxProFunction("SET", FoxFunctionCategory.EnvironmentAndSystem, FoxEngine.RuntimeCore, FoxFunctionStatus.Full, FoxCriticality.High)];
FUNCTION Set(cSETCommand AS USUAL, newValue AS USUAL) AS USUAL
RETURN XSharp.RT.Functions.Set(cSETCommand, newValue)
FUNCTION Set(cSETCommand, newValue) AS USUAL CLIPPER
IF PCount() > 1
RETURN XSharp.RT.Functions.Set(cSETCommand, newValue)
ENDIF
RETURN XSharp.RT.Functions.Set(cSETCommand)
Loading