From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:06:44 +0200 Subject: vim-patch:89bcfda6834a Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 --- runtime/syntax/nasm.vim | 194 ++++++++++++++++++++++-------------------------- 1 file changed, 88 insertions(+), 106 deletions(-) (limited to 'runtime/syntax/nasm.vim') diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim index a6ed056650..0f81ceb5a9 100644 --- a/runtime/syntax/nasm.vim +++ b/runtime/syntax/nasm.vim @@ -9,10 +9,8 @@ " Setup Syntax: -" Clear old syntax settings -if version < 600 - syn clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif " Assembler syntax is case insensetive @@ -21,18 +19,10 @@ syn case ignore " Vim search and movement commands on identifers -if version < 600 - " Comments at start of a line inside which to skip search for indentifiers - set comments=:; - " Identifier Keyword characters (defines \k) - set iskeyword=@,48-57,#,$,.,?,@-@,_,~ -else - " Comments at start of a line inside which to skip search for indentifiers - setlocal comments=:; - " Identifier Keyword characters (defines \k) - setlocal iskeyword=@,48-57,#,$,.,?,@-@,_,~ -endif - +" Comments at start of a line inside which to skip search for indentifiers +setlocal comments=:; +" Identifier Keyword characters (defines \k) +setlocal iskeyword=@,48-57,#,$,.,?,@-@,_,~ " Comments: @@ -431,96 +421,88 @@ syn sync match nasmSync grouphere NONE "^\s*%endmacro\>" " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later : only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_nasm_syntax_inits") - if version < 508 - let did_nasm_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " Sub Links: - HiLink nasmInMacDirective nasmDirective - HiLink nasmInMacLabel nasmLocalLabel - HiLink nasmInMacLblWarn nasmLabelWarn - HiLink nasmInMacMacro nasmMacro - HiLink nasmInMacParam nasmMacro - HiLink nasmInMacParamNum nasmDecNumber - HiLink nasmInMacPreCondit nasmPreCondit - HiLink nasmInMacPreProc nasmPreProc - HiLink nasmInPreCondit nasmPreCondit - HiLink nasmInStructure nasmStructure - HiLink nasmStructureLabel nasmStructure - - " Comment Group: - HiLink nasmComment Comment - HiLink nasmSpecialComment SpecialComment - HiLink nasmInCommentTodo Todo - - " Constant Group: - HiLink nasmString String - HiLink nasmStringError Error - HiLink nasmBinNumber Number - HiLink nasmOctNumber Number - HiLink nasmDecNumber Number - HiLink nasmHexNumber Number - HiLink nasmFltNumber Float - HiLink nasmNumberError Error - - " Identifier Group: - HiLink nasmLabel Identifier - HiLink nasmLocalLabel Identifier - HiLink nasmSpecialLabel Special - HiLink nasmLabelError Error - HiLink nasmLabelWarn Todo - - " PreProc Group: - HiLink nasmPreProc PreProc - HiLink nasmDefine Define - HiLink nasmInclude Include - HiLink nasmMacro Macro - HiLink nasmPreCondit PreCondit - HiLink nasmPreProcError Error - HiLink nasmPreProcWarn Todo - - " Type Group: - HiLink nasmType Type - HiLink nasmStorage StorageClass - HiLink nasmStructure Structure - HiLink nasmTypeError Error - - " Directive Group: - HiLink nasmConstant Constant - HiLink nasmInstrModifier Operator - HiLink nasmRepeat Repeat - HiLink nasmDirective Keyword - HiLink nasmStdDirective Operator - HiLink nasmFmtDirective Keyword - - " Register Group: - HiLink nasmCtrlRegister Special - HiLink nasmDebugRegister Debug - HiLink nasmTestRegister Special - HiLink nasmRegisterError Error - HiLink nasmMemRefError Error - - " Instruction Group: - HiLink nasmStdInstruction Statement - HiLink nasmSysInstruction Statement - HiLink nasmDbgInstruction Debug - HiLink nasmFpuInstruction Statement - HiLink nasmMmxInstruction Statement - HiLink nasmSseInstruction Statement - HiLink nasmNowInstruction Statement - HiLink nasmAmdInstruction Special - HiLink nasmCrxInstruction Special - HiLink nasmUndInstruction Todo - HiLink nasmInstructnError Error - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" Sub Links: +HiLink nasmInMacDirective nasmDirective +HiLink nasmInMacLabel nasmLocalLabel +HiLink nasmInMacLblWarn nasmLabelWarn +HiLink nasmInMacMacro nasmMacro +HiLink nasmInMacParam nasmMacro +HiLink nasmInMacParamNum nasmDecNumber +HiLink nasmInMacPreCondit nasmPreCondit +HiLink nasmInMacPreProc nasmPreProc +HiLink nasmInPreCondit nasmPreCondit +HiLink nasmInStructure nasmStructure +HiLink nasmStructureLabel nasmStructure + +" Comment Group: +HiLink nasmComment Comment +HiLink nasmSpecialComment SpecialComment +HiLink nasmInCommentTodo Todo + +" Constant Group: +HiLink nasmString String +HiLink nasmStringError Error +HiLink nasmBinNumber Number +HiLink nasmOctNumber Number +HiLink nasmDecNumber Number +HiLink nasmHexNumber Number +HiLink nasmFltNumber Float +HiLink nasmNumberError Error + +" Identifier Group: +HiLink nasmLabel Identifier +HiLink nasmLocalLabel Identifier +HiLink nasmSpecialLabel Special +HiLink nasmLabelError Error +HiLink nasmLabelWarn Todo + +" PreProc Group: +HiLink nasmPreProc PreProc +HiLink nasmDefine Define +HiLink nasmInclude Include +HiLink nasmMacro Macro +HiLink nasmPreCondit PreCondit +HiLink nasmPreProcError Error +HiLink nasmPreProcWarn Todo + +" Type Group: +HiLink nasmType Type +HiLink nasmStorage StorageClass +HiLink nasmStructure Structure +HiLink nasmTypeError Error + +" Directive Group: +HiLink nasmConstant Constant +HiLink nasmInstrModifier Operator +HiLink nasmRepeat Repeat +HiLink nasmDirective Keyword +HiLink nasmStdDirective Operator +HiLink nasmFmtDirective Keyword + +" Register Group: +HiLink nasmCtrlRegister Special +HiLink nasmDebugRegister Debug +HiLink nasmTestRegister Special +HiLink nasmRegisterError Error +HiLink nasmMemRefError Error + +" Instruction Group: +HiLink nasmStdInstruction Statement +HiLink nasmSysInstruction Statement +HiLink nasmDbgInstruction Debug +HiLink nasmFpuInstruction Statement +HiLink nasmMmxInstruction Statement +HiLink nasmSseInstruction Statement +HiLink nasmNowInstruction Statement +HiLink nasmAmdInstruction Special +HiLink nasmCrxInstruction Special +HiLink nasmUndInstruction Todo +HiLink nasmInstructnError Error + +delcommand HiLink let b:current_syntax = "nasm" -- cgit From 86b596dc7a49f1b148ef82a356b972b93ed0f6d4 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:14:34 +0200 Subject: vim-patch:f37506f60f87 Updated runtime files. Remove HiLink commands. https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c --- runtime/syntax/nasm.vim | 124 ++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 63 deletions(-) (limited to 'runtime/syntax/nasm.vim') diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim index 0f81ceb5a9..d6485080ee 100644 --- a/runtime/syntax/nasm.vim +++ b/runtime/syntax/nasm.vim @@ -422,87 +422,85 @@ syn sync match nasmSync grouphere NONE "^\s*%endmacro\>" " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link " Sub Links: -HiLink nasmInMacDirective nasmDirective -HiLink nasmInMacLabel nasmLocalLabel -HiLink nasmInMacLblWarn nasmLabelWarn -HiLink nasmInMacMacro nasmMacro -HiLink nasmInMacParam nasmMacro -HiLink nasmInMacParamNum nasmDecNumber -HiLink nasmInMacPreCondit nasmPreCondit -HiLink nasmInMacPreProc nasmPreProc -HiLink nasmInPreCondit nasmPreCondit -HiLink nasmInStructure nasmStructure -HiLink nasmStructureLabel nasmStructure +hi def link nasmInMacDirective nasmDirective +hi def link nasmInMacLabel nasmLocalLabel +hi def link nasmInMacLblWarn nasmLabelWarn +hi def link nasmInMacMacro nasmMacro +hi def link nasmInMacParam nasmMacro +hi def link nasmInMacParamNum nasmDecNumber +hi def link nasmInMacPreCondit nasmPreCondit +hi def link nasmInMacPreProc nasmPreProc +hi def link nasmInPreCondit nasmPreCondit +hi def link nasmInStructure nasmStructure +hi def link nasmStructureLabel nasmStructure " Comment Group: -HiLink nasmComment Comment -HiLink nasmSpecialComment SpecialComment -HiLink nasmInCommentTodo Todo +hi def link nasmComment Comment +hi def link nasmSpecialComment SpecialComment +hi def link nasmInCommentTodo Todo " Constant Group: -HiLink nasmString String -HiLink nasmStringError Error -HiLink nasmBinNumber Number -HiLink nasmOctNumber Number -HiLink nasmDecNumber Number -HiLink nasmHexNumber Number -HiLink nasmFltNumber Float -HiLink nasmNumberError Error +hi def link nasmString String +hi def link nasmStringError Error +hi def link nasmBinNumber Number +hi def link nasmOctNumber Number +hi def link nasmDecNumber Number +hi def link nasmHexNumber Number +hi def link nasmFltNumber Float +hi def link nasmNumberError Error " Identifier Group: -HiLink nasmLabel Identifier -HiLink nasmLocalLabel Identifier -HiLink nasmSpecialLabel Special -HiLink nasmLabelError Error -HiLink nasmLabelWarn Todo +hi def link nasmLabel Identifier +hi def link nasmLocalLabel Identifier +hi def link nasmSpecialLabel Special +hi def link nasmLabelError Error +hi def link nasmLabelWarn Todo " PreProc Group: -HiLink nasmPreProc PreProc -HiLink nasmDefine Define -HiLink nasmInclude Include -HiLink nasmMacro Macro -HiLink nasmPreCondit PreCondit -HiLink nasmPreProcError Error -HiLink nasmPreProcWarn Todo +hi def link nasmPreProc PreProc +hi def link nasmDefine Define +hi def link nasmInclude Include +hi def link nasmMacro Macro +hi def link nasmPreCondit PreCondit +hi def link nasmPreProcError Error +hi def link nasmPreProcWarn Todo " Type Group: -HiLink nasmType Type -HiLink nasmStorage StorageClass -HiLink nasmStructure Structure -HiLink nasmTypeError Error +hi def link nasmType Type +hi def link nasmStorage StorageClass +hi def link nasmStructure Structure +hi def link nasmTypeError Error " Directive Group: -HiLink nasmConstant Constant -HiLink nasmInstrModifier Operator -HiLink nasmRepeat Repeat -HiLink nasmDirective Keyword -HiLink nasmStdDirective Operator -HiLink nasmFmtDirective Keyword +hi def link nasmConstant Constant +hi def link nasmInstrModifier Operator +hi def link nasmRepeat Repeat +hi def link nasmDirective Keyword +hi def link nasmStdDirective Operator +hi def link nasmFmtDirective Keyword " Register Group: -HiLink nasmCtrlRegister Special -HiLink nasmDebugRegister Debug -HiLink nasmTestRegister Special -HiLink nasmRegisterError Error -HiLink nasmMemRefError Error +hi def link nasmCtrlRegister Special +hi def link nasmDebugRegister Debug +hi def link nasmTestRegister Special +hi def link nasmRegisterError Error +hi def link nasmMemRefError Error " Instruction Group: -HiLink nasmStdInstruction Statement -HiLink nasmSysInstruction Statement -HiLink nasmDbgInstruction Debug -HiLink nasmFpuInstruction Statement -HiLink nasmMmxInstruction Statement -HiLink nasmSseInstruction Statement -HiLink nasmNowInstruction Statement -HiLink nasmAmdInstruction Special -HiLink nasmCrxInstruction Special -HiLink nasmUndInstruction Todo -HiLink nasmInstructnError Error - -delcommand HiLink +hi def link nasmStdInstruction Statement +hi def link nasmSysInstruction Statement +hi def link nasmDbgInstruction Debug +hi def link nasmFpuInstruction Statement +hi def link nasmMmxInstruction Statement +hi def link nasmSseInstruction Statement +hi def link nasmNowInstruction Statement +hi def link nasmAmdInstruction Special +hi def link nasmCrxInstruction Special +hi def link nasmUndInstruction Todo +hi def link nasmInstructnError Error + let b:current_syntax = "nasm" -- cgit From ac107f7fddc59ef286e3ef3979afe0ea5e94633a Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 1 May 2017 13:19:45 +0200 Subject: vim-patch:690afe1fef87 Update runtime files. https://github.com/vim/vim/commit/690afe1fef87e7eef6fb7343a926617d5f7315fa --- runtime/syntax/nasm.vim | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'runtime/syntax/nasm.vim') diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim index d6485080ee..4f70a0f334 100644 --- a/runtime/syntax/nasm.vim +++ b/runtime/syntax/nasm.vim @@ -1,9 +1,10 @@ " Vim syntax file " Language: NASM - The Netwide Assembler (v0.98) -" Maintainer: Andriy Sokolov +" Maintainer: Andrii Sokolov " Original Author: Manuel M.H. Stol " Former Maintainer: Manuel M.H. Stol -" Last Change: 2012 Feb 7 +" Contributors: Leonard König (C string highlighting) +" Last Change: 2017 Jan 23 " NASM Home: http://www.nasm.us/ @@ -67,8 +68,23 @@ syn match nasmLabelError "\<\~\s*\(\k*\s*:\|\$\=\.\k*\)" " Constants: -syn match nasmStringError +["']+ +syn match nasmStringError +["'`]+ +" NASM is case sensitive here: eg. u-prefix allows for 4-digit, U-prefix for +" 8-digit Unicode characters +syn case match +" one-char escape-sequences +syn match nasmCStringEscape display contained "\\[’"‘\\\?abtnvfre]" +" hex and octal numbers +syn match nasmCStringEscape display contained "\\\(x\x\{2}\|\o\{1,3}\)" +" Unicode characters +syn match nasmCStringEscape display contained "\\\(u\x\{4}\|U\x\{8}\)" +" ISO C99 format strings (copied from cFormat in runtime/syntax/c.vim) +syn match nasmCStringFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained +syn match nasmCStringFormat display "%%" contained syn match nasmString +\("[^"]\{-}"\|'[^']\{-}'\)+ +" Highlight C escape- and format-sequences within ``-strings +syn match nasmCString +\(`[^`]\{-}`\)+ contains=nasmCStringEscape,nasmCStringFormat extend +syn case ignore syn match nasmBinNumber "\<[0-1]\+b\>" syn match nasmBinNumber "\<\~[0-1]\+b\>"lc=1 syn match nasmOctNumber "\<\o\+q\>" @@ -443,7 +459,10 @@ hi def link nasmInCommentTodo Todo " Constant Group: hi def link nasmString String +hi def link nasmCString String hi def link nasmStringError Error +hi def link nasmCStringEscape SpecialChar +hi def link nasmCStringFormat SpecialChar hi def link nasmBinNumber Number hi def link nasmOctNumber Number hi def link nasmDecNumber Number -- cgit