Skip to content

Commit bafb6ed

Browse files
committed
Update defs from new generation methods
1 parent f39335c commit bafb6ed

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

autoload/clojurecomplete.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
" Last Change: 02 March 2013
77

88
" Special forms and public vars in clojure.core
9-
" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-004/vim_clojure_static.clj
10-
" Clojure 1.5.0
9+
" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-004/clj/src/vim_clojure_static/generate.clj
10+
" Clojure version 1.5.1
1111
let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*source-path*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn","bound-fn*","bound?","butlast","byte","byte-array","bytes","case","cast","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","doubles","drop","drop-last","drop-while","empty","empty?","ensure","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-set","identical?","identity","if","if-let","if-not","ifn?","import","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","quot","quote","rand","rand-int","rand-nth","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","realized?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some->","some->>","some-fn","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","sync","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","update-in","update-proxy","use","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","when","when-first","when-let","when-not","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
1212

1313
" Simple word completion omnifunc

syntax/clojure.vim

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ if exists("b:current_syntax")
1515
finish
1616
endif
1717

18-
" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-004/vim_clojure_static.clj
19-
" Clojure 1.5.0
18+
" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-004/clj/src/vim_clojure_static/generate.clj
19+
" Clojure version 1.5.1
2020
syntax keyword clojureConstant nil
2121
syntax keyword clojureBoolean false true
2222
syntax keyword clojureSpecial . catch clojure.core/fn clojure.core/let clojure.core/loop def do finally fn if let loop monitor-enter monitor-exit new quote recur set! throw try var
@@ -80,17 +80,19 @@ syntax region clojureRegexpQuoted start=/\v\<@!\\Q/ms=e+1 skip=/\v\\\\|\\"/ en
8080
syntax region clojureRegexpQuote start=/\v\<@!\\Q/ skip=/\v\\\\|\\"/ end=/\\E/ end=/"/me=s-1 contains=clojureRegexpQuoted keepend contained
8181
syntax cluster clojureRegexpEscapes contains=clojureRegexpEscape,clojureRegexpQuote
8282

83-
" Character classes and bracket expressions.
83+
" Character classes
8484
syntax match clojureRegexpPredefinedCharClass "\v%(\\[dDsSwW]|\.)" contained display
8585
syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Alnum|Alpha|ASCII|Blank|Cntrl|Digit|Graph|Lower|Print|Punct|Space|Upper|XDigit)\}" contained display
86-
syntax match clojureRegexpJavaCharClass "\v\\[pP]\{%(%(Is)?java%(Alphabetic|Digit|Ideographic|Letter|LowerCase|TitleCase|UpperCase|Whitespace)|java%(Defined|ISOControl|IdentifierIgnorable|JavaIdentifierPart|JavaIdentifierStart|LetterOrDigit|Mirrored|SpaceChar|UnicodeIdentifierPart|UnicodeIdentifierStart))\}" contained display
86+
" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-004/clj/src/vim_clojure_static/generate.clj
87+
" Java version 1.7.0_17
88+
syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Alphabetic|Defined|Digit|ISOControl|IdentifierIgnorable|Ideographic|JavaIdentifierPart|JavaIdentifierStart|Letter|LetterOrDigit|LowerCase|Mirrored|SpaceChar|TitleCase|UnicodeIdentifierPart|UnicodeIdentifierStart|UpperCase|Whitespace)\}" contained display
8789
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{Is%(Arabic|Armenian|Avestan|Balinese|Bamum|Batak|Bengali|Bopomofo|Brahmi|Buginese|Buhid|Carian|Cham|Cherokee|Coptic|Cuneiform|Cyrillic|Deseret|Devanagari|Egyptian_Hieroglyphs|Ethiopic|Georgian|Glagolitic|Gothic|Gujarati|Gurmukhi|Hanunoo|Hebrew|Hiragana|Imperial_Aramaic|Inscriptional_Pahlavi|Inscriptional_Parthian|Javanese|Kaithi|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Lao|Lepcha|Limbu|Lisu|Lycian|Lydian|Malayalam|Mandaic|Meetei_Mayek|Mongolian|Myanmar|NKo|New_Tai_Lue|Ogham|Ol_Chiki|Old_Italic|Old_Persian|Old_South_Arabian|Old_Turkic|Oriya|Osmanya|Phags_pa|Phoenician|Rejang|Runic|Samaritan|Saurashtra|Shavian|Sinhala|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tai_Tham|Tai_Viet|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Ugaritic|Vai)\}" contained display
8890
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{In%(AegeanNumbers|Aegean_Numbers|AlchemicalSymbols|Alchemical_Symbols|AlphabeticPresentationForms|Alphabetic_Presentation_Forms|AncientGreekMusicalNotation|AncientGreekNumbers|AncientSymbols|Ancient_Greek_Musical_Notation|Ancient_Greek_Numbers|Ancient_Symbols|Arabic|ArabicPresentationForms-A|ArabicPresentationForms-B|ArabicSupplement|Arabic_Presentation_Forms_A|Arabic_Presentation_Forms_B|Arabic_Supplement|Armenian|Arrows|Avestan|Balinese|Bamum|BamumSupplement|Bamum_Supplement|BasicLatin|Basic_Latin|Batak|Bengali|BlockElements|Block_Elements|Bopomofo|BopomofoExtended|Bopomofo_Extended|BoxDrawing|Box_Drawing|Brahmi|BraillePatterns|Braille_Patterns|Buginese|Buhid|ByzantineMusicalSymbols|Byzantine_Musical_Symbols|CJKCompatibility|CJKCompatibilityForms|CJKCompatibilityIdeographs|CJKCompatibilityIdeographsSupplement|CJKRadicalsSupplement|CJKStrokes|CJKSymbolsandPunctuation|CJKUnifiedIdeographs|CJKUnifiedIdeographsExtensionA|CJKUnifiedIdeographsExtensionB|CJKUnifiedIdeographsExtensionC|CJKUnifiedIdeographsExtensionD|CJK_Compatibility|CJK_Compatibility_Forms|CJK_Compatibility_Ideographs|CJK_Compatibility_Ideographs_Supplement|CJK_Radicals_Supplement|CJK_Strokes|CJK_Symbols_and_Punctuation|CJK_Unified_Ideographs|CJK_Unified_Ideographs_Extension_A|CJK_Unified_Ideographs_Extension_B|CJK_Unified_Ideographs_Extension_C|CJK_Unified_Ideographs_Extension_D|Carian|Cham|Cherokee|CombiningDiacriticalMarks|CombiningDiacriticalMarksSupplement|CombiningDiacriticalMarksforSymbols|CombiningHalfMarks|Combining_Diacritical_Marks|Combining_Diacritical_Marks_Supplement|Combining_Half_Marks|CommonIndicNumberForms|Common_Indic_Number_Forms|ControlPictures|Control_Pictures|Coptic|CountingRodNumerals|Counting_Rod_Numerals|Cuneiform|CuneiformNumbersandPunctuation|Cuneiform_Numbers_and_Punctuation|CurrencySymbols|Currency_Symbols|CypriotSyllabary|Cypriot_Syllabary|Cyrillic|CyrillicExtended-A|CyrillicExtended-B|CyrillicSupplement|Cyrillic_Extended_A|Cyrillic_Extended_B|Deseret|Devanagari|DevanagariExtended|Devanagari_Extended|Dingbats|DominoTiles|Domino_Tiles|EgyptianHieroglyphs|Egyptian_Hieroglyphs|Emoticons|EnclosedAlphanumericSupplement|EnclosedAlphanumerics|EnclosedCJKLettersandMonths|EnclosedIdeographicSupplement|Enclosed_Alphanumeric_Supplement|Enclosed_Alphanumerics|Enclosed_CJK_Letters_and_Months|Enclosed_Ideographic_Supplement|Ethiopic|EthiopicExtended|EthiopicExtended-A|EthiopicSupplement|Ethiopic_Extended|Ethiopic_Extended_A|Ethiopic_Supplement|GeneralPunctuation|General_Punctuation|GeometricShapes|Geometric_Shapes|Georgian|GeorgianSupplement|Georgian_Supplement|Glagolitic|Gothic|GreekExtended|Greek_Extended|GreekandCoptic|Gujarati|Gurmukhi|Halfwidth_and_Fullwidth_Forms|HalfwidthandFullwidthForms|HangulCompatibilityJamo|HangulJamo|HangulJamoExtended-A|HangulJamoExtended-B|HangulSyllables|Hangul_Compatibility_Jamo|Hangul_Jamo|Hangul_Jamo_Extended_A|Hangul_Jamo_Extended_B|Hangul_Syllables|Hanunoo|Hebrew|HighPrivateUseSurrogates|HighSurrogates|High_Private_Use_Surrogates|High_Surrogates|Hiragana|IPAExtensions|IPA_Extensions|IdeographicDescriptionCharacters|Ideographic_Description_Characters|ImperialAramaic|Imperial_Aramaic|InscriptionalPahlavi|InscriptionalParthian|Inscriptional_Pahlavi|Inscriptional_Parthian|Javanese|Kaithi|KanaSupplement|Kana_Supplement|Kanbun|KangxiRadicals|Kangxi_Radicals|Kannada|Katakana|KatakanaPhoneticExtensions|Katakana_Phonetic_Extensions|KayahLi|Kayah_Li|Kharoshthi|Khmer|KhmerSymbols|Khmer_Symbols|Lao|Latin-1Supplement|LatinExtended-A|LatinExtended-B|LatinExtended-C|LatinExtended-D|LatinExtendedAdditional|Latin_1_Supplement|Latin_Extended_A|Latin_Extended_Additional|Latin_Extended_B|Latin_Extended_C|Latin_Extended_D|Lepcha|LetterlikeSymbols|Letterlike_Symbols|Limbu|LinearBIdeograms|LinearBSyllabary|Linear_B_Ideograms|Linear_B_Syllabary|Lisu|LowSurrogates|Low_Surrogates|Lycian|Lydian|MahjongTiles|Mahjong_Tiles|Malayalam|Mandaic|MathematicalAlphanumericSymbols|MathematicalOperators|Mathematical_Alphanumeric_Symbols|Mathematical_Operators|MeeteiMayek|Meetei_Mayek|MiscellaneousMathematicalSymbols-A|MiscellaneousMathematicalSymbols-B|MiscellaneousSymbols|MiscellaneousSymbolsAndPictographs|MiscellaneousSymbolsandArrows|MiscellaneousTechnical|Miscellaneous_Mathematical_Symbols_A|Miscellaneous_Mathematical_Symbols_B|Miscellaneous_Symbols|Miscellaneous_Symbols_And_Pictographs|Miscellaneous_Symbols_and_Arrows|Miscellaneous_Technical|ModifierToneLetters|Modifier_Tone_Letters|Mongolian|MusicalSymbols|Musical_Symbols|Myanmar|MyanmarExtended-A|Myanmar_Extended_A|NKo|NewTaiLue|New_Tai_Lue|NumberForms|Number_Forms|Ogham|OlChiki|Ol_Chiki|OldItalic|OldPersian|OldSouthArabian|OldTurkic|Old_Italic|Old_Persian|Old_South_Arabian|Old_Turkic|OpticalCharacterRecognition|Optical_Character_Recognition|Oriya|Osmanya|Phags-pa|Phags_pa|PhaistosDisc|Phaistos_Disc|Phoenician|PhoneticExtensions|PhoneticExtensionsSupplement|Phonetic_Extensions|Phonetic_Extensions_Supplement|PlayingCards|Playing_Cards|PrivateUseArea|Private_Use_Area|Rejang|RumiNumeralSymbols|Rumi_Numeral_Symbols|Runic|Samaritan|Saurashtra|Shavian|Sinhala|SmallFormVariants|Small_Form_Variants|SpacingModifierLetters|Spacing_Modifier_Letters|Specials|Sundanese|Superscripts_and_Subscripts|SuperscriptsandSubscripts|SupplementalArrows-A|SupplementalArrows-B|SupplementalMathematicalOperators|SupplementalPunctuation|Supplemental_Arrows_A|Supplemental_Arrows_B|Supplemental_Mathematical_Operators|Supplemental_Punctuation|SupplementaryPrivateUseArea-A|SupplementaryPrivateUseArea-B|Supplementary_Private_Use_Area_A|Supplementary_Private_Use_Area_B|SylotiNagri|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tags|TaiLe|TaiTham|TaiViet|TaiXuanJingSymbols|Tai_Le|Tai_Tham|Tai_Viet|Tai_Xuan_Jing_Symbols|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|TransportAndMapSymbols|Transport_And_Map_Symbols|Ugaritic|UnifiedCanadianAboriginalSyllabics|UnifiedCanadianAboriginalSyllabicsExtended|Unified_Canadian_Aboriginal_Syllabics|Unified_Canadian_Aboriginal_Syllabics_Extended|Vai|VariationSelectors|VariationSelectorsSupplement|Variation_Selectors|Variation_Selectors_Supplement|VedicExtensions|Vedic_Extensions|VerticalForms|Vertical_Forms|YiRadicals|YiSyllables|Yi_Radicals|Yi_Syllables|YijingHexagramSymbols|Yijing_Hexagram_Symbols)\}" contained display
8991
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(Is)?%(C[cfnos]|L[lmotu]|M[cen]|N[dlo]|P[cdefios]|S[ckmo]|Z[lps])\}" contained display
9092
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]%(C|L|M|N|P|S|Z)" contained display
91-
syntax cluster clojureRegexpBracketExp contains=clojureRegexpPosixCharClass,clojureRegexpUnicodeCharClass,clojureRegexpJavaCharClass
92-
syntax cluster clojureRegexpCharClasses contains=clojureRegexpPredefinedCharClass,clojureRegexpCharClass,@clojureRegexpBracketExp
93-
syntax region clojureRegexpCharClass start="\\\@<!\[" end="\\\@<!\]" contained contains=clojureRegexpSpecialChar,clojureRegexpPredefinedCharClass,@clojureRegexpBracketExp
93+
syntax cluster clojureRegexpCharPropertyClasses contains=clojureRegexpPosixCharClass,clojureRegexpUnicodeCharClass,clojureRegexpJavaCharClass
94+
syntax cluster clojureRegexpCharClasses contains=clojureRegexpPredefinedCharClass,clojureRegexpCharClass,@clojureRegexpCharPropertyClasses
95+
syntax region clojureRegexpCharClass start="\\\@<!\[" end="\\\@<!\]" contained contains=clojureRegexpSpecialChar,clojureRegexpPredefinedCharClass,@clojureRegexpCharPropertyClasses
9496
syntax match clojureRegexpBoundary "\\[bBAGZz]" contained display
9597
syntax match clojureRegexpBoundary "[$^]" contained display
9698
syntax match clojureRegexpQuantifier "[?*+][?+]\=" contained display

0 commit comments

Comments
 (0)