OSDN Git Service

autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749) (2)
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Fri, 23 Apr 2021 22:36:48 +0000 (07:36 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Mon, 26 Apr 2021 12:10:15 +0000 (21:10 +0900)
(cherry picked from commit 46546b0aceb516696662be481218c207e0725527)

Externals/crystaledit/editlib/parsers/autoit.cpp

index a26c7b8..85e2fab 100644 (file)
@@ -552,17 +552,17 @@ CrystalLineParser::ParseLineAutoIt (unsigned dwCookie, const TCHAR *pszChars, in
               DEFINE_BLOCK (nPos, COLORINDEX_COMMENT);
             }
           else if (dwCookie & (COOKIE_CHAR | COOKIE_STRING))
-          {
+            {
               DEFINE_BLOCK(nPos, COLORINDEX_STRING);
-          }
+            }
           else if (dwCookie & (COOKIE_USER1 ))
-          {
+            {
               DEFINE_BLOCK(nPos, COLORINDEX_USER1);
-          }
+            }
           else if (dwCookie & (COOKIE_VARIABLE))
-          {
+            {
               DEFINE_BLOCK(nPos, COLORINDEX_USER2);
-          }
+            }
           else if (dwCookie & COOKIE_PREPROCESSOR)
             {
               DEFINE_BLOCK (nPos, COLORINDEX_PREPROCESSOR);
@@ -603,7 +603,6 @@ out:
         {
           if (pszChars[I] == '\'')
             {
-
               dwCookie &= ~COOKIE_CHAR;
               bRedefineBlock = true;
             }
@@ -655,42 +654,42 @@ out:
       
       // Variable begins
       if (pszChars[I] == '@')
-      {
+        {
           DEFINE_BLOCK(I, COLORINDEX_USER1);
           dwCookie |= COOKIE_USER1;
           continue;
-      }
+        }
 
       // Variable ends
       if (dwCookie & COOKIE_USER1)
-      {
+        {
           if (!xisalnum(pszChars[I]))
-          {
+            {
               dwCookie &= ~COOKIE_USER1;
               bRedefineBlock = true;
               bDecIndex = true;
-          }
+            }
           continue;
-      }
+        }
       
       if (pszChars[I] == '$')
-      {
+        {
           DEFINE_BLOCK(I, COLORINDEX_USER2);
           dwCookie |= COOKIE_VARIABLE;
           continue;
-      }
+        }
 
       // Variable ends
       if (dwCookie & COOKIE_VARIABLE)
-      {
+        {
           if (!xisalnum(pszChars[I]))
-          {
+            {
               dwCookie &= ~COOKIE_VARIABLE;
               bRedefineBlock = true;
               bDecIndex = true;
-          }
+            }
           continue;
-      }
+        }
 
       //  Normal text
       if (pszChars[I] == '"')