Refactoring Batch lexer, issue #332.

zufuliu · Jun 21, 2021 · e44c285 · e44c285
1 parent 3eed6c9
commit e44c285
Show file tree

Hide file tree

Showing 8 changed files with 235 additions and 178 deletions.
diff --git a/build/make_zip.bat b/build/make_zip.bat
@@ -112,7 +112,7 @@ SET "EXIT_ON_ERROR=%~1"
 CALL :SubGetVersion
 CALL :SubDetectSevenzipPath
 
-IF /I "%SEVENZIP%" == "" CALL :SUBMSG "ERROR" "7za wasn't found!"
+IF NOT EXIST "%SEVENZIP%" CALL :SUBMSG "ERROR" "7za wasn't found!"
 
 IF /I "%COMPILER%" == "GCC" (
   SET INPUTDIR_AVX2=bin\%CONFIG%_AVX2
@@ -222,7 +222,7 @@ IF EXIST "%SEVENZIP_PATH%" (SET "SEVENZIP=%SEVENZIP_PATH%" & EXIT /B)
 FOR /F "tokens=2*" %%A IN (
   'REG QUERY "HKLM\SOFTWARE\7-Zip" /v "Path" 2^>NUL ^| FIND "REG_SZ" ^|^|
    REG QUERY "HKLM\SOFTWARE\Wow6432Node\7-Zip" /v "Path" 2^>NUL ^| FIND "REG_SZ"') DO SET "SEVENZIP=%%B\7z.exe"
-EXIT /B
+IF EXIST "%SEVENZIP%" EXIT /B
 
 FOR /F "tokens=2*" %%A IN (
   'REG QUERY "HKLM\SOFTWARE\7-Zip-Zstandard" /v "Path" 2^>NUL ^| FIND "REG_SZ" ^|^|

diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
@@ -474,6 +474,7 @@
 #define SCE_BAT_STRINGSQ 12
 #define SCE_BAT_STRINGBT 13
 #define SCE_BAT_NOT_BATCH 14
+#define SCE_BAT_LINE_CONTINUATION 15
 #define SCE_MAKE_DEFAULT 0
 #define SCE_MAKE_COMMENT 1
 #define SCE_MAKE_PREPROCESSOR 2

diff --git a/scintilla/include/SciLexer.iface b/scintilla/include/SciLexer.iface
@@ -689,6 +689,7 @@ val SCE_BAT_STRINGDQ=11
 val SCE_BAT_STRINGSQ=12
 val SCE_BAT_STRINGBT=13
 val SCE_BAT_NOT_BATCH=14
+val SCE_BAT_LINE_CONTINUATION=15
 # Lexical states for SCLEX_TCMD
 #lex TCMD=SCLEX_TCMD SCE_TCMD_
 #val SCE_TCMD_DEFAULT=0