npp 8.4.x compatibility

Author: jangko

build.bat

@@ -10,7 +10,7 @@ if "%1"=="x64" goto nppnim64
 @echo building 32 bit version
 SET BASE=release\nppnim32
 SET TMPPATH=%PATH%
-SET PATH=e:\mingw32\mingw32\bin;f:\projects\new_nim\bin;%PATH%
+SET PATH=F:\mingw32\bin;%PATH%
 windres -i resource\resource.rc -F pe-i386 -o resource\resource32.o
 nim c -d:release --cpu:i386 -o:%BASE%\nppnim.dll nppnim
 strip %BASE%\nppnim.dll

nppnim.nim

@@ -198,13 +198,15 @@ const
     '|', '=', '%', '&', '$', '@', '~', ':', '\x80'..'\xFF'}
 
 const
-  lexer_ver {.strdefine.} = "release4"
+  lexer_ver {.strdefine.} = "release5"
 
 proc Version(lex: Lexer): cint {.stdcall.} =
   when lexer_ver == "original":
     lvOriginal
-  else:
+  elif lexer_ver == "release4":
     lvRelease4
+  else:
+    lvRelease5
 
 proc Release(lex: Lexer) {.stdcall.} = discard
 proc PropertyNames(lex: Lexer): cstring {.stdcall.} = nil
@@ -458,6 +460,14 @@ proc DescriptionOfStyle(lex: Lexer, style: cint): cstring {.stdcall.} =
   else:
     emptyString[0].unsafeAddr
 
+proc GetName(lex: Lexer): cstring {.stdcall.} =
+  "npp.nim.lexer".cstring
+
+proc GetIdentifier(lex: Lexer): cint {.stdcall.} = 0
+
+proc PropertyGet(lex: Lexer, key: cstring): cstring {.stdcall.} =
+  "".cstring
+
 proc GetLexerCount(): int {.stdcall, exportc, dynlib.} = 1
 
 proc GetLexerName(idx: int, name: pointer, nameLen: int) {.stdcall, exportc, dynlib.} =
@@ -500,8 +510,16 @@ proc lexFactory(): ptr ILexer {.stdcall.} =
   vTable[23] = TagsOfStyle
   vTable[24] = DescriptionOfStyle
 
+  # ILexer5
+  vTable[25] = GetName
+  vTable[26] = GetIdentifier
+  vTable[27] = PropertyGet
+
   lex.vTable = vTable.addr
   result = lex.addr
 
 proc GetLexerFactory(idx: int): LexerFactoryProc {.stdcall, exportc, dynlib.} =
   result = lexFactory
+
+proc CreateLexer(name: cstring): ptr ILexer {.stdcall, exportc, dynlib.} =
+  lexFactory()

support.nim

@@ -35,17 +35,20 @@ type
 const
   #IDocument version
   dvOriginal* = 0
-  dvLineEnd* = 1
+  dvLineEnd*  = 1
+  dvRelease4* = 2
 
   #ILexer version
-  lvOriginal* = 0
+  lvOriginal*  = 0
   lvSubStyles* = 1
-  lvRelease4* = 2
+  lvRelease4*  = 2
+  lvRelease5*  = 3
 
 # Nim ver 0.13.0 use const, but 0.15.0 regression
 # force me to use let
 let
-  NimKeywords* = ["addr",
+  NimKeywords* = [
+    "addr",
     "and",
     "as",
     "asm",
@@ -186,7 +189,7 @@ type
   WordType* = enum
     WT_KEYWORD, WT_TYPE, WT_IDENT, WT_MAGIC, WT_CTYPE
 
-  VTABLE* = array[0..25, pointer]
+  VTABLE* = array[0..30, pointer]
 
   IDocument* {.pure, final.} = ptr object
     vTable: ptr VTABLE