Merge Changes from Irwin. Correct changed case of keywords.

Merged some changes from Robert too

Author: RobertvanderHulst

src/Runtime/MacroCompiler/MacroCompiler.csproj

@@ -36,7 +36,7 @@
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
-	<NoWarn>1591</NoWarn>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">

src/Runtime/XSharp.Core/State/EnumSet.prg

@@ -24,7 +24,12 @@ FUNCTION SetAmPm() AS LOGIC
 
 /// <include file="VoFunctionDocs.xml" path="Runtimefunctions/setampm/*" />
 FUNCTION SetAmPm(lNewSetting AS LOGIC) AS LOGIC
-    SETSTATE LOGIC Set.AmPm lNewSetting
+    LOCAL lOld AS LOGIC
+    lOld := RuntimeState.GetValue<LOGIC>(Set.AmPm)
+    XSharp.RuntimeState.SetValue<LOGIC>(Set.AmPm, lNewSetting)
+    RuntimeState.SetValue<LONG>(Set.Hours, IIF(lNewSetting, 12, 24))
+    return lOld
+
 
 /// <include file="VoFunctionDocs.xml" path="Runtimefunctions/setansi/*" />
 FUNCTION SetAnsi() AS LOGIC
@@ -154,19 +159,19 @@ FUNCTION SetDefault(cPathSpec AS STRING) AS STRING
     SetPathArray(NULL)
     IF XSharp.RuntimeState.Dialect == XSharpDialect.FoxPro
         VAR cTemp := cPathSpec:Trim()
-        IF !String.IsNullOrEmpty(cTemp)
+        if !String.IsNullOrEmpty(cTemp)
             IF cTemp:EndsWith(System.IO.Path.DirectorySeparatorChar:ToString())
                 cTemp := cTemp:Substring(0, cTemp:Length-1)
             ENDIF
             IF ! System.IO.Directory.Exists(cTemp)
-                VAR err := Error.VOError(EG_ARG, __FUNCTION__, nameof(cPathSpec),1, <OBJECT>{cPathSpec})
+                var err := Error.VOError(EG_ARG, __FUNCTION__, nameof(cPathSpec),1, <OBJECT>{cPathSpec})
                 err:Description := "Directory not found: '"+cPathSpec+"'"
                 THROW err
             ENDIF
-        ENDIF
+        endif
     ELSEIF XSharp.RuntimeState.Dialect == XSharpDialect.VO .or. XSharp.RuntimeState.Dialect == XSharpDialect.Vulcan
         IF cPathSpec:Length > 0
-            VAR cLast := cPathSpec[cPathSpec:Length-1]
+            var cLast := cPathSpec[cPathSpec:Length-1]
             SWITCH cLast
             CASE c':'
             CASE c'\\'
@@ -601,8 +606,12 @@ FUNCTION SetHours() AS LONG
 
 /// <include file="VoFunctionDocs.xml" path="Runtimefunctions/sethours/*" />
 FUNCTION SetHours(tnHours AS LONG) AS LONG
-	LOCAL nOld := RuntimeState.GetValue<LONG>(Set.Hours) AS LONG
-	RuntimeState.SetValue<LONG>(Set.Hours, tnHours)
+    LOCAL nOld := RuntimeState.GetValue<LONG>(Set.Hours) AS LONG
+    IF tnHours != 12 .AND. tnHours != 24
+        THROW Error.ArgumentError(__ENTITY__, NAMEOF(tnHours), "Invalid hours setting: "+tnHours:ToString())
+    ENDIF
+    RuntimeState.SetValue<LONG>(Set.Hours, tnHours)
+    RuntimeState.SetValue<LOGIC>(Set.AmPm, tnHours == 12)
 	RETURN nOld
 
 /// <summary>Get/Set seconds display</summary>

src/Runtime/XSharp.Core/State/Set.prg

@@ -767,11 +767,13 @@ CLASS XSharp.RuntimeState
             IF format:EndsWith("TT")
 		        SELF:_SetThreadValue(Set.AmExt, "AM")
 		        SELF:_SetThreadValue(Set.PmExt, "PM")
-		        SELF:_SetThreadValue(Set.AmPm, TRUE)
+                SELF:_SetThreadValue(Set.AmPm, TRUE)
+                SELF:_SetThreadValue(Set.Hours, 12L)
             ELSE
 		        SELF:_SetThreadValue(Set.AmExt, "")
 		        SELF:_SetThreadValue(Set.PmExt, "")
-		        SELF:_SetThreadValue(Set.AmPm, FALSE)
+                SELF:_SetThreadValue(Set.AmPm, FALSE)
+                SELF:_SetThreadValue(Set.Hours, 24L)
             ENDIF
             SELF:_SetThreadValue(Set.Timesep, Asc(SubStr3(format, 3,1)))
             SELF:_SetThreadValue(Set.Timeformat, format)
@@ -821,8 +823,10 @@ CLASS XSharp.RuntimeState
 			SELF:_SetThreadValue(Set.Timesep, (DWORD) 0)
 		ELSE
 			SELF:_SetThreadValue(Set.Timesep, (DWORD) separator[0])
-		ENDIF
-		SELF:_SetThreadValue(Set.AmPm, dtInfo:ShortDatePattern:IndexOf("tt") != -1)
+        ENDIF
+        Var lAmPm := dtInfo:ShortDatePattern:IndexOf("tt") != -1
+        SELF:_SetThreadValue(Set.AmPm, lAmPm)
+        SELF:_SetThreadValue(Set.Hours, iif(lAmPm, 12L, 24L))
         SELF:_SetThreadValue(Set.Timeformat, dtInfo:LongTimePattern)
 
     INTERNAL METHOD _SetDateFormatSystem() AS VOID

src/Runtime/XSharp.Core/State/State.prg

@@ -3,24 +3,24 @@
 // Licensed under the Apache License, Version 2.0.
 // See License.txt in the project root for license information.
 //
-using System
-using System.Collections.Generic
-using System.Linq
-using System.Text
-using XUnit
+USING System
+USING System.Collections.Generic
+USING System.Linq
+USING System.Text
+USING XUnit
 
 
 // Array tests are not working correctly yet with the current build
-begin namespace XSharp.VFP.Tests
+BEGIN NAMESPACE XSharp.VFP.Tests
 
-	class DateTests
-	    static constructor
+	CLASS DateTests
+	    STATIC CONSTRUCTOR
             XSharp.RuntimeState.Dialect := XSharpDialect.FoxPro
 
 		[Fact, Trait("Category", "Date and Time")];
-		method ConversionTests() as void
-            local d as date
-            local dt as DateTime
+		METHOD ConversionTests() AS VOID
+            LOCAL d AS DATE
+            LOCAL dt AS DateTime
             dt := DateTime{2020,1,1,11,12,13}
 
             Assert.Equal(11, Hour(dt))
@@ -33,7 +33,7 @@ begin namespace XSharp.VFP.Tests
 
 
 		[Fact, Trait("Category", "Date and Time")];
-            method QuarterTests() as void
+            METHOD QuarterTests() AS VOID
             Assert.Equal( Quarter ( ConDate ( 2020, 1 , 1  ) ) , 1 )
             Assert.Equal( Quarter ( ConDate ( 2020, 2 , 1  ) ) , 1 )
             Assert.Equal( Quarter ( ConDate ( 2020, 3 , 1  ) ) , 1 )
@@ -88,7 +88,7 @@ begin namespace XSharp.VFP.Tests
             Assert.Equal( Quarter ( 2020.04.20 ) , 2         )
 
 		[Fact, Trait("Category", "Date and Time")];
-            method GoMonthTests() as void
+            METHOD GoMonthTests() AS VOID
 
             Assert.Equal(GoMonth ( NULL_DATE , -12 ) , NULL_DATE)
             Assert.Equal(GoMonth ( DateTime{} , -12 ) , NULL_DATE)
@@ -100,7 +100,7 @@ begin namespace XSharp.VFP.Tests
             Assert.Equal(GoMonth({^1998-12-31}, -2) , ConDate ( 1998 , 10 , 31  ) )
 
 		[Fact, Trait("Category", "Date and Time")];
-            method WeekTests() as void
+            METHOD WeekTests() AS VOID
                 Assert.Equal(Week(1998.02.16)  , 8)
                 Assert.Equal(Week(1998.02.16,1,1)  , 8)
                 Assert.Equal(Week(2010.01.03,2,4)  , 1)
@@ -113,7 +113,8 @@ begin namespace XSharp.VFP.Tests
 	// ---------------------------------------------------------------- //
 	[Fact, Trait("Category", "Date and Time")];
 	method TToCTests as void
-	    local dt as DateTime
+        local dt as DateTime
+        SetHours(12) // set 12 hours format for time tests
 	    dt := DateTime{2025, 8, 13, 14, 30, 45}
 
 	    // 0 - numeric format (same as param 1)
@@ -186,6 +187,7 @@ begin namespace XSharp.VFP.Tests
 	[Fact, Trait("Category", "Date and Time")];
 	method TToCEdgeCasesTests as void
 	  // midnight
+      SetHours(12)
 	  local midnight := DateTime{2025, 8, 13, 0, 0, 0} as DateTime
 	  Assert.Equal("12:00:00 AM", TToC(midnight, 2))
 
@@ -274,7 +276,7 @@ begin namespace XSharp.VFP.Tests
 	method TToCDateOnlyTests as void
 	  // try DATE no time
 	  local d := DateTime{2025, 8, 13} as DateTime
-
+      SetHours(12)
 	  // numeric format with date and no time
 	  local numericResult := TToC(d, 1) as string
 	  Assert.True(numericResult:StartsWith("20250813"))

src/Runtime/XSharp.VFP.Tests/DateTests.prg

@@ -50,6 +50,8 @@
     METHOD RemoveProperty(cPropertyName AS STRING) AS LOGIC
         RETURN SELF:_RemoveProperty(cPropertyName)
 
+    METHOD HasProperty(cPropertyName AS STRING) AS LOGIC
+         RETURN _Properties:HasProperty(cPropertyName)
     #endregion
 
 

src/Runtime/XSharp.VFP.UI/XSharp/VFPProperties.xh

@@ -23,3 +23,11 @@ function RemoveProperty( oObjectName as object, cPropertyName as string) as logi
     ENDIF
     RETURN TRUE
 
+
+/// <include file="VFPRuntimeDocs.xml" path="Runtimefunctions/getpem/*" />
+FUNCTION GETPEM( uObject as USUAL, cProperty as STRING) as USUAL
+    if uObject is string var strObject
+        return NIL
+    endif
+    return IVarGet(uObject, cProperty)
+

src/Runtime/XSharp.VFP/ClassFunctions.prg

@@ -49,7 +49,12 @@ begin namespace XSharp.VFP
 
         #region Nested Items
 
-        method AddObject(cName as string , oObject as object) as logic
+        method AddObject(cName as string , cClassName as string, cOleClass := "" as string, aInitParams PARAMS USUAL[]) as logic
+            local oObject as Object
+            oObject := CreateInstance(cClassName, aInitParams)
+            if ! SELF:Properties:HasProperty(cName)
+                self:_AddProperty(cName, oObject, PropertyVisibility.Public, "")
+            endif
             self:NoIvarPut(cName, oObject)
             self:_Controls:Add(oObject, cName)
             return true

src/Runtime/XSharp.VFP/Classes/Custom.prg

@@ -201,6 +201,8 @@ class XSharp.VFP.PropertyContainer IMPLEMENTS IEnumerable<NameValuePair>
      method IEnumerable.GetEnumerator() AS IEnumerator
         var props := SELF:GetProperties()
         return props:GetEnumerator()
+    method HasProperty(cPropertyName as string) as logic
+        return _Properties:ContainsKey(cPropertyName)
 end class
 
 public class XSharp.VFP.PropertyDescriptor