Skip to content

Commit ee29865

Browse files
vdelachauxvdelachaux
committed
beautifier now replace C_xxx by var … : xx
1 parent ec74d91 commit ee29865

File tree

12 files changed

+95
-29
lines changed

12 files changed

+95
-29
lines changed

‎.github/workflows/build.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@ on:
1010

1111
jobs:
1212
build:
13-
name: "Build"
14-
runs-on: windows-latest
13+
name: "Build on ${{ matrix.os }}"
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
os: [ macos-latest, windows-latest ]
18+
runs-on: ${{ matrix.os }}
1519
steps:
1620
- name: Checkout
17-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
1822
- name: Build
1923
uses: 4d/build4d-action@main
2024
with:
2125
product-line: vcs
2226
version: vcs
2327
build: official
2428
token: ${{ secrets.DLTK }}
29+

‎Build/4DPop-Macros.dmg

133 KB
Binary file not shown.

‎Build/4DPop-Macros.zip

4.29 KB
Binary file not shown.

‎Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ

-4.06 KB
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<key>CFBundleName</key>
77
<string>4DPop Macros</string>
88
<key>CFBundleVersion</key>
9-
<string>286</string>
9+
<string>287</string>
1010
<key>NSHumanReadableCopyright</key>
1111
<string>©vdl 2009-2024</string>
1212
<key>CFBundleGetInfoString</key>
13-
<string>20R6</string>
13+
<string>20R7</string>
1414
<key>CFBundleLongVersionString</key>
15-
<string>20R6 (285)</string>
15+
<string>20R7 (286)</string>
1616
<key>CFBundleShortVersionString</key>
17-
<string>20R6</string>
17+
<string>20R7</string>
1818
<key>CFBundleDisplayName</key>
1919
<string>4DPop Macros</string>
2020
</dict>

‎Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib

16.8 KB
Binary file not shown.

‎Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings

0 Bytes
Binary file not shown.

‎Info.plist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<key>CFBundleName</key>
77
<string>4DPop Macros</string>
88
<key>CFBundleVersion</key>
9-
<string>286</string>
9+
<string>287</string>
1010
<key>NSHumanReadableCopyright</key>
1111
<string>©vdl 2009-2024</string>
1212
<key>CFBundleGetInfoString</key>
13-
<string>20R6</string>
13+
<string>20R7</string>
1414
<key>CFBundleLongVersionString</key>
15-
<string>20R6 (285)</string>
15+
<string>20R7 (286)</string>
1616
<key>CFBundleShortVersionString</key>
17-
<string>20R6</string>
17+
<string>20R7</string>
1818
<key>CFBundleDisplayName</key>
1919
<string>4DPop Macros</string>
2020
</dict>

‎Project/4DPop Macros.4DProject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$comment": "The project file let you override the location for most folders",
3-
"$4DPopAppMakerToolVersion": "20R6"
3+
"$4DPopAppMakerToolVersion": "20R7"
44
}

‎Project/Sources/Classes/beautifier.4dm

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,20 @@ Function beautify()
147147

148148
End if
149149

150+
// Mark:Use var instead of (_o_)C_xxx
151+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(604)+"\\(([^\\)]*)\\)").substitute("var \\1 : Blob")
152+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(305)+"\\(([^\\)]*)\\)").substitute("var \\1 : Boolean")
153+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1488)+"\\(([^\\)]*)\\)").substitute("var \\1 : Collection")
154+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(307)+"\\(([^\\)]*)\\)").substitute("var \\1 : Date")
155+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(283)+"\\(([^\\)]*)\\)").substitute("var \\1 : Integer")
156+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1216)+"\\(([^\\)]*)\\)").substitute("var \\1 : Object")
157+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(286)+"\\(([^\\)]*)\\)").substitute("var \\1 : Picture")
158+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(301)+"\\(([^\\)]*)\\)").substitute("var \\1 : Pointer")
159+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(285)+"\\(([^\\)]*)\\)").substitute("var \\1 : Real")
160+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(284)+"\\(([^\\)]*)\\)").substitute("var \\1 : Text")
161+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(306)+"\\(([^\\)]*)\\)").substitute("var \\1 : Time")
162+
$code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1683)+"\\(([^\\)]*)\\)").substitute("var \\1")
163+
150164
// Mark:Delete empty lines at the beginning of the method
151165
If (Bool:C1537($options.removeEmptyLinesAtTheBeginOfMethod))
152166

‎Project/Sources/dependencies.json

Lines changed: 64 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,68 @@
11
{
22
"dependencies": {
3-
"4DPop": {},
4-
"4DPop AppMaker": {},
5-
"4DPop Bookmarks": {},
6-
"4DPop Clipboard": {},
7-
"4DPop ColorChart": {},
8-
"4DPop Commands": {},
9-
"4DPop Constants Editor": {},
10-
"4DPop Git": {},
11-
"4DPop Image Buddy": {},
12-
"4DPop KeepIt": {},
13-
"4DPop Macros": {},
14-
"4DPop Pasteboard": {},
15-
"4DPop QuickOpen": {},
16-
"4DPop Rulers": {},
17-
"4DPop sqlSchemas": {},
18-
"4DPop Window": {},
19-
"4DPop XLIFF Pro": {}
3+
"4DPop": {
4+
"github": "vdelachaux/4DPop",
5+
"version": "latest"
6+
},
7+
"4DPop AppMaker": {
8+
"github": "vdelachaux/4DPop-AppMaker",
9+
"version": "latest"
10+
},
11+
"4DPop Git": {
12+
"github": "vdelachaux/4DPop-Git",
13+
"version": "latest"
14+
},
15+
"4DPop Macros": {
16+
"github": "vdelachaux/4DPop-Macros",
17+
"version": "latest"
18+
},
19+
"4DPop QuickOpen": {
20+
"github": "vdelachaux/4DPop-QuickOpen",
21+
"version": "latest"
22+
},
23+
"4DPop XLIFF Pro": {
24+
"github": "vdelachaux/4DPop-XLIFF-Pro",
25+
"version": "latest"
26+
},
27+
"4DPop Bookmarks": {
28+
"github": "vdelachaux/4DPop-Bookmarks",
29+
"version": "latest"
30+
},
31+
"4DPop ColorChart": {
32+
"github": "vdelachaux/4DPop-ColorChart",
33+
"version": "latest"
34+
},
35+
"4DPop Commands": {
36+
"github": "vdelachaux/4DPop-Commands",
37+
"version": "latest"
38+
},
39+
"4DPop Constants Editor": {
40+
"github": "vdelachaux/4DPop-Constants-Editor",
41+
"version": "latest"
42+
},
43+
"4DPop Image Buddy": {
44+
"github": "vdelachaux/4DPop-Image-Buddy",
45+
"version": "latest"
46+
},
47+
"4DPop KeepIt": {
48+
"github": "vdelachaux/4DPop-KeepIt",
49+
"version": "latest"
50+
},
51+
"4DPop Pasteboard": {
52+
"github": "vdelachaux/4DPop-Pasteboard",
53+
"version": "latest"
54+
},
55+
"4DPop Rulers": {
56+
"github": "vdelachaux/4DPop-Rulers",
57+
"version": "latest"
58+
},
59+
"4DPop sqlSchemas": {
60+
"github": "vdelachaux/4DPop-sqlSchemas",
61+
"version": "latest"
62+
},
63+
"4DPop Window": {
64+
"github": "vdelachaux/4DPop-Window",
65+
"version": "latest"
66+
}
2067
}
2168
}

‎Resources/InfoPlist.strings

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)