Fix bad handling of compiler directive comments

vdelachaux · Feb 5, 2025 · fd6d90b · fd6d90b
1 parent 3d0b377
commit fd6d90b
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 11 deletions.
diff --git a/Build/4DPop-Macros.zip b/Build/4DPop-Macros.zip
diff --git a/Build/Components/4DPop Macros.4dbase/Contents/4DPop Macros.4DZ b/Build/Components/4DPop Macros.4dbase/Contents/4DPop Macros.4DZ
diff --git a/Build/Components/4DPop Macros.4dbase/Contents/Info.plist b/Build/Components/4DPop Macros.4dbase/Contents/Info.plist
@@ -6,13 +6,13 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>301</string>
+    <string>302</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2025</string>
     <key>CFBundleGetInfoString</key>
     <string>20R9</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R9 (300)</string>
+    <string>20R9 (301)</string>
     <key>CFBundleShortVersionString</key>
     <string>20R9</string>
     <key>CFBundleDisplayName</key>

diff --git a/Build/Components/4DPop Macros.4dbase/Contents/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Macros.4dbase/Contents/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop Macros.4dbase/Contents/Resources/InfoPlist.strings b/Build/Components/4DPop Macros.4dbase/Contents/Resources/InfoPlist.strings
diff --git a/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeDirectory b/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeDirectory
diff --git a/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeRequirements-1 b/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeRequirements-1
diff --git a/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeResources b/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeResources
@@ -294,7 +294,7 @@
 		</data>
 		<key>Resources/InfoPlist.strings</key>
 		<data>
-		SPyNEbqkmpc+gS6dVYeQlyNbvLE=
+		l43BPGcDJdYHapcj4IbX/xSrmOQ=
 		</data>
 		<key>Resources/constants.xlf</key>
 		<data>
@@ -376,7 +376,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			4x3XEy2PdpFfM/8A+GotQRB5rJ4=
+			TomYuTkFTJQuRSkLPCmItMhEVew=
 			</data>
 			<key>requirement</key>
 			<string>identifier "4DPop Macros.4DZ" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = DYRKW64QA9</string>
@@ -473,11 +473,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			q64Ff//XTk3AGTd1La9Z55BAtaA=
+			Rq2fsNo7dSo3wGbCvoYGUbFhIh8=
 			</data>
 			<key>hash2</key>
 			<data>
-			arsJUBWQZDkoKJ0Vbc7GelYWMRi5SmkjNk+vv1b8mq8=
+			q/sH4i9rRQTj+qV4Y30F1vROqrciNWpjuoeHrmIT1qI=
 			</data>
 		</dict>
 		<key>Resources/4DPop.json</key>
@@ -1276,11 +1276,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			SPyNEbqkmpc+gS6dVYeQlyNbvLE=
+			l43BPGcDJdYHapcj4IbX/xSrmOQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			xzK6MzJha5hFU/9sPVWakuzmHGXAoqedX+4sfNtlUkA=
+			7V8uNzOh5/Y3qJbwbMR2H8u83xy6EUUi76qq7OXUtqE=
 			</data>
 		</dict>
 		<key>Resources/constants.xlf</key>

diff --git a/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeSignature b/Build/Components/4DPop Macros.4dbase/Contents/_CodeSignature/CodeSignature
diff --git a/Info.plist b/Info.plist
@@ -6,13 +6,13 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>301</string>
+    <string>302</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2025</string>
     <key>CFBundleGetInfoString</key>
     <string>20R9</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R9 (300)</string>
+    <string>20R9 (301)</string>
     <key>CFBundleShortVersionString</key>
     <string>20R9</string>
     <key>CFBundleDisplayName</key>

diff --git a/Project/Sources/Classes/macro.4dm b/Project/Sources/Classes/macro.4dm
@@ -196,7 +196,7 @@ Function isReservedComment($line : Text) : Boolean
 	return ($line=(kCommentMark+"}"))\
 		 || ($line=(kCommentMark+"]"))\
 		 || ($line=(kCommentMark+")"))\
-		 || (Match regex:C1019("(?m-si)^//%[A-Z][-+]$"; $line; 1; *))\
+		 || (Match regex:C1019("(?mi-s)^//%[A-Z][+-]\\d{3}\\.\\d+$"; $line; 1; *))\
 		 || (Match regex:C1019("(?mi-s)^/\\*.*\\*/$"; $line; 1; *))
 
 	// === === === === === === === === === === === === === === === === === === === === === === === === === ===

diff --git a/Project/Sources/Methods/DECLARATION_Test.4dm b/Project/Sources/Methods/DECLARATION_Test.4dm
@@ -1,4 +1,9 @@
 //%attributes = {"invisible":true,"preemptive":"capable"}
+////%W-518.1
+//COPY ARRAY($icons; $3->)
+////%W+518.1
+
+
 //comment
 
 var $i : Integer  //tset

diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings