new 4DPop compatibility

vdelachaux · Apr 28, 2023 · bddac84 · bddac84
1 parent 590b0c1
commit bddac84
Show file tree

Hide file tree

Showing 125 changed files with 187 additions and 145 deletions.
diff --git a/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ b/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ
diff --git a/Build/Components/4DPop Macros.4dbase/Info.plist b/Build/Components/4DPop Macros.4dbase/Info.plist
@@ -6,15 +6,15 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>254</string>
+    <string>256</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2023</string>
     <key>CFBundleGetInfoString</key>
-    <string>19R8</string>
+    <string>20R2</string>
     <key>CFBundleLongVersionString</key>
-    <string>19R8 (253)</string>
+    <string>20R2 (255)</string>
     <key>CFBundleShortVersionString</key>
-    <string>19R8</string>
+    <string>20R2</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Macros</string>
   </dict>

diff --git a/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop Macros.4dbase/Resources/4DPop.json b/Build/Components/4DPop Macros.4dbase/Resources/4DPop.json
@@ -0,0 +1,8 @@
+{
+  "name": "Macros",
+  "media": "4DPop.png",
+  "handler": "_4DPopMacros",
+  "tools": {
+    "method": "options"
+  }
+}
diff --git a/Build/Components/4DPop Macros.4dbase/Resources/4DPop.xml b/Build/Components/4DPop Macros.4dbase/Resources/4DPop.xml
diff --git a/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings
diff --git a/Build/Components/4DPop Macros.dmg b/Build/Components/4DPop Macros.dmg
diff --git a/Info.plist b/Info.plist
@@ -6,15 +6,15 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>254</string>
+    <string>256</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2023</string>
     <key>CFBundleGetInfoString</key>
-    <string>19R8</string>
+    <string>20R2</string>
     <key>CFBundleLongVersionString</key>
-    <string>19R8 (253)</string>
+    <string>20R2 (255)</string>
     <key>CFBundleShortVersionString</key>
-    <string>19R8</string>
+    <string>20R2</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Macros</string>
   </dict>

diff --git a/Libraries/lib4d-arm64.dylib b/Libraries/lib4d-arm64.dylib
diff --git a/Preferences/4DPop AppMaker.xml b/Preferences/4DPop AppMaker.xml
@@ -1 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><appMaker>  <info.plist CFBundleGetInfoString="DEV" CFBundleLongVersionString="0.0" CFBundleShortVersionString="0" NSHumanReadableCopyright="©vdl 2009-{CurrentYear}"/>  <options close="true" delete_mac_content="true" increment_version="true" notarize="true"/>  <methods/>  <copy>    <array>      <item>4DPop Macros.htm</item>      <item>Info.plist</item>      <item>Macros v2/</item>      <item>Resources/InfoPlist.strings</item>    </array>  </copy>  <delete>    <array>      <item>./Macros v2/vdl.xml</item>      <item>./Resources/php.ini</item>    </array>  </delete>  <reveal path=""/></appMaker>
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<appMaker>
+  <info.plist CFBundleGetInfoString="DEV" CFBundleLongVersionString="0.0" CFBundleShortVersionString="0" NSHumanReadableCopyright="©vdl 2009-{CurrentYear}"/>
+  <options close="true" delete_mac_content="true" increment_version="true" notarize="true"/>
+  <methods/>
+  <copy>
+    <array>
+      <item>4DPop Macros.htm</item>
+      <item>Info.plist</item>
+      <item>Macros v2/</item>
+      <item>Resources/InfoPlist.strings</item>
+    </array>
+  </copy>
+  <delete>
+    <array>
+      <item>./Macros v2/vdl.xml</item>
+      <item>./Resources/php.ini</item>
+    </array>
+  </delete>
+  <reveal path=""/>
+</appMaker>
diff --git a/Project/Sources/Classes/test_.4dm b/Project/Sources/Classes/test_.4dm
@@ -40,7 +40,7 @@ Function button($a : Text)->$this : Object
 
 Function field($x : 4D:C1709.File)->$field : Object
 
-	$field:=$x.platformPath
+	$field.test:=$x.platformPath
 
 Function addToGroup($g : Object)
 

diff --git a/Project/Sources/Methods/00_RUN.4dm b/Project/Sources/Methods/00_RUN.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 //cs.specialPaste.new()
 
 
diff --git a/Project/Sources/Methods/00_TESTS.4dm b/Project/Sources/Methods/00_TESTS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 If (False:C215)
 
 	//var $t; $tt; $ttt : Text

diff --git a/Project/Sources/Methods/00_convertComments.4dm b/Project/Sources/Methods/00_convertComments.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 C_LONGINT:C283($l)
 C_TEXT:C284($kTxt_separator;$t;$tComment;$tContent;$tMarkDown;$tPlainText)
 C_TEXT:C284($tSyntax)

diff --git a/Project/Sources/Methods/00_test_Dot_Notation.4dm b/Project/Sources/Methods/00_test_Dot_Notation.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 C_BOOLEAN:C305($Boo_)
 C_TEXT:C284($Txt_buffer;$Txt_referenceLanguage)
 C_OBJECT:C1216($Obj_)

diff --git a/Project/Sources/Methods/0_DOCUMENTATION.4dm b/Project/Sources/Methods/0_DOCUMENTATION.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 //#DECLARE($param)->$result : 4D.File
 //var $dummy : Text
 

diff --git a/Project/Sources/Methods/4DPop_MACROS.4dm b/Project/Sources/Methods/4DPop_MACROS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true,"shared":true}
+//%attributes = {"invisible":true,"shared":true,"preemptive":"incapable"}
 // ----------------------------------------------------
 // Méthode : 4DPop_MACROS
 // Created 24/10/05 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/4DPop_MACROS_INIT.4dm b/Project/Sources/Methods/4DPop_MACROS_INIT.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true,"shared":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
   // ----------------------------------------------------
   // Method :  4DPop_MACROS_INIT
   // Created 12/05/10 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/4DPop_MACROS_SETTINGS.4dm b/Project/Sources/Methods/4DPop_MACROS_SETTINGS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true,"shared":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 C_POINTER:C301($1)
 
 If (False:C215)

diff --git a/Project/Sources/Methods/4DPop_TEST_Macros.4dm b/Project/Sources/Methods/4DPop_TEST_Macros.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 var $o : Object
 var $t : Text
 

diff --git a/Project/Sources/Methods/ABOUT.4dm b/Project/Sources/Methods/ABOUT.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 // ----------------------------------------------------
 // Method : ABOUT
 // Created 24/03/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Beautifier_init.4dm b/Project/Sources/Methods/Beautifier_init.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 // ----------------------------------------------------
 // Project method : Beautifier_init
 // Database: 4DPop Macros

diff --git a/Project/Sources/Methods/CODE_TO_EXECUTE.4dm b/Project/Sources/Methods/CODE_TO_EXECUTE.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 // ----------------------------------------------------
 // Project method : Private_CODE_TO_EXECUTE
 // ID[AE63DE138BAC461AA60933E0CF35F72A]

diff --git a/Project/Sources/Methods/CODE_TO_EXECUTE_FORMULA.4dm b/Project/Sources/Methods/CODE_TO_EXECUTE_FORMULA.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 // ----------------------------------------------------
 // Méthode : private_CODE_TO_EXECUTE
 // Created 24/10/05 par Vincent de Lachaux

diff --git a/Project/Sources/Methods/COMMENTS.4dm b/Project/Sources/Methods/COMMENTS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
   // ----------------------------------------------------
   // Méthode : COMMENTS
   // Created 28/10/05 par Vincent de Lachaux

diff --git a/Project/Sources/Methods/COMPILER_4DPop.4dm b/Project/Sources/Methods/COMPILER_4DPop.4dm
@@ -0,0 +1,3 @@
+//%attributes = {"invisible":true,"preemptive":"capable"}
+C_OBJECT:C1216(_4DPopMacros; $0)
+C_OBJECT:C1216(options; $1)
diff --git a/Project/Sources/Methods/COMPILER_TESTS.4dm b/Project/Sources/Methods/COMPILER_TESTS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 If (False:C215)
 	C_TEXT:C284(DECLARE; $1)
 	C_VARIANT:C1683(DECLARE; $2)

diff --git a/Project/Sources/Methods/COMPILER_class.4dm b/Project/Sources/Methods/COMPILER_class.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 If (False:C215)
 
 	//________________________________________

diff --git a/Project/Sources/Methods/COMPILER_component.4dm b/Project/Sources/Methods/COMPILER_component.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 
 C_LONGINT:C283(<>list)
 

diff --git a/Project/Sources/Methods/Compiler_.4dm b/Project/Sources/Methods/Compiler_.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 
 If (False:C215)
 	C_LONGINT:C283(_o_array_declaration; $0)

diff --git a/Project/Sources/Methods/Compiler_Rgx.4dm b/Project/Sources/Methods/Compiler_Rgx.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 
 // ----------------------------------------------------
 // Method : Compiler_Rgx

diff --git a/Project/Sources/Methods/DECLARATION.4dm b/Project/Sources/Methods/DECLARATION.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 // ----------------------------------------------------
 // Method : DECLARATION
 // Alias zPop_o_dlg_DECLARATIONS

diff --git a/Project/Sources/Methods/DECLARATION_Formula.4dm b/Project/Sources/Methods/DECLARATION_Formula.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 // Comment
 // Declaration
 var $t : Text

diff --git a/Project/Sources/Methods/DECLARATION_Test.4dm b/Project/Sources/Methods/DECLARATION_Test.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 //var $1 : Text
 //C_BOOLEAN($2; $3)
 

diff --git a/Project/Sources/Methods/DECLARE.4dm b/Project/Sources/Methods/DECLARE.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 //C_TEXT($1)
 //C_VARIANT($2)
 //C_LONGINT($0)//comments

diff --git a/Project/Sources/Methods/DOT_NOTATION.4dm b/Project/Sources/Methods/DOT_NOTATION.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
   // ----------------------------------------------------
   // Project method : DOT_NOTATION
   // Database: 4DPop Macros

diff --git a/Project/Sources/Methods/Get_Version.4dm b/Project/Sources/Methods/Get_Version.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Private_Txt_Get_Version
   // Created 06/05/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Get_resource.4dm b/Project/Sources/Methods/Get_resource.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 // ----------------------------------------------------
 // Method : Get_resource
 // Created 06/05/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/INSTALL_LOCALIZED_MACROS.4dm b/Project/Sources/Methods/INSTALL_LOCALIZED_MACROS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 // ----------------------------------------------------
 // Method :  INSTALL_LOCALIZED_MACROS
 // Created 12/05/10 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/INVERT_EXPRESSION.4dm b/Project/Sources/Methods/INVERT_EXPRESSION.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 // ----------------------------------------------------
 // Méthode : private_INVERT_EXPRESSION
 // Created 24/10/05 par Vincent de Lachaux

diff --git a/Project/Sources/Methods/Init.4dm b/Project/Sources/Methods/Init.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 // ----------------------------------------------------
 // Nom utilisateur (OS) : Vincent de Lachaux
 // Date et heure : 02/02/06, 10:11:40

diff --git a/Project/Sources/Methods/Install_regex.4dm b/Project/Sources/Methods/Install_regex.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Install_Regex
   // Created 06/05/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Install_resources.4dm b/Project/Sources/Methods/Install_resources.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Install_Resources
   // Created 06/05/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/METHODS.4dm b/Project/Sources/Methods/METHODS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
   // ----------------------------------------------------
   // Project method : Private_Methods - (4DPop Macros)
   // ID[EA5BBFB3373B41AC87508A85117393FA]

diff --git a/Project/Sources/Methods/METHOD_ANALYSE_TO_ARRAYS.4dm b/Project/Sources/Methods/METHOD_ANALYSE_TO_ARRAYS.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Project method : METHOD_ANALYSE_TO_ARRAYS
   // ID[343B51683A1C4F40A7E8BC192481999C]

diff --git a/Project/Sources/Methods/METHOD_Syntax.4dm b/Project/Sources/Methods/METHOD_Syntax.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Project method : METHOD_Syntax
   // ID[D8D6EBA99147457E8AF91D1BE651AF8B]

diff --git a/Project/Sources/Methods/Method120.4dm b/Project/Sources/Methods/Method120.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 Case of 
 
 	: (False:C215)

diff --git a/Project/Sources/Methods/Method121.4dm b/Project/Sources/Methods/Method121.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 var $txt : Text
 
 If (($txt="") | ($txt#"")) & (True:C214)  //SPLIT TEST LINES WITH & AND |

diff --git a/Project/Sources/Methods/Method122.4dm b/Project/Sources/Methods/Method122.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 //%W-550.4
 //%W-550.2
 var $xmlStructure : Text

diff --git a/Project/Sources/Methods/Method123.4dm b/Project/Sources/Methods/Method123.4dm
@@ -1,4 +1,4 @@
-//%attributes = {}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 //// A "If" statement should never omit "Else"
 //#DECLARE($a : Text)
 //If (False)

diff --git a/Project/Sources/Methods/NoError.4dm b/Project/Sources/Methods/NoError.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : NoError
   // Created 02/07/08 by vdl

diff --git a/Project/Sources/Methods/OPTIONS_GET.4dm b/Project/Sources/Methods/OPTIONS_GET.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 // ----------------------------------------------------
 // Method : Private_GET_OPTIONS
 // Created 02/05/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/OPTIONS_SET.4dm b/Project/Sources/Methods/OPTIONS_SET.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 // ----------------------------------------------------
 // Method : OPTIONS_SET
 // Created 02/05/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Preferences_Get.4dm b/Project/Sources/Methods/Preferences_Get.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
 // ----------------------------------------------------
 // Method : Private_Txt_Get_Preferences
 // Created 06/05/06 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Private_Boo_Paste_Regex_Pattern.4dm b/Project/Sources/Methods/Private_Boo_Paste_Regex_Pattern.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
   // ----------------------------------------------------
   // Method : Private_Boo_Paste_Regex_Pattern
   // Created 08/10/07 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Private_Lon_Declaration_Type.4dm b/Project/Sources/Methods/Private_Lon_Declaration_Type.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"incapable"}
 //_____________________________________________________
 // Méthode : private_Lon_Declaration_Type
 // Created 1/03/05 par Vincent de Lachaux

diff --git a/Project/Sources/Methods/Rgx_ExtractText.4dm b/Project/Sources/Methods/Rgx_ExtractText.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Rgx_ExtractText
   // Created 28/09/07 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Rgx_Get_Pattern.4dm b/Project/Sources/Methods/Rgx_Get_Pattern.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Rgx_Get_Pattern
   // Created 16/12/05 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Rgx_MatchText.4dm b/Project/Sources/Methods/Rgx_MatchText.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Rgx_MatchText
   // Created 28/09/07 by Vincent

diff --git a/Project/Sources/Methods/Rgx_SplitText.4dm b/Project/Sources/Methods/Rgx_SplitText.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Rgx_SplitText
   // Created 27/09/07 by Vincent de Lachaux

diff --git a/Project/Sources/Methods/Rgx_SubstituteText.4dm b/Project/Sources/Methods/Rgx_SubstituteText.4dm
@@ -1,4 +1,4 @@
-//%attributes = {"invisible":true}
+//%attributes = {"invisible":true,"preemptive":"capable"}
   // ----------------------------------------------------
   // Method : Rgx_SubstituteText
   // Created 28/09/07 by Vincent