beautifier now replace C_xxx by var … : xx

.github/workflows/build.yml

@@ -10,15 +10,20 @@ on:
 
 jobs:
   build:
-    name: "Build"
-    runs-on: windows-latest
+    name: "Build on ${{ matrix.os }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-latest, windows-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Build
       uses: 4d/build4d-action@main
       with:
         product-line: vcs
         version: vcs
         build: official
         token: ${{ secrets.DLTK }}
+

Build/Components/4DPop Macros.4dbase/Info.plist

@@ -6,15 +6,15 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>286</string>
+    <string>287</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2024</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R6 (285)</string>
+    <string>20R7 (286)</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Macros</string>
   </dict>

Info.plist

@@ -6,15 +6,15 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>286</string>
+    <string>287</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2024</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R6 (285)</string>
+    <string>20R7 (286)</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Macros</string>
   </dict>

Project/4DPop Macros.4DProject

@@ -1,4 +1,4 @@
 {
 	"$comment": "The project file let you override the location for most folders",
-	"$4DPopAppMakerToolVersion": "20R6"
+	"$4DPopAppMakerToolVersion": "20R7"
 }

Project/Sources/Classes/beautifier.4dm

@@ -147,6 +147,20 @@ Function beautify()
 
 	End if 
 
+	// Mark:Use var instead of (_o_)C_xxx
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(604)+"\\(([^\\)]*)\\)").substitute("var \\1 : Blob")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(305)+"\\(([^\\)]*)\\)").substitute("var \\1 : Boolean")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1488)+"\\(([^\\)]*)\\)").substitute("var \\1 : Collection")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(307)+"\\(([^\\)]*)\\)").substitute("var \\1 : Date")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(283)+"\\(([^\\)]*)\\)").substitute("var \\1 : Integer")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1216)+"\\(([^\\)]*)\\)").substitute("var \\1 : Object")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(286)+"\\(([^\\)]*)\\)").substitute("var \\1 : Picture")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(301)+"\\(([^\\)]*)\\)").substitute("var \\1 : Pointer")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(285)+"\\(([^\\)]*)\\)").substitute("var \\1 : Real")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(284)+"\\(([^\\)]*)\\)").substitute("var \\1 : Text")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(306)+"\\(([^\\)]*)\\)").substitute("var \\1 : Time")
+	$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1683)+"\\(([^\\)]*)\\)").substitute("var \\1")
+
 	// Mark:Delete empty lines at the beginning of the method
 	If (Bool:C1537($options.removeEmptyLinesAtTheBeginOfMethod))
 

Project/Sources/dependencies.json

@@ -1,21 +1,68 @@
 {
   "dependencies": {
-    "4DPop": {},
-    "4DPop AppMaker": {},
-    "4DPop Bookmarks": {},
-    "4DPop Clipboard": {},
-    "4DPop ColorChart": {},
-    "4DPop Commands": {},
-    "4DPop Constants Editor": {},
-    "4DPop Git": {},
-    "4DPop Image Buddy": {},
-    "4DPop KeepIt": {},
-    "4DPop Macros": {},
-    "4DPop Pasteboard": {},
-    "4DPop QuickOpen": {},
-    "4DPop Rulers": {},
-    "4DPop sqlSchemas": {},
-    "4DPop Window": {},
-    "4DPop XLIFF Pro": {}
+    "4DPop": {
+      "github": "vdelachaux/4DPop",
+      "version": "latest"
+    },
+    "4DPop AppMaker": {
+      "github": "vdelachaux/4DPop-AppMaker",
+      "version": "latest"
+    },
+    "4DPop Git": {
+      "github": "vdelachaux/4DPop-Git",
+      "version": "latest"
+    },
+    "4DPop Macros": {
+      "github": "vdelachaux/4DPop-Macros",
+      "version": "latest"
+    },
+    "4DPop QuickOpen": {
+      "github": "vdelachaux/4DPop-QuickOpen",
+      "version": "latest"
+    },
+    "4DPop XLIFF Pro": {
+      "github": "vdelachaux/4DPop-XLIFF-Pro",
+      "version": "latest"
+    },
+    "4DPop Bookmarks": {
+      "github": "vdelachaux/4DPop-Bookmarks",
+      "version": "latest"
+    },
+    "4DPop ColorChart": {
+      "github": "vdelachaux/4DPop-ColorChart",
+      "version": "latest"
+    },
+    "4DPop Commands": {
+      "github": "vdelachaux/4DPop-Commands",
+      "version": "latest"
+    },
+    "4DPop Constants Editor": {
+      "github": "vdelachaux/4DPop-Constants-Editor",
+      "version": "latest"
+    },
+    "4DPop Image Buddy": {
+      "github": "vdelachaux/4DPop-Image-Buddy",
+      "version": "latest"
+    },
+    "4DPop KeepIt": {
+      "github": "vdelachaux/4DPop-KeepIt",
+      "version": "latest"
+    },
+    "4DPop Pasteboard": {
+      "github": "vdelachaux/4DPop-Pasteboard",
+      "version": "latest"
+    },
+    "4DPop Rulers": {
+      "github": "vdelachaux/4DPop-Rulers",
+      "version": "latest"
+    },
+    "4DPop sqlSchemas": {
+      "github": "vdelachaux/4DPop-sqlSchemas",
+      "version": "latest"
+    },
+    "4DPop Window": {
+      "github": "vdelachaux/4DPop-Window",
+      "version": "latest"
+    }
   }
 }