diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | autoload/smt2.vim | 34 | ||||
| -rwxr-xr-x | build | 2 | ||||
| -rw-r--r-- | ftdetect/polyglot.vim | 15 | ||||
| -rw-r--r-- | ftplugin/smt2.vim | 29 | ||||
| -rw-r--r-- | syntax/asl.vim | 112 | ||||
| -rw-r--r-- | syntax/smt2.vim | 179 |
7 files changed, 374 insertions, 1 deletions
@@ -8,7 +8,7 @@ A collection of language packs for Vim. > One to rule them all, one to find them, one to bring them all and in the darkness bind them. - It **won't affect your startup time**, as scripts are loaded only on demand\*. -- It **installs and updates 100+ times faster** than the <!--Package Count-->130<!--/Package Count--> packages it consists of. +- It **installs and updates 100+ times faster** than the <!--Package Count-->132<!--/Package Count--> packages it consists of. - Solid syntax and indentation support (other features skipped). Only the best language packs. - All unnecessary files are ignored (like enormous documentation from php support). - No support for esoteric languages, only most popular ones (modern too, like `slim`). @@ -43,6 +43,7 @@ If you need full functionality of any plugin, please use it directly with your p ## Language packs <!--Language Packs--> +- [acpiasl](https://github.com/martinlroth/vim-acpi-asl) (syntax) - [ansible](https://github.com/pearofducks/ansible-vim) (syntax, indent, ftplugin) - [apiblueprint](https://github.com/sheerun/apiblueprint.vim) (syntax) - [applescript](https://github.com/mityu/vim-applescript) (syntax, indent) @@ -150,6 +151,7 @@ If you need full functionality of any plugin, please use it directly with your p - [scss](https://github.com/cakebaker/scss-syntax.vim) (syntax, autoload, ftplugin) - [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin) - [slime](https://github.com/slime-lang/vim-slime-syntax) (syntax, indent) +- [smt2](https://github.com/bohlender/vim-smt2) (syntax, autoload, ftplugin) - [solidity](https://github.com/tomlion/vim-solidity) (syntax, indent, ftplugin) - [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin) - [swift](https://github.com/keith/swift.vim) (syntax, indent, ftplugin) diff --git a/autoload/smt2.vim b/autoload/smt2.vim new file mode 100644 index 00000000..fd87febe --- /dev/null +++ b/autoload/smt2.vim @@ -0,0 +1,34 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'smt2') != -1 + finish +endif + +" Invokes the solver on current file +function! smt2#RunSolver() + silent !clear + execute "!" . g:smt2_solver_command . " " . bufname("%") +endfunction + +" Puts the solver's output in new split (replaces old split) +function! smt2#RunSolverAndShowResult() + let output = system(g:smt2_solver_command . " " . bufname("%") . " 2>&1") + + " Create split (or reuse existent) + if exists("s:outputbufnr") && bufwinnr(s:outputbufnr) > 0 + execute bufwinnr(s:outputbufnr) . 'wincmd w' + else + silent! vnew + let s:outputbufnr=bufnr('%') + endif + + " Clear & (re-)fill contents + silent! normal! ggdG + setlocal filetype=smt2 buftype=nofile nobuflisted noswapfile + call append(0, split(output, '\v\n')) + normal! gg +endfunction + +" Requests the solver's version +function! smt2#PrintSolverVersion() + silent !clear + execute "!" . g:smt2_solver_command . " " . g:smt2_solver_version_switch +endfunction @@ -153,6 +153,7 @@ update_readme() { } PACKS=" + acpiasl:martinlroth/vim-acpi-asl ansible:pearofducks/ansible-vim apiblueprint:sheerun/apiblueprint.vim applescript:mityu/vim-applescript:_SYNTAX @@ -260,6 +261,7 @@ PACKS=" scss:cakebaker/scss-syntax.vim slim:slim-template/vim-slim slime:slime-lang/vim-slime-syntax + smt2:bohlender/vim-smt2 solidity:tomlion/vim-solidity stylus:wavded/vim-stylus swift:keith/swift.vim diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 4d2396a3..f1fc4962 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -88,6 +88,14 @@ augroup END if (!exists('g:graphql_javascript_tags')) let g:graphql_javascript_tags = ['gql', 'graphql', 'Relay.QL'] endif +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'acpiasl') == -1 + augroup filetypedetect + " acpiasl, from asl.vim in martinlroth/vim-acpi-asl +au BufRead,BufNewFile *.asl set filetype=asl +au BufRead,BufNewFile *.dsl set filetype=asl + augroup end +endif + if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1 augroup filetypedetect " ansible, from ansible.vim in pearofducks/ansible-vim @@ -1236,6 +1244,13 @@ autocmd BufNewFile,BufRead *.slime set filetype=slime augroup end endif +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1 + augroup filetypedetect + " smt2, from smt2.vim in bohlender/vim-smt2 +autocmd BufRead,BufNewFile *.smt,*.smt2 set filetype=smt2 + augroup end +endif + if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1 augroup filetypedetect " solidity, from solidity.vim in tomlion/vim-solidity diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim new file mode 100644 index 00000000..f84af275 --- /dev/null +++ b/ftplugin/smt2.vim @@ -0,0 +1,29 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'smt2') != -1 + finish +endif + +setlocal iskeyword+=-,:,#,',$ + +" If no command for invoking a solver is specified in ~/.vimrc, test if either +" 'z3' or 'boolector' is accessible through $PATH (in that order) +if !exists("g:smt2_solver_command") + if executable("z3") + let g:smt2_solver_command = "z3" + elseif executable("boolector") + let g:smt2_solver_command = "boolector" + endif +endif + +" If no command line switch for printing the solver's version is specified in +" ~/.vimrc, use '--version' +if !exists("g:smt2_solver_version_switch") + let g:smt2_solver_version_switch = "--version" +endif + +" Mappings +nnoremap <silent> <buffer> <localleader>r :call smt2#RunSolver()<cr> +nnoremap <silent> <buffer> <localleader>R :call smt2#RunSolverAndShowResult()<cr> +nnoremap <silent> <buffer> <localleader>v :call smt2#PrintSolverVersion()<cr> + +" Comment String +setlocal commentstring=;%s diff --git a/syntax/asl.vim b/syntax/asl.vim new file mode 100644 index 00000000..67f3237f --- /dev/null +++ b/syntax/asl.vim @@ -0,0 +1,112 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'acpiasl') != -1 + finish +endif + +" Vim syntax file +" Language: ACPI ASL files +" Maintainer: Martin L Roth <gaumless@gmail.com> +" Version: 0.1 + +" Currently supporting ACPI 5.0 and IASL preprocessor +" http://www.acpi.info/DOWNLOADS/ACPIspec50.pdf +" https://acpica.org/sites/acpica/files/aslcompiler_8.pdf + +if exists("b:current_syntax") + finish +endif + +let b:current_syntax = "asl" + +syn case ignore + +syn region aslBlock start="{" end="}" transparent fold + +syn keyword aslTodo contained TODO FIXME XXX NOTE + +syn region aslComment display start="//" skip="\\$" end="$" keepend contains=aslTodo +syn region aslComment start="/\*" end="\*\/" contains=aslTodo + +syn region aslString start=/"/ skip=/\\"/ end=/"/ + +" Keywords +syn keyword aslPrimaryKeyword AccessAs Acquire Add Alias And Arg0 Arg1 Arg2 Arg3 Arg4 Arg6 Arg6 +syn keyword aslPrimaryKeyword BankField BreakPoint Break Buffer +syn keyword aslPrimaryKeyword Case ConcatenateResTemplate Concatenate Connection CondRefOf Continue CopyObject CreateBitField CreateByteField CreateDWordField CreateField CreateQWordField CreateWordField +syn keyword aslPrimaryKeyword DataTableRegion Debug Decrement Default DefinitionBlock DerefOf Device Divide +syn keyword aslPrimaryKeyword EISAID EisaId ElseIf Else Event External +syn keyword aslPrimaryKeyword Fatal Field FindSetLeftBit FindSetRightBit FromBCD Function +syn keyword aslPrimaryKeyword If Include Increment IndexField Index +syn keyword aslPrimaryKeyword LAnd LEqual LGreaterEqual LGreater LLessEqual LLess LNotEqual LNot LoadTable Load Local0 Local1 Local2 Local3 Local4 Local5 Local6 Local7 LOr +syn keyword aslPrimaryKeyword Match Method Mid Mod Multiply Mutex +syn keyword aslPrimaryKeyword Name NAnd NoOp NOr Notify Not +syn keyword aslPrimaryKeyword ObjectType Offset OperationRegion Or +syn keyword aslPrimaryKeyword Package PowerResource Processor +syn keyword aslPrimaryKeyword RawDataBuffer RefOf Release Reset ResourceTemplate Return +syn keyword aslPrimaryKeyword Scope ShiftLeft ShiftRight Signal SizeOf Sleep Stall Store Subtract Switch +syn keyword aslPrimaryKeyword ThermalZone Timer ToBCD ToBuffer ToDecimalString ToHexString ToInteger ToString ToUUID +syn keyword aslPrimaryKeyword Unicode Unload +syn keyword aslPrimaryKeyword Wait While +syn keyword aslPrimaryKeyword XOr + +syn keyword aslParameterKeyword ActiveBoth ActiveHigh ActiveHigh ActiveLow ActiveLow AddressingMode10Bit AddressingMode7Bit AddressRangeACPI AddressRangeMemory AddressRangeNVS AddressRangeReserved AnyAcc AttribBlock AttribBlockProcessCall AttribByte AttribBytes AttribBytes AttribProcessCall AttribQuick AttribRawBytes AttribRawBytes AttribRawProcessBytes AttribRawProcessBytes AttribSendReceive AttribWord +syn keyword aslParameterKeyword BigEndianing BufferAcc BuffFieldObj BuffObj BusMaster ByteAcc +syn keyword aslParameterKeyword Cacheable ClockPhaseFirst ClockPhaseSecond ClockPolarityHigh ClockPolarityLow Compatibility ControllerInitiated +syn keyword aslParameterKeyword DataBitsEight DataBitsFive DataBitsNine DataBitsSeven DataBitsSix DDBHandleObj Decode10 Decode16 DenseTranslation DeviceInitiated DeviceObj DWordAcc +syn keyword aslParameterKeyword Edge EmbeddedControl EntireRange EventObj Exclusive ExclusiveAndWake +syn keyword aslParameterKeyword FFixedHW FieldUnitObj FlowControlHardware FlowControlNone FlowControlXon FourWireMode +syn keyword aslParameterKeyword GeneralPurposeIO GenericSerialBus +syn keyword aslParameterKeyword IntObj IoRestrictionInputOnly IoRestrictionNone IoRestrictionNoneAndPreserve IoRestrictionOutputOnly IPMI ISAOnlyRanges +syn keyword aslParameterKeyword Level LittleEndian Lock +syn keyword aslParameterKeyword MaxFixed MaxNotFixed MEQ MethodObj MGE MGT MinFixed MinNotFixed MLE MLT MTR MutexObj +syn keyword aslParameterKeyword NoLock NonCacheable NonISAOnlyRanges NotBusMaster NotSerialized +syn keyword aslParameterKeyword OpRegionObj +syn keyword aslParameterKeyword ParityTypeEven ParityTypeMark ParityTypeNone ParityTypeOdd ParityTypeSpace PCC PciBarTarget PCI_Config PkgObj PolarityHigh PolarityLow PosDecode PowerResObj Prefetchable Preserve ProcessorObj PullDefault PullDown PullNone PullUp +syn keyword aslParameterKeyword QWordAcc +syn keyword aslParameterKeyword ReadOnly ReadWrite RegionSpaceKeyword ResourceConsumer ResourceProducer +syn keyword aslParameterKeyword Serialized Shared SharedAndWake SMBus SparseTranslation StopBitsOne StopBitsOnePlusHalf StopBitsTwo StopBitsZero StrObj SubDecode SystemCMOS SystemIO SystemMemory +syn keyword aslParameterKeyword ThermalZoneObj ThreeWireMode Transfer16 Transfer8 Transfer8_16 TypeA TypeB TypeF TypeStatic TypeTranslation +syn keyword aslParameterKeyword UnknownObj UserDefRegionSpace +syn keyword aslParameterKeyword Width128Bit Width16Bit Width256Bit Width32Bit Width64Bit Width8Bit WordAcc WriteAsOnes WriteAsZeros WriteCombining + +syn keyword aslResourceKeyword DMA DWordIO DWordMemory DWordSpace +syn keyword aslResourceKeyword EndDependentFn ExtendedIO ExtendedMemory ExtendedSpace +syn keyword aslResourceKeyword FixedDMA FixedIO +syn keyword aslResourceKeyword GpioInt GpioIO +syn keyword aslResourceKeyword I2CSerialBus Interrupt IO IRQNoFlags IRQ +syn keyword aslResourceKeyword Memory24 Memory32Fixed Memory32 +syn keyword aslResourceKeyword QWordIO QWordMemory QWordSpace +syn keyword aslResourceKeyword RawDataBuffer Register +syn keyword aslResourceKeyword SPISerialBus StartDependentFnNoPri StartDependentFn +syn keyword aslResourceKeyword UARTSerialBus +syn keyword aslResourceKeyword VendorLong VendorShort +syn keyword aslResourceKeyword WordBusNumber WordIO WordSpace + +" Pre-defined object names +syn keyword aslObjects _AC0 _AC1 _AC2 _AC3 _AC4 _AC5 _AC6 _AC7 _AC8 _AC9 _ADR _ALC _ALI _ALN _APL _ALR _ALT _AL0 _AL1 _AL2 _AL3 _AL4 _AL5 _AL6 _AL7 _AL8 _AL9 _ART _ASI _ASZ _ATT _BAS _BBN _BCL _BCM _BCT _BDN _BFS _BIF _BIX _BLT _BM _BMA _BMC _BMD _MBS _BQC _BST _BTM _BTP _CBA _CDM _CID _CRS _CRT _CSD _CST _CWS _DBT _DCK _DCS _DDC _DDN _DEC _DGS _DIS _DLM _DMA _DOD _DOS _DPL _DRS _DSM _DSS _DSW _DTI _EC _EDL _EJD _END _EVT _FDE _FDI _FDM _FIF _FIX _FLC _FPS _FSL _FST _GAI _GCP _GHL _GL _GLK _GPD _GPE _GRA _GRT _GSB _GTF _GTM _GTS _GWS _HE _HID _HOT _HPP _HPX _HRV _IFT _INI _INT _IOR _IRC _LCK _LEN _LID _LIN _LL _MAF _MAT _MAX _MBM _MEM _MIF _MIN _MLS _MOD _MSG _MSM _MTP _NTT _OFF _ON _OS _OSC _OSI _OST _PAI _PAR _PCL _PCT _PDC _PDL _PHA _PIC _PIF _PIN _PLD _PMC _PMD _PMM _POL _PPC _PPE _PPI _PR _PR0 _PR1 _PR2 _PR3 _PRE _PRL _PRS _PRT _PRW _PS0 _PS1 _PS2 _PS3 _PSC _PSD _PSE _PSL _PSR _PSS _PSV _PSW _PTC _PTP _PTS _PUR _PXM _RBO _RBW _REG _REV _RMV _RNG _ROM _RT _RTV _RW _RXL _S0 _S1 _S2 _S3 _S4 _S4 _S1D _S2D _S3D _S4D _S0W _S1W _S2W _S3W _S4W _SB _SBS _SCP _SDD _SEG _SHL _SHR _SI _SIZ _SLI _SLV _SPD _SPE _SRS _SRT _SRV _SST _STA _STB _STM _STP _STR _STV _SUN _SWS _TC2 _TC2 _TDL _TIP _TIV _TMP _TPC _TPT _TRA _TRS _TRT _TSD _TSF _TSP _TSS _TST _TTP _TXL _TTS _TYP _TZ _TZD _TZM _TZP _UID _UPC _UPD _UPP _VPO _VEN _WAK + +" IASL Preprocessor: #define #elif #else #endif #error #if #ifdef #ifndef #include #line #undef +syn region aslPreProc start="^\s*\(%:\|#\)\s*\(include\)\>" skip="\\$" end="$" keepend +syn region aslPreProc start="^\s*\(%:\|#\)\s*\(error\|line\|define\|undef\|if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=ALL +syn match aslPreProcMatch display "^\s*\(%:\|#\)\s*\(else\|endif\)\>" + +" Numeric values and Zero / One keywords +syn keyword aslZeroOne Zero One +syn match aslNumber display "\<\d\+" +syn match aslNumber display "0x\x\+" + +" Set the default colors +hi def link aslTodo Todo +hi def link aslComment Comment +hi def link aslString String +hi def link aslPrimaryKeyword Keyword +hi def link aslParameterKeyword Macro +hi def link aslResourceKeyword Type +hi def link aslObjects Identifier +hi def link aslPreProc PreProc +hi def link aslPreProcMatch PreProc +hi def link aslZeroOne Number +hi def link aslNumber Number + +let b:current_syntax = "asl" +syn sync minlines=200 + diff --git a/syntax/smt2.vim b/syntax/smt2.vim new file mode 100644 index 00000000..09f58c67 --- /dev/null +++ b/syntax/smt2.vim @@ -0,0 +1,179 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'smt2') != -1 + finish +endif + +" Vim syntax file +" " Language: SMT-LIB2 with Z3's extensions +" " Maintainer: Dimitri Bohlender <bohlender@embedded.rwth-aachen.de> + +" Quit if a syntax file is already loaded +if exists("b:current_syntax") + finish +endif +let b:current_syntax = "smt2" + +" Comments +syntax match smt2Comment ";.*$" + +" Keywords +syntax keyword smt2Keyword + \ apply + \ as + \ assert + \ assert + \ assert-soft + \ check-sat + \ check-sat-using + \ declare-const + \ declare-datatype + \ declare-datatypes + \ declare-fun + \ declare-map + \ declare-rel + \ declare-sort + \ declare-var + \ define-const + \ define-fun + \ define-sort + \ display + \ echo + \ elim-quantifiers + \ eval + \ exists + \ exit + \ forall + \ get-assignment + \ get-info + \ get-model + \ get-option + \ get-proof + \ get-unsat-core + \ get-user-tactics + \ get-value + \ help + \ let + \ match + \ maximize + \ minimize + \ pop + \ push + \ query + \ reset + \ rule + \ set-info + \ set-logic + \ set-option + \ simplify +syntax match smt2Keyword "!" + +" Operators +syntax match smt2Operator "[=\|>\|<\|<=\|>=\|=>\|+\|\-\|*\|/]" + +" Builtins +syntax keyword smt2Builtin + \ and + \ bit0 + \ bit1 + \ bvadd + \ bvand + \ bvashr + \ bvcomp + \ bvlshr + \ bvmul + \ bvnand + \ bvneg + \ bvnor + \ bvnot + \ bvor + \ bvredand + \ bvredor + \ bvsdiv + \ bvsge + \ bvsgt + \ bvshl + \ bvsle + \ bvslt + \ bvsmod + \ bvsrem + \ bvsub + \ bvudiv + \ bvuge + \ bvugt + \ bvule + \ bvult + \ bvurem + \ bvxnor + \ bvxor + \ concat + \ const + \ distinct + \ div + \ extract + \ false + \ get-assertions + \ if + \ is_int + \ ite + \ map + \ mod + \ not + \ or + \ rem + \ repeat + \ root-obj + \ rotate_left + \ rotate_right + \ sat + \ sat + \ select + \ sign_extend + \ store + \ to_int + \ to_real + \ true + \ unsat + \ unsat + \ xor + \ zero_extend +syntax match smt2Builtin "[\^\~]" + +" Identifier +syntax match smt2Identifier "\<[a-z_][a-zA-Z0-9_\-\.']*\>" + +" Types +syntax match smt2Type "\<[A-Z][a-zA-Z0-9_\-\.']*\>" + +" Strings +syntax region smt2String start=+"+ skip=+\\\\\|\\"+ end=+"+ +syntax match smt2Option "\<:[a-zA-Z0-9_\-\.']*\>" + +" Constructors +syntax match smt2Constructor "\<\$[a-zA-Z0-9_\-\.']*\>" + +" Number +syntax match smt2Int "\<[0-9]\+\>" +syntax match smt2Hex "\<[0#][xX][0-9a-fA-F]\+\>" +syntax match smt2Binary "\<#b[01]\+\>" +syntax match smt2Float "\<[0-9]\+\.[0-9]\+\([eE][\-+]\=[0-9]\+\)\=\>" + +" Delimiter +syntax match smt2Delimiter "[()]" + +" Error +syntax keyword smt2Error error + +highlight def link smt2Comment Comment +highlight def link smt2Keyword Function +highlight def link smt2Operator Operator +highlight def link smt2Builtin Operator +highlight def link smt2Identifier Normal +highlight def link smt2Type Type +highlight def link smt2String String +highlight def link smt2Option PreProc +highlight def link smt2Constructor Function +highlight def link smt2Float Float +highlight def link smt2Hex Number +highlight def link smt2Binary Number +highlight def link smt2Int Number +highlight def link smt2Delimiter Delimiter +highlight def link smt2Error Error |